From ba7e10e15457a7f37d2cd92d5a789e111889cc60 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Sat, 19 Nov 2022 19:17:37 +0200 Subject: [PATCH] upg brotli icu libedit libxcrypt lzo mpfr zlib --- brotli/PKGBUILD | 17 ++++++++++------- brotli/PKGBUILD-arch | 14 ++++++++------ brotli/deps | 1 + icu/PKGBUILD | 3 ++- icu/PKGBUILD-arch | 3 ++- icu/time | 9 ++++++--- libedit/PKGBUILD | 10 ++++++---- libedit/PKGBUILD-arch | 5 +++-- libedit/deps | 2 ++ libxcrypt/PKGBUILD | 6 +++--- libxcrypt/PKGBUILD-arch | 4 ++-- lzo/PKGBUILD | 9 +++++++-- lzo/PKGBUILD-arch | 4 +++- lzo/deps | 2 ++ lzo/time | 9 ++++++--- mpfr/PKGBUILD | 27 +++++++++++++++------------ mpfr/PKGBUILD-arch | 36 ++++++++++++++++++------------------ mpfr/key | 2 +- zlib/PKGBUILD | 3 ++- zlib/PKGBUILD-arch | 7 +++++-- 20 files changed, 104 insertions(+), 69 deletions(-) diff --git a/brotli/PKGBUILD b/brotli/PKGBUILD index 1b50aa6..fa79ada 100644 --- a/brotli/PKGBUILD +++ b/brotli/PKGBUILD @@ -9,11 +9,12 @@ pkgbase=brotli pkgname=('brotli' 'python-brotli' 'brotli-testdata') _gitcommit=e61745a6b7add50d380cfd7d3883dd6c62fc2c71 pkgver=1.0.9 -pkgrel=08 +pkgrel=09 pkgdesc='Generic-purpose lossless compression algorithm' url='https://github.com/google/brotli' arch=('x86_64') makedepends=('git' 'glibc' 'gcc-libs' 'cmake' 'python-setuptools') +# options=('debug') ## uncomment this to produce the debug pkg source=(${pkgname}::"git+${url}#commit=${_gitcommit}") prepare() { @@ -29,19 +30,19 @@ pkgver() { build() { cd ${pkgbase} python setup.py build - cmake -B build \ + cmake -S . -B build \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects" - - make -C build VERBOSE=1 + cmake --build build -v } check() { cd ${pkgbase} - make test python setup.py test + cd build + ctest --output-on-failure --stop-on-failure -j$(nproc) } package_brotli() { @@ -49,8 +50,8 @@ package_brotli() { provides=(libbrotlicommon.so libbrotlidec.so libbrotlienc.so) cd ${pkgbase} - make -C build DESTDIR="$pkgdir" install - local man; + DESTDIR="$pkgdir" cmake --install build + local man for man in docs/*.?; do install -Dm 644 "$man" "$pkgdir/usr/share/man/man${man##*.}/${man##*/}" done @@ -81,3 +82,5 @@ package_brotli-testdata() { license=('MIT') sha256sums=(SKIP) + + diff --git a/brotli/PKGBUILD-arch b/brotli/PKGBUILD-arch index 759b65e..f2ba2a4 100644 --- a/brotli/PKGBUILD-arch +++ b/brotli/PKGBUILD-arch @@ -8,12 +8,13 @@ pkgbase=brotli pkgname=('brotli' 'python-brotli' 'brotli-testdata') _gitcommit=e61745a6b7add50d380cfd7d3883dd6c62fc2c71 pkgver=1.0.9 -pkgrel=8 +pkgrel=9 pkgdesc='Generic-purpose lossless compression algorithm' url='https://github.com/google/brotli' arch=('x86_64') license=('MIT') makedepends=('git' 'glibc' 'gcc-libs' 'cmake' 'python-setuptools') +options=('debug') source=(${pkgname}::"git+${url}#commit=${_gitcommit}") sha512sums=('SKIP') @@ -30,18 +31,19 @@ pkgver() { build() { cd ${pkgbase} python setup.py build - cmake -B build \ + cmake -S . -B build \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects" - make -C build VERBOSE=1 + cmake --build build -v } check() { cd ${pkgbase} - make test python setup.py test + cd build + ctest --output-on-failure --stop-on-failure -j$(nproc) } package_brotli() { @@ -49,8 +51,8 @@ package_brotli() { provides=(libbrotlicommon.so libbrotlidec.so libbrotlienc.so) cd ${pkgbase} - make -C build DESTDIR="$pkgdir" install - local man; + DESTDIR="$pkgdir" cmake --install build + local man for man in docs/*.?; do install -Dm 644 "$man" "$pkgdir/usr/share/man/man${man##*.}/${man##*/}" done diff --git a/brotli/deps b/brotli/deps index 1276585..3740e3d 100644 --- a/brotli/deps +++ b/brotli/deps @@ -2,3 +2,4 @@ git cmake python-setuptools + diff --git a/icu/PKGBUILD b/icu/PKGBUILD index 0045590..3c13775 100644 --- a/icu/PKGBUILD +++ b/icu/PKGBUILD @@ -7,7 +7,7 @@ pkgname=icu pkgver=72.1 -pkgrel=01 +pkgrel=02 pkgdesc="International Components for Unicode library" arch=(x86_64) groups=( jobbot ) @@ -15,6 +15,7 @@ url="https://icu.unicode.org" depends=('gcc-libs' 'sh') makedepends=('python') provides=(libicu{data,i18n,io,test,tu,uc}.so) +# options=('debug') ### uncomment this for debug pkg source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc}) # https://github.com/unicode-org/icu/releases/download/release-71-1/SHASUM512.txt diff --git a/icu/PKGBUILD-arch b/icu/PKGBUILD-arch index cc58c71..09b6c24 100644 --- a/icu/PKGBUILD-arch +++ b/icu/PKGBUILD-arch @@ -3,7 +3,7 @@ pkgname=icu pkgver=72.1 -pkgrel=1 +pkgrel=2 pkgdesc="International Components for Unicode library" arch=(x86_64) url="https://icu.unicode.org" @@ -11,6 +11,7 @@ license=('custom:icu') depends=('gcc-libs' 'sh') makedepends=('python') provides=(libicu{data,i18n,io,test,tu,uc}.so) +options=('debug') source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc}) # https://github.com/unicode-org/icu/releases/download/release-71-1/SHASUM512.txt sha512sums=('848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8' diff --git a/icu/time b/icu/time index 9b7e24a..fc4db7c 100644 --- a/icu/time +++ b/icu/time @@ -1,3 +1,6 @@ -real 5m43.511s -user 17m44.664s -sys 0m53.565s + + +real 7m23.806s +user 6m23.429s +sys 0m26.221s + diff --git a/libedit/PKGBUILD b/libedit/PKGBUILD index d2869fc..e0d7879 100644 --- a/libedit/PKGBUILD +++ b/libedit/PKGBUILD @@ -1,18 +1,20 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libedit _pkgver=20210910-3.1 pkgver=${_pkgver/-/_} -pkgrel=01 +pkgrel=02 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' url='https://thrysoee.dk/editline/' arch=('x86_64') depends=('glibc' 'ncurses' 'libncursesw.so') provides=('libedit.so') +# options=('debug') ## uncomment this for debug pkg source=(${url}/${pkgname}-${_pkgver}.tar.gz) build() { @@ -32,8 +34,6 @@ package() { install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}" } -# vim: ts=2 sw=2 et: - #---- license gpg-key sha256sums ---- license=('BSD') @@ -41,3 +41,5 @@ license=('BSD') b2sums=('325dc756fc6c6244e336cd6faeed2ab37817bdab8c0684586c44d551074fd2ec84bfcd3f4d5897db3196e783653a042699e5b9a8a3351d653992bb256956b652') sha256sums=(6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5) # libedit-20210910-3.1.tar.gz + + diff --git a/libedit/PKGBUILD-arch b/libedit/PKGBUILD-arch index 3ffff1e..23b34e3 100644 --- a/libedit/PKGBUILD-arch +++ b/libedit/PKGBUILD-arch @@ -6,13 +6,14 @@ pkgname=libedit _pkgver=20210910-3.1 pkgver=${_pkgver/-/_} -pkgrel=1 +pkgrel=2 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' url='https://thrysoee.dk/editline/' arch=('x86_64') license=('BSD') depends=('glibc' 'ncurses' 'libncursesw.so') provides=('libedit.so') +options=('debug') source=(${url}/${pkgname}-${_pkgver}.tar.gz) sha256sums=('6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5') b2sums=('325dc756fc6c6244e336cd6faeed2ab37817bdab8c0684586c44d551074fd2ec84bfcd3f4d5897db3196e783653a042699e5b9a8a3351d653992bb256956b652') @@ -34,4 +35,4 @@ package() { install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}" } -# vim: ts=2 sw=2 et: +# vim:set sw=2 sts=-1 et: diff --git a/libedit/deps b/libedit/deps index 8b13789..b28b04f 100644 --- a/libedit/deps +++ b/libedit/deps @@ -1 +1,3 @@ + + diff --git a/libxcrypt/PKGBUILD b/libxcrypt/PKGBUILD index 8b6f3b2..210c654 100644 --- a/libxcrypt/PKGBUILD +++ b/libxcrypt/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=libxcrypt pkgname=(libxcrypt libxcrypt-compat) -pkgver=4.4.31 +pkgver=4.4.32 pkgrel=01 pkgdesc='Modern library for one-way hashing of passwords' arch=('x86_64') @@ -70,7 +70,7 @@ license=('GPL') validpgpkeys=('678CE3FEE430311596DB8C16F52E98007594C21D') # Björn 'besser82' Esser -sha256sums=(c0181b6a8eea83850cfe7783119bf71fddbde69adddda1d15747ba433d5c57ba # libxcrypt-4.4.31.tar.xz - 296af0a04613bf80ab440ddc65129ca29c37ceaa6476da565c99297191f7e5b8) # libxcrypt-4.4.31.tar.xz.asc +sha256sums=(0613f9bd51d713f8bb79fa10705b68d2ab705c3be4c4fc119f0a96bdc72256c4 # libxcrypt-4.4.32.tar.xz + 77eb4294c1074ea5a8e83a7fc9cadca4342761f2467c94a12b498a5f4d5e88c4) # libxcrypt-4.4.32.tar.xz.asc diff --git a/libxcrypt/PKGBUILD-arch b/libxcrypt/PKGBUILD-arch index d77b8f1..eb900dd 100644 --- a/libxcrypt/PKGBUILD-arch +++ b/libxcrypt/PKGBUILD-arch @@ -2,7 +2,7 @@ pkgbase=libxcrypt pkgname=(libxcrypt libxcrypt-compat) -pkgver=4.4.31 +pkgver=4.4.32 pkgrel=1 pkgdesc='Modern library for one-way hashing of passwords' arch=('x86_64') @@ -14,7 +14,7 @@ options=('debug') install=libxcrypt.install validpgpkeys=('678CE3FEE430311596DB8C16F52E98007594C21D') # Björn 'besser82' Esser source=("${url}/releases/download/v${pkgver}/${pkgbase}-${pkgver}.tar.xz"{,.asc}) -sha256sums=('c0181b6a8eea83850cfe7783119bf71fddbde69adddda1d15747ba433d5c57ba' +sha256sums=('0613f9bd51d713f8bb79fa10705b68d2ab705c3be4c4fc119f0a96bdc72256c4' 'SKIP') build() { diff --git a/lzo/PKGBUILD b/lzo/PKGBUILD index dcab2e9..c7bd5d5 100644 --- a/lzo/PKGBUILD +++ b/lzo/PKGBUILD @@ -1,16 +1,19 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=lzo pkgver=2.10 -pkgrel=03 +pkgrel=04 pkgdesc="Portable lossless data compression library" arch=('x86_64') url="https://www.oberhumer.com/opensource/lzo" depends=('glibc') +provides=('liblzo2.so' 'libminilzo.so') +#options=('debug') ## uncomment this to produce the debug pkg source=(https://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) build() { @@ -45,3 +48,5 @@ package() { license=('GPL') sha256sums=(c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072) # lzo-2.10.tar.gz + + diff --git a/lzo/PKGBUILD-arch b/lzo/PKGBUILD-arch index d00e0b3..d1160af 100644 --- a/lzo/PKGBUILD-arch +++ b/lzo/PKGBUILD-arch @@ -3,12 +3,14 @@ pkgname=lzo pkgver=2.10 -pkgrel=3 +pkgrel=4 pkgdesc="Portable lossless data compression library" arch=('x86_64') url="https://www.oberhumer.com/opensource/lzo" license=('GPL') depends=('glibc') +provides=('liblzo2.so' 'libminilzo.so') +options=('debug') source=(https://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) sha1sums=('4924676a9bae5db58ef129dc1cebce3baa3c4b5d') diff --git a/lzo/deps b/lzo/deps index 8b13789..b28b04f 100644 --- a/lzo/deps +++ b/lzo/deps @@ -1 +1,3 @@ + + diff --git a/lzo/time b/lzo/time index 94fa3fb..9972ef9 100644 --- a/lzo/time +++ b/lzo/time @@ -1,3 +1,6 @@ -real 0m23.993s -user 0m41.929s -sys 0m3.219s + + +real 0m35.402s +user 0m32.480s +sys 0m2.943s + diff --git a/mpfr/PKGBUILD b/mpfr/PKGBUILD index a654585..7a26689 100644 --- a/mpfr/PKGBUILD +++ b/mpfr/PKGBUILD @@ -1,27 +1,29 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=mpfr -_pkgver=4.1.0 +_pkgver=4.1.1 _patchver=13 -pkgrel=03 +pkgrel=01 pkgver=${_pkgver}.p${_patchver} pkgdesc='Multiple-precision floating-point library' arch=(x86_64) url='https://www.mpfr.org/' depends=('glibc' 'gmp') makedepends=('autoconf-archive' 'automake') -source=("https://ftp.gnu.org/gnu/mpfr/mpfr-${_pkgver}.tar.xz"{,.sig} - patches.diff) # wget https://www.mpfr.org/mpfr-4.1.0/allpatches -O patches.diff +#options=(debug) ### uncomment here for debug pkg +source=("https://ftp.gnu.org/gnu/mpfr/mpfr-${_pkgver}.tar.xz"{,.sig}) +# patches.diff) # wget https://www.mpfr.org/mpfr-4.1.0/allpatches -O patches.diff prepare() { cd $pkgname-${_pkgver} - patch -p1 < "$srcdir"/patches.diff - autoreconf -fiv +# patch -p1 < "$srcdir"/patches.diff +# autoreconf -fiv } build() { @@ -47,10 +49,11 @@ package() { license=('GPL3' 'LGPL3') -# NOTE: key holder contacted about unsafe key (2021-05-03) -validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D') # Vincent Lefevre +validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D' + 'A534BE3F83E241D918280AEB5831D11A0D4DB02A') # Vincent Lefevre + +sha256sums=(ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d # mpfr-4.1.1.tar.xz + 0a89e2deeaee37760a1941d263b3a6d6d8d06e53bc3b353b0a7488ca10a788b0) # mpfr-4.1.1.tar.xz.sig +# 75af77904037442fcd3061a4fee2394194716c542e96989dcfac2445c842daf1) # patches.diff # 4.1.0 -sha256sums=(0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f # mpfr-4.1.0.tar.xz - 681220885640e2918a52a6d8ac1e3fd9dc2a7f6f62d5aae0d99665b981d84cff # mpfr-4.1.0.tar.xz.sig - 75af77904037442fcd3061a4fee2394194716c542e96989dcfac2445c842daf1) # patches.diff diff --git a/mpfr/PKGBUILD-arch b/mpfr/PKGBUILD-arch index f072173..cda3b1d 100644 --- a/mpfr/PKGBUILD-arch +++ b/mpfr/PKGBUILD-arch @@ -4,32 +4,32 @@ # Contributor: damir pkgname=mpfr -_pkgver=4.1.0 -_patchver=13 -pkgrel=3 -pkgver=${_pkgver}.p${_patchver} +_pkgver=4.1.1 +#_patchver=13 +pkgrel=1 +#pkgver=${_pkgver}.p${_patchver} +pkgver=$_pkgver pkgdesc='Multiple-precision floating-point library' arch=(x86_64) url='https://www.mpfr.org/' -license=('GPL3' 'LGPL3') -depends=('glibc' 'gmp') -makedepends=('autoconf-archive') -source=("https://ftp.gnu.org/gnu/mpfr/mpfr-${_pkgver}.tar.xz"{,.sig} - patches.diff) # wget https://www.mpfr.org/mpfr-4.1.0/allpatches -O patches.diff -sha512sums=('1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273' - 'SKIP' - 'f7504bbca6631c9e0eba74b7e410032aec9f4f45731c48b1622c8251797dcb05e76e547ccfa407a767b1c35f08a04b61e872a982e07121c82bc11fcb6e9c06c6') -b2sums=('41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68' - 'SKIP' - '3b1a1775619d5f4ec710f896596bcc2391707ec97c50d65acba2305c7e910756b2a63d476abf7877d97db9f5ed49991d23fd7ed278f08b7d96346640fb06d5d1') +license=(GPL3 LGPL3) +depends=(glibc gmp) +source=(https://ftp.gnu.org/gnu/mpfr/mpfr-${_pkgver}.tar.xz{,.sig}) +# patches.diff) # wget https://www.mpfr.org/mpfr-4.1.0/allpatches -O patches.diff +sha512sums=('be468749bd88870dec37be35e544983a8fb7bda638eb9414c37334b9d553099ea2aa067045f51ae2c8ab86d852ef833e18161d173e414af0928e9a438c9b91f1' + 'SKIP') +b2sums=('ce20baee2f060acb28b877ffe6fc40c5619cf6af231bd54ca6cfb3e42ef2d74a4ffbab96cf0b5dd6a162e558099a54701d42f34f5bf2256f256fe6f5ae2505d0' + 'SKIP') # NOTE: key holder contacted about unsafe key (2021-05-03) -validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D') # Vincent Lefevre +validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D' + 'A534BE3F83E241D918280AEB5831D11A0D4DB02A') # Vincent Lefevre +options=(debug) prepare() { cd $pkgname-${_pkgver} - patch -p1 < "$srcdir"/patches.diff - autoreconf -fiv +# patch -p1 < "$srcdir"/patches.diff +# autoreconf -fiv } build() { diff --git a/mpfr/key b/mpfr/key index 009c36d..2b5ce7c 100644 --- a/mpfr/key +++ b/mpfr/key @@ -1 +1 @@ -gpg -v --recv-key 980C197698C3739D +gpg -v --recv-keys 5831D11A0D4DB02A diff --git a/zlib/PKGBUILD b/zlib/PKGBUILD index 31605a9..220877a 100644 --- a/zlib/PKGBUILD +++ b/zlib/PKGBUILD @@ -9,12 +9,13 @@ pkgbase=zlib pkgname=(zlib minizip) epoch=1 pkgver=1.2.13 -pkgrel=01 +pkgrel=02 arch=('x86_64') url="https://www.zlib.net/" depends=('glibc') makedepends=('automake' 'autoconf') options=('staticlibs') # needed by binutils testsuite +#options=('staticlibs' 'debug') ## uncomment this to have the debug pkg produced source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) prepare() { diff --git a/zlib/PKGBUILD-arch b/zlib/PKGBUILD-arch index d9b5cff..0513015 100644 --- a/zlib/PKGBUILD-arch +++ b/zlib/PKGBUILD-arch @@ -4,12 +4,15 @@ pkgbase=zlib pkgname=(zlib minizip) epoch=1 pkgver=1.2.13 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('custom') url="https://www.zlib.net/" depends=('glibc') -options=('staticlibs') # needed by binutils testsuite +options=( + 'staticlibs' # needed by binutils testsuite + 'debug' +) source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) sha256sums=('b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30' 'SKIP')