Added preservestaticlibs variable in addition to converting base/curl's tarball to lzip format

Upgraded base/eudev to 3.2.11 Removed double quotes in mversion variable in base/faad2 Only copy LICENSE to base/libical Upgraded base/lzip to 1.23 in addition to adding CXXFLAGS variable Upgraded base/lzlib to 1.13 in addition to adding CFLAGS variable Upgraded meson 0.63.2 Discarded CFLAGS and LDFLAGS variables and disabled building of static libraries in base/mpfr, converted source to lzip and updated SHA512 checksums Uncommented fixbuilddirpermissions function call in base/mtools Fixed code for compiling getconf, getent and iconv binaries in base/musl Added subshell to compile library in base/nghttp2 Added OPTFLAGS and fixed miscellaneous code in base/p7zip Added CFLAGS as an argument to make in base/pigz Added CXXFLAGS as an argument to configure in base/plzip Upgraded base/qpdf to 11.1.0 Only copy LICENSE to base/sed Upgraded base/tarlz to 0.23
2022-10-04 20:35:22 +05:30 · 2022-10-04 20:35:22 +05:30 · ced90762d9
commit ced90762d9
parent 0e36a18b56
18 changed files with 58 additions and 55 deletions
--- a/base/curl/curl.SMBuild
+++ b/base/curl/curl.SMBuild
@ -5,6 +5,7 @@ homepage="https://curl.se/"
 download="https://curl.se/download/curl-$version.tar.xz"
 desc="Command line URL data transfer tool"
 requires="zlib openssl brotli libssh2 libidn2 nghttp2 libunistring"
