haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libzip: bump version, don't build tools on secondary arch

Browse Source 
link with libbsd for fts
This commit is contained in:
Jerome Duval
2023-05-11 09:26:16 +02:00
parent 68d5581d4c
commit d88cc5e52e
7 changed files with 61 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
dev-libs/libzip/libzip-0.10.1.recipe
View File

@@ -1,75 +0,0 @@
SUMMARY="A C library for reading, creating, and modifying zip archives"
DESCRIPTION="libzip is a C library for reading, creating, and modifying zip \
archives."
HOMEPAGE="http://www.nih.at/libzip/"
COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner"
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="http://www.nih.at/libzip/libzip-0.10.1.tar.bz2"
CHECKSUM_SHA256="5b1eaf60968cb22df49d73bcaa759961fb27451917ac76b275374c2ed260ce92"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libzip${secondaryArchSuffix} = $portVersion
cmd:zipcmp${secondaryArchSuffix}
cmd:zipmerge${secondaryArchSuffix}
cmd:ziptorrent${secondaryArchSuffix}
lib:libzip${secondaryArchSuffix} = $portVersion
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libz${secondaryArchSuffix}
"
PROVIDES_devel="
libzip${secondaryArchSuffix}_devel = $portVersion
devel:libzip$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libzip$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libz${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt
cmake -DCMAKE_INSTALL_PREFIX=$prefix
make $jobArgs
}
INSTALL()
{
make install
# clean up includes
mkdir -p $includeDir
mv $prefix/include/* $includeDir/
rm -rf $prefix/include
# clean up man pages
mkdir -p $manDir
mv $prefix/man/* $manDir/
rm -rf $prefix/man
prepareInstalledDevelLibs \
libzip \
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}

75
dev-libs/libzip/libzip-0.11.2.recipe
View File

@@ -1,75 +0,0 @@
SUMMARY="A C library for reading, creating, and modifying zip archives"
DESCRIPTION="libzip is a C library for reading, creating, and modifying zip \
archives."
HOMEPAGE="http://www.nih.at/libzip/"
COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner"
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="http://www.nih.at/libzip/libzip-0.11.2.tar.gz"
CHECKSUM_SHA256="83db1fb43a961ff7d1d1b50e1c6bea09c67e6af867686d1fc92ecb7dc6cf98d5"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libzip${secondaryArchSuffix} = $portVersion
cmd:zipcmp${secondaryArchSuffix}
cmd:zipmerge${secondaryArchSuffix}
cmd:ziptorrent${secondaryArchSuffix}
lib:libzip${secondaryArchSuffix} = $portVersion
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libz${secondaryArchSuffix}
"
PROVIDES_devel="
libzip${secondaryArchSuffix}_devel = $portVersion
devel:libzip$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libzip$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libz${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
sed -i 's/LN = ln/LN = cp/' man/Makefile.in
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
# # clean up includes
# mkdir -p $includeDir
# mv $prefix/include/* $includeDir/
# rm -rf $prefix/include
#
# # clean up man pages
# mkdir -p $manDir
# mv $prefix/man/* $manDir/
# rm -rf $prefix/man
prepareInstalledDevelLibs \
libzip \
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}

98
dev-libs/libzip/libzip-1.1.3.recipe
View File

@@ -1,98 +0,0 @@
SUMMARY="A C library for reading, creating, and modifying zip archives"
DESCRIPTION="libzip is a C library for reading, creating, and modifying zip \
archives."
HOMEPAGE="http://www.nih.at/libzip/"
COPYRIGHT="1999-2016 Dieter Baron and Thomas Klausner"
LICENSE="BSD (3-clause)"
REVISION="2"
SOURCE_URI="http://www.nih.at/libzip/libzip-$portVersion.tar.gz"
CHECKSUM_SHA256="1faa5a524dd4a12c43b6344e618edce1bf8050dfdb9d0f73f3cc826929a002b0"
PATCHES="libzip-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libzip$secondaryArchSuffix = $portVersion
lib:libzip$secondaryArchSuffix = 4.0.0 compat >= 4.0.0
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:zipcmp
cmd:zipmerge
cmd:ziptool
"
fi
REQUIRES="
haiku$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
libzip${secondaryArchSuffix}_devel = $portVersion
devel:libzip$secondaryArchSuffix = 4.0.0 compat >= 4.0.0
"
REQUIRES_devel="
libzip$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:autoheader
cmd:make
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
"
PATCH()
{
sed -i -e 's/^LN=ln -f$/&rs/' man/Makefile.am
}
BUILD()
{
runConfigure ./configure --disable-static
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libzip
fixPkgconfig
# Move zipconf.h from lib/libzip/include/ to develop/headers/libzip/
mkdir -p $includeDir/libzip
mv $libDir/libzip/include/zipconf.h $includeDir/libzip
rmdir $libDir/libzip/include $libDir/libzip
# Adjust libincludedir to make it point to where zipconf.h was moved.
sed -i -e "s,^\(libincludedir=\)$libDir"'\(/libzip\)/include$,\1${prefix}/'"${relativeIncludeDir}\2," \
$developLibDir/pkgconfig/libzip.pc
if [ -z "$secondaryArchSuffix" ]; then
maybe_manDir_man3=$manDir/man3
else
maybe_manDir_man3=
rm -rf $binDir
rm -rf $documentationDir
fi
# devel package
packageEntries devel \
$developDir \
$maybe_manDir_man3
}
TEST()
{
make check
}

9
dev-libs/libzip/libzip-1.8.0.recipe → dev-libs/libzip/libzip-1.9.2.recipe
View File

@@ -6,15 +6,15 @@ COPYRIGHT="1999-2020 Dieter Baron and Thomas Klausner"
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="http://www.nih.at/libzip/libzip-$portVersion.tar.gz"
CHECKSUM_SHA256="30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e"
CHECKSUM_SHA256="fd6a7f745de3d69cf5603edc9cb33d2890f0198e415255d0987a0cf10d824c6f"
PATCHES="libzip-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libzip$secondaryArchSuffix = $portVersion
lib:libzip$secondaryArchSuffix = 5.0.0 compat >= 5.0.0
lib:libzip$secondaryArchSuffix = 5.5.0 compat >= 5.0.0
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
@@ -36,7 +36,7 @@ REQUIRES="
PROVIDES_devel="
libzip${secondaryArchSuffix}_devel = $portVersion
devel:libzip$secondaryArchSuffix = 5.0.0 compat >= 5.0.0
devel:libzip$secondaryArchSuffix = 5.5.0 compat >= 5.0.0
"
REQUIRES_devel="
libzip$secondaryArchSuffix == $portVersion base
@@ -74,6 +74,7 @@ BUILD()
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_INCLUDEDIR=$includeDir \
-DDOCUMENTATION_FORMAT=man \
${secondaryArchSuffix:+'-DBUILD_TOOLS=OFF'} \
$cmakeDirArgs
make -C build $jobArgs
}

30
dev-libs/libzip/patches/libzip-1.1.3.patchset
View File

@@ -1,30 +0,0 @@
From 83469244d644593a2ef27f179102b0b4e1975caf Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Sat, 28 May 2016 09:50:37 +0000
Subject: gcc2 patch
diff --git a/src/zipcmp.c b/src/zipcmp.c
index cf9b572..032c838 100644
--- a/src/zipcmp.c
+++ b/src/zipcmp.c
@@ -313,6 +313,7 @@ list_directory(const char *name, struct archive *a)
FTS *fts;
FTSENT *ent;
zip_uint64_t nalloc;
+ size_t prefix_length;
char * const names[2] = { (char *)name, NULL };
@@ -321,7 +322,7 @@ list_directory(const char *name, struct archive *a)
fprintf(stderr, "%s: can't open directory '%s': %s\n", prg, name, strerror(errno));
return -1;
}
- size_t prefix_length = strlen(name)+1;
+ prefix_length = strlen(name)+1;
nalloc = 0;
--
2.7.0

21
dev-libs/libzip/patches/libzip-1.8.0.patchset
View File

@@ -1,21 +0,0 @@
From cfede57da3bd091f08ab8810d4cae8c919b56ff0 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 21 May 2017 17:08:44 +0200
Subject: fix path for libincludedir
diff --git a/libzip.pc.in b/libzip.pc.in
index 58b3dca..11923f9 100644
--- a/libzip.pc.in
+++ b/libzip.pc.in
@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
includedir=@includedir@
+libincludedir=@includedir@
zipcmp=@bindir@/zipcmp
--
2.30.2

56
dev-libs/libzip/patches/libzip-1.9.2.patchset Normal file
View File

@@ -0,0 +1,56 @@
From 1929ca0232bbf031ef623d47e8a079f26bec3d66 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 21 May 2017 17:08:44 +0200
Subject: fix path for libincludedir
diff --git a/libzip.pc.in b/libzip.pc.in
index d51b0ab..fae05fb 100644
--- a/libzip.pc.in
+++ b/libzip.pc.in
@@ -3,6 +3,7 @@ exec_prefix=${prefix}
bindir=@bindir@
libdir=@libdir@
includedir=@includedir@
+libincludedir=@includedir@
zipcmp=${bindir}/zipcmp
--
2.37.3
From 11dcd4d8eea63923cbf087f43df7fefb16262414 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 11 May 2023 09:23:45 +0200
Subject: search fts in libbsd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d00a4f9..1dc26b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@ if(HAVE_FTS_H)
check_function_exists(fts_open HAVE_FTS_OPEN)
if(NOT HAVE_FTS_OPEN)
check_library_exists(fts fts_open "" HAVE_LIB_FTS)
+ check_library_exists(bsd fts_open "" HAVE_LIB_BSD)
else(NOT HAVE_FTS_OPEN)
set(HAVE_LIB_FTS "" CACHE INTERNAL "")
endif(NOT HAVE_FTS_OPEN)
@@ -132,7 +133,11 @@ endif(HAVE_FTS_H)
if(HAVE_LIB_FTS)
set(FTS_LIB fts CACHE INTERNAL "")
else()
- set(FTS_LIB "" CACHE INTERNAL "")
+ if(HAVE_LIB_BSD)
+ set(FTS_LIB bsd CACHE INTERNAL "")
+ else()
+ set(FTS_LIB "" CACHE INTERNAL "")
+ endif()
endif()
check_include_files(stdbool.h HAVE_STDBOOL_H)
--
2.37.3