+preservestaticlibs=1

 build() {
  mkandenterbuilddir
@ -42,5 +43,5 @@ build() {
 }

 sha512sums="
-86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce  curl-7.84.0.tar.xz
+1ee8c9e4567b4850989489612ea8c4a9e0434827782be4e4b0e70c4543271b50c2ee3b1782d232793fb2bb24ff37d6e2b2243ff2519a0cc02ae902595f723f9f  curl-7.84.0.tar.lz
 "
--- a/base/eudev/eudev.SMBuild
+++ b/base/eudev/eudev.SMBuild
@ -1,5 +1,5 @@
 app=eudev
-version=3.2.9
+version=3.2.11
 build=1sml
 homepage="https://wiki.gentoo.org/wiki/Eudev"
 download="http://sources.buildroot.net/eudev/eudev-$version.tar.gz"
@ -33,5 +33,5 @@ build() {
 }

 sha512sums="
-a239ca799e3b18bc058ab120dd8636e360ad9e579ea15d21718ac4eee7ad2a74720e83f66eb3dfaa22443f3ee8db64ef4e0d254dbcf98e2fbe37ecaec40075b1  eudev-3.2.9.tar.lz
-"
+b54dac70e4a683b4fb0281f9147e1cc2faa8bd7b06ee0929a562db223b21da48ddd13889062595b19421bcdb54de23ee38aa8ff1e2d7fed9f673bc82434a3a8d  eudev-3.2.11.tar.lz
+"
--- a/base/faad2/faad2.SMBuild
+++ b/base/faad2/faad2.SMBuild
@ -1,6 +1,6 @@
 app=faad2
 version=2.9.2
-mversion="$(echo $version | sed 's@.@_@')"
+mversion=$(echo $version | sed 's@.@_@')
 build=1sml
 homepage="https://github.com/knik0/faad2"
 download="https://github.com/knik0/faad2/archive/refs/tags/$mversion.tar.gz"
--- a/base/libical/libical.SMBuild
+++ b/base/libical/libical.SMBuild
@ -29,7 +29,7 @@ build() {
  make
  make install DESTDIR=$pkg

-  cp ../{LICENSE,ReadMe.txt,ReleaseNotes.txt,THANKS,TODO} $pkgdocs/ 
+  cp ../LICENSE $pkgdocs/ 

  mkfinalpkg
 }
--- a/base/lzip/lzip.SMBuild
+++ b/base/lzip/lzip.SMBuild
@ -1,5 +1,5 @@
 app=lzip
-version=1.20
+version=1.23
 build=1sml
 homepage="https://www.nongnu.org/lzip/lzip.html"
 download="http://download.savannah.gnu.org/releases/lzip/lzip-$version.tar.gz"
@ -15,9 +15,10 @@ build() {
  fixbuilddirpermissions

  ./configure \
-    --prefix="" 
+    --prefix="" \
+    CXXFLAGS="$CXXFLAGS -static"

-  make CXXFLAGS="$CXXFLAGS -static"
+  make 
  make install DESTDIR=$pkg

  cp COPYING $pkgdocs/
@ -26,5 +27,5 @@ build() {
 }

 sha512sums="
-0349b4c6c0b41e601b7ee381c3254d741397beb3ef9354c08162f346f131f4f48f6613ee0a610cdc6d827530df634f884ecfeee35215b10045a40fee76f8e938  lzip-1.20.tar.gz
+482804205b6e92fdf9cb17fb9482df7987227c7b1bef9e42d78787acfabe73995f5b1a66f847d2176423f22dce56f1122c5b1c9670f0b778c0bdad2852369c85  lzip-1.23.tar.gz
 "
--- a/base/lzlib/lzlib.SMBuild
+++ b/base/lzlib/lzlib.SMBuild
@ -1,5 +1,5 @@
 app=lzlib
-version=1.11
+version=1.13
 build=1sml
 homepage="http://www.nongnu.org/lzip/lzlib.html"
 download="http://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-$version.tar.lz"
@ -16,7 +16,8 @@ build() {

  ./configure \
    --prefix="" \
-    --disable-static
+    --disable-static \
+    CFLAGS="$CFLAGS"

  make
  make install DESTDIR=$pkg 
@ -27,5 +28,5 @@ build() {
 }

 sha512sums="
-2628bb5bfceb8124020cae57f4aecba2f83cbfb5be32acb4f66742e2460e7545be72696f81646fd3e0b7a509faa9d183b7237b7569c2f023ed0488b24a209ae7  lzlib-1.11.tar.lz
-"
+780531ddad16b907a80d417c65d0c1010b86943a600a69147f51884f3332483bd889dc31b4d7ce897a4ff53e71a5bc28fae7e5ef30e4408e7f3830ab8bdf94e1  lzlib-1.13.tar.lz
+"
--- a/base/meson/meson.SMBuild
+++ b/base/meson/meson.SMBuild
@ -1,7 +1,8 @@
 app=meson
-version=0.56.0
+version=0.63.2
 build=1sml
 homepage="https://github.com/mesonbuild/meson"
+download="https://github.com/mesonbuild/meson/releases/download/$version/meson-$version.tar.gz"
 download="https://github.com/mesonbuild/meson/archive/refs/tags/$version.tar.gz"
 desc="next generation build system based on python3 and ninja"
 requires="python3 itstool ninja"
@ -23,5 +24,5 @@ build() {
 }

 sha512sums="
-81cbe26bd378db568f6c3e7ad09312c1a0fcb940f5b917bb4dcfbc289ecb5cd57d9b6e657e0c5825fd9608749168425932f34ca5f7af84ca288ca67f9812d29d  meson-0.56.0.tar.lz
-"
+08d0d6dc1e9e5adf9a624969d575c25f96bac1bf3ab78d7914a7fe0984f31ef6ff4d1a3e6f11eeac2185d92bbb1ed801de2a0447d489f3946a62e108288b62e6  meson-0.63.2.tar.lz
+"
--- a/base/mpfr/mpfr.SMBuild
+++ b/base/mpfr/mpfr.SMBuild
@ -14,11 +14,9 @@ build() {
  cd $app-$version
  fixbuilddirpermissions

-  CFLAGS="-I/include" \
-  LDFLAGS="-L/lib" \
  ./configure \
    --prefix="" \
-    --enable-static
+    --disable-static

  make 
  make install DESTDIR=$pkg
@ -29,5 +27,5 @@ build() {
 }

 sha512sums="
-746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054  mpfr-3.1.6.tar.xz
+f022d9afdd479fe6c4e15efec09de64e975d35556bc4b75664b9dbb58fbcf4826d791e8c2f79d7f2ed7ec8659a5f2128abc5d04b57fb592d1081b03bb824de7c  mpfr-3.1.6.tar.lz
 "
--- a/base/mtools/mtools.SMBuild
+++ b/base/mtools/mtools.SMBuild
@ -12,7 +12,7 @@ build() {

  tar xf $srcdir/$app-$version.tar.?z*
  cd $app-$version
-#  fixbuilddirpermissions
+  fixbuilddirpermissions

  ./configure \
    --prefix="" \
--- a/base/musl/musl.SMBuild
+++ b/base/musl/musl.SMBuild
@ -22,12 +22,11 @@ build() {
  make install DESTDIR=$pkg

  # Some additional stuff from alpine 
-  mkdir -p addons && cd addons
-  cp $srcdir/{getconf.c,getent.c,iconv.c} .
+  mkdir -p $pkg/bin addons && cd addons

-  gcc -o getconf getconf.c ; install -Dm 755 getconf $pkg/bin/getconf
-  gcc -o getent getent.c ; install -Dm 755 getent $pkg/bin/getent
-  gcc -o iconv iconv.c ; install -Dm 755 iconv $pkg/bin/iconv
+  gcc -o $pkg/bin/getconf $srcdir/getconf.c 
+  gcc -o $pkg/bin/getent $srcdir/getent.c
+  gcc -o $pkg/bin/iconv $srcdir/iconv.c 
  cd ..

  ( cd $pkg/lib
@ -47,7 +46,7 @@ build() {
 }

 sha512sums="
-9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c  musl-1.2.3.tar.gz
+0d47c3a8c34301b81b346dfd90eedc8d7a68b9dd7cdde41f0003f985a55aec30d7eca974be233ae31814e9c608e989807008a56fff986d88ffe8a09f3b869ee5  musl-1.2.3.tar.lz
 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d  getconf.c
 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413  getent.c
 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf  iconv.c
--- a/base/nghttp2/nghttp2.SMBuild
+++ b/base/nghttp2/nghttp2.SMBuild
@ -21,11 +21,12 @@ build() {
    --enable-lib-only \
    --disable-static 

-  make
-  cd lib
-  make install DESTDIR=$pkg 
+  ( 
+    cd lib ; 
+    make
+    make install DESTDIR=$pkg 
+  )

-  cd ..
  cp COPYING $pkgdocs/

  mkfinalpkg
--- a/base/p7zip/p7zip.SMBuild
+++ b/base/p7zip/p7zip.SMBuild
@ -14,13 +14,11 @@ build() {
  cd $app-$version
  fixbuilddirpermissions

-  sed -i 's/-pipe -s//' makefile.machine
  sed -i -e 's/strip /#strip /' \
   -e 's/chmod 555/chmod 755/' \
-   -e 's/chmod 444/chmod 644/' install.sh && make all3 || true
+   -e 's/chmod 444/chmod 644/' install.sh && make all3 OPTFLAGS="$CXXFLAGS" || true

-  make install DEST_HOME="" DEST_DIR="$pkg" \
-   DEST_MAN="/share/man" || true
+  make install DEST_HOME="" DEST_DIR="$pkg" DEST_MAN="/share/man"

  cp DOC/License.txt $pkgdocs/

--- a/base/perl/perl.SMBuild
+++ b/base/perl/perl.SMBuild
@ -55,7 +55,7 @@ build() {

  rm -f $pkg/*.0 

-  cp Artistic $pkgdocs/
+  cp Artistic $pkgdocs/LICENSE

  mkfinalpkg
 }
--- a/base/pigz/pigz.SMBuild
+++ b/base/pigz/pigz.SMBuild
@ -14,7 +14,7 @@ build() {
  cd $app-$version
  fixbuilddirpermissions

-  make 
+  make CFLAGS="$CFLAGS"
  mkdir -p $pkg/bin $pkg/share/man/man1
  cp pigz unpigz $pkg/bin/
  cp pigz.1 $pkg/share/man/man1/
--- a/base/plzip/plzip.SMBuild
+++ b/base/plzip/plzip.SMBuild
@ -1,5 +1,5 @@
 app=plzip
-version=1.8
+version=1.10
 build=1sml
 homepage="http://www.nongnu.org/lzip/plzip.html"
 download="http://download.savannah.gnu.org/releases/lzip/plzip/plzip-$version.tar.lz"
@ -15,7 +15,8 @@ build() {
  fixbuilddirpermissions

  ./configure \
-    --prefix="" 
+    --prefix="" \
+    CXXFLAGS="$CXXFLAGS"

  make
  make install DESTDIR=$pkg 
@ -26,5 +27,5 @@ build() {
 }

 sha512sums="
-bbc4c2c94b49c9efed0c93b3c766fedd82195014b7d7aa813420bec6a52d064de8f0ef4ba912ab5fc9d4fddc204001ba8eddd9c5191b50e7f50b6600af47ea75  plzip-1.8.tar.lz
+3233028a1294805da15856194fa94701e3abf3e5322e56ac631ad547b0b03995fabb5a7c4292e807f1be5b1cbfd6c6324af165691858da35b699c4e4e6927ed4  plzip-1.10.tar.lz
 "
--- a/base/qpdf/qpdf.SMBuild
+++ b/base/qpdf/qpdf.SMBuild
@ -1,8 +1,8 @@
 app=qpdf
-version=6.0.0
+version=11.1.0
 build=1sml
-homepage="http://qpdf.sourceforge.net/"
-download="https://sourceforge.net/projects/qpdf/files/qpdf/$version/qpdf-$version.tar.gz"
+homepage="https://github.com/qpdf/qpdf"
+download="https://github.com/qpdf/qpdf/releases/download/v$version/qpdf-$version.tar.gz"
 desc="Command-line tools and library for transforming PDF files"
 requires="gcc-libs pcre"

@ -14,19 +14,21 @@ build() {
  cd $app-$version 
  fixbuilddirpermissions

-  ./configure \
-    --prefix="" \
-    --sysconfdir=/etc \
-    --disable-static
-
+  mkdir -p smbuild && cd smbuild 
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_STATIC_LIBS=OFF 
+  
  make
  make install DESTDIR=$pkg 

-  cp Artistic* $pkgdocs/
+  cp ../LICENSE.txt $pkgdocs/

  mkfinalpkg
 }

 sha512sums="
-a6025fca43885bd04e43c8222a0bb858ef7cfc4c09abdda324975dcf8bdc99e225997c3e12f3ecac15f6aca314e4d836db00f2fe1bce600c36a9a53bf934a208  qpdf-6.0.0.tar.lz
+ccfc7cfe3b5beaf73c064c36056bf4c9cbecc8709c1afc7b5a1de58055d2818a82f6fffd5b59b700b06215d84646267eaa2cfc014721041af94b6a29d9f67b4d  qpdf-11.1.0.tar.lz
 "
--- a/base/sed/sed.SMBuild
+++ b/base/sed/sed.SMBuild
@ -21,7 +21,7 @@ build() {
  make
  make install DESTDIR=$pkg

-  cp ABOUT-NLS AUTHORS BUGS COPYING* NEWS THANKS $pkgdocs/
+  cp COPYING* $pkgdocs/

  mkfinalpkg
 }
--- a/base/tarlz/tarlz.SMBuild
+++ b/base/tarlz/tarlz.SMBuild
@ -1,5 +1,5 @@
 app=tarlz
-version=0.16
+version=0.23
 build=1sml
 homepage="https://www.nongnu.org/lzip/tarlz.html"
 download="http://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-$version.tar.lz"
@ -16,7 +16,7 @@ build() {

  ./configure \
    --prefix="" \
-    --disable-static
+    CXXFLAGS="$CXXFLAGS"

  make
  make install DESTDIR=$pkg 
@ -27,5 +27,5 @@ build() {
 }

 sha512sums="
-619cb5807e58cbb267e0bd4780e578a069de2bd721c4ff84416b0d551d79c4172d453ee7e0c610b3c5da5a9f5068f5d134638c39ab67c05a5e853257abb2ff00  tarlz-0.16.tar.lz
+623407142d03e0ddae3dbb057b8ef5f1aea850418dbb47c6278affa42c88bc1786cd3249d1e8c018643f41516787225cb2ed3aca2fc02ba8e65dfe4744f965d8  tarlz-0.23.tar.lz
 "