From 2830a2c3924e7b2ca19a59780cf59c29fee8f270 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Mon, 25 Apr 2022 12:02:36 +0300 Subject: [PATCH] upg zsh zlib brotli bison --- bison/PKGBUILD | 4 ++-- bison/PKGBUILD-arch | 3 ++- bison/deps | 2 ++ brotli/PKGBUILD | 14 ++++++++------ brotli/PKGBUILD-arch | 6 +++--- brotli/deps | 5 ++++- zlib/PKGBUILD | 11 ++++++++--- zlib/PKGBUILD-arch | 11 ++++++++--- zlib/clean | 2 +- zlib/deps | 1 - zsh/PKGBUILD | 10 +++++++--- zsh/PKGBUILD-arch | 7 +++++-- zsh/deps | 1 + 13 files changed, 51 insertions(+), 26 deletions(-) diff --git a/bison/PKGBUILD b/bison/PKGBUILD index b475f8d..c4bfc2a 100644 --- a/bison/PKGBUILD +++ b/bison/PKGBUILD @@ -7,7 +7,7 @@ pkgname=bison pkgver=3.8.2 -pkgrel=03 +pkgrel=04 pkgdesc="The GNU general-purpose parser generator" arch=('x86_64') url="https://www.gnu.org/software/bison/bison.html" @@ -17,7 +17,7 @@ source=("https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz"{,.sig}) build() { cd "${srcdir}/${pkgname}-${pkgver}" - + CFLAGS+=' -ffat-lto-objects' \ ./configure --prefix=/usr --datadir=/usr/share make } diff --git a/bison/PKGBUILD-arch b/bison/PKGBUILD-arch index 1d9f6e4..d8be9be 100644 --- a/bison/PKGBUILD-arch +++ b/bison/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=bison pkgver=3.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU general-purpose parser generator" arch=('x86_64') license=('GPL3') @@ -19,6 +19,7 @@ validpgpkeys=('7DF84374B1EE1F9764BBE25D0DDCAA3278D5264E') # Akim Demaille build() { cd "${srcdir}/${pkgname}-${pkgver}" + CFLAGS+=' -ffat-lto-objects' \ ./configure --prefix=/usr --datadir=/usr/share make } diff --git a/bison/deps b/bison/deps index d5051de..d376361 100644 --- a/bison/deps +++ b/bison/deps @@ -1 +1,3 @@ gettext + + diff --git a/brotli/PKGBUILD b/brotli/PKGBUILD index 18af02f..bd9d40d 100644 --- a/brotli/PKGBUILD +++ b/brotli/PKGBUILD @@ -1,14 +1,15 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/attr" +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=brotli pkgname=('brotli' 'python-brotli' 'brotli-testdata') _gitcommit=e61745a6b7add50d380cfd7d3883dd6c62fc2c71 pkgver=1.0.9 -pkgrel=07 +pkgrel=08 pkgdesc='Generic-purpose lossless compression algorithm' url='https://github.com/google/brotli' arch=('x86_64') @@ -31,8 +32,9 @@ build() { cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_SHARED_LIBS=True + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects" + make -C build VERBOSE=1 } @@ -78,4 +80,4 @@ package_brotli-testdata() { license=('MIT') -sha256sums=('SKIP') +sha256sums=(SKIP) diff --git a/brotli/PKGBUILD-arch b/brotli/PKGBUILD-arch index f574a2f..759b65e 100644 --- a/brotli/PKGBUILD-arch +++ b/brotli/PKGBUILD-arch @@ -8,7 +8,7 @@ pkgbase=brotli pkgname=('brotli' 'python-brotli' 'brotli-testdata') _gitcommit=e61745a6b7add50d380cfd7d3883dd6c62fc2c71 pkgver=1.0.9 -pkgrel=7 +pkgrel=8 pkgdesc='Generic-purpose lossless compression algorithm' url='https://github.com/google/brotli' arch=('x86_64') @@ -33,8 +33,8 @@ build() { cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_SHARED_LIBS=True + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects" make -C build VERBOSE=1 } diff --git a/brotli/deps b/brotli/deps index bfcfa33..1276585 100644 --- a/brotli/deps +++ b/brotli/deps @@ -1 +1,4 @@ -git cmake python-setuptools +git +cmake +python-setuptools + diff --git a/zlib/PKGBUILD b/zlib/PKGBUILD index d268ba5..fc16358 100644 --- a/zlib/PKGBUILD +++ b/zlib/PKGBUILD @@ -9,17 +9,21 @@ pkgbase=zlib pkgname=(zlib minizip) epoch=1 pkgver=1.2.12 -pkgrel=01 +pkgrel=02 arch=('x86_64') url="https://www.zlib.net/" depends=('glibc') makedepends=('automake' 'autoconf') options=('staticlibs') # needed by binutils testsuite -source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) +source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc} + $pkgname-handle-incorrect-crc-inputs.patch::https://github.com/madler/zlib/commit/ec3df00224d4.patch) prepare() { cd "${srcdir}/zlib-$pkgver" grep -A 24 '^ Copyright' zlib.h > LICENSE + + # https://github.com/madler/zlib/issues/613 + patch -Np1 -i ../$pkgname-handle-incorrect-crc-inputs.patch } build() { @@ -71,4 +75,5 @@ license=('custom') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') sha256sums=(91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 # zlib-1.2.12.tar.gz - 1ee1ba0d9e837f44aecf33600c82ae162d76f0069e446afb4c326ac64b5fe995) # zlib-1.2.12.tar.gz.asc + 1ee1ba0d9e837f44aecf33600c82ae162d76f0069e446afb4c326ac64b5fe995 # zlib-1.2.12.tar.gz.asc + 00e023c3ccb7b895ebb3421970b1b77f8a527b40190f35050b79fd0e817a7b0c) # zlib-handle-incorrect-crc-inputs.patch diff --git a/zlib/PKGBUILD-arch b/zlib/PKGBUILD-arch index 8c619ed..8a3d69e 100644 --- a/zlib/PKGBUILD-arch +++ b/zlib/PKGBUILD-arch @@ -4,20 +4,25 @@ pkgbase=zlib pkgname=(zlib minizip) epoch=1 pkgver=1.2.12 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('custom') url="https://www.zlib.net/" depends=('glibc') options=('staticlibs') # needed by binutils testsuite -source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) +source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc} + $pkgname-handle-incorrect-crc-inputs.patch::https://github.com/madler/zlib/commit/ec3df00224d4.patch) sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9' - 'SKIP') + 'SKIP' + '00e023c3ccb7b895ebb3421970b1b77f8a527b40190f35050b79fd0e817a7b0c') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() { cd "${srcdir}/zlib-$pkgver" grep -A 24 '^ Copyright' zlib.h > LICENSE + + # https://github.com/madler/zlib/issues/613 + patch -Np1 -i ../$pkgname-handle-incorrect-crc-inputs.patch } build() { diff --git a/zlib/clean b/zlib/clean index 7a701ec..7089e4d 100644 --- a/zlib/clean +++ b/zlib/clean @@ -1 +1 @@ -rm -rvf {src,pkg,*gz*} +rm -rvf {src,pkg,*gz*,zlib-*patch} diff --git a/zlib/deps b/zlib/deps index 902f898..8617447 100644 --- a/zlib/deps +++ b/zlib/deps @@ -1,3 +1,2 @@ autoconf automake - diff --git a/zsh/PKGBUILD b/zsh/PKGBUILD index 1f8a54e..1fd646d 100644 --- a/zsh/PKGBUILD +++ b/zsh/PKGBUILD @@ -1,16 +1,17 @@ #!/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 |--------------------------------------- pkgbase=zsh pkgname=('zsh' 'zsh-doc') pkgver=5.8.1 -pkgrel=01 +pkgrel=02 arch=('x86_64') url='https://www.zsh.org/' -makedepends=('pcre' 'libcap' 'gdbm') +makedepends=(pcre libcap gdbm yodl) source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} 'zprofile') prepare() { @@ -28,6 +29,9 @@ prepare() { sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd done rm Completion/Linux/Command/_pkgtool + + # force generation of documentation with correct paths + rm Doc/version.yo } build() { diff --git a/zsh/PKGBUILD-arch b/zsh/PKGBUILD-arch index ad47721..4e27b5a 100644 --- a/zsh/PKGBUILD-arch +++ b/zsh/PKGBUILD-arch @@ -3,11 +3,11 @@ pkgbase=zsh pkgname=('zsh' 'zsh-doc') pkgver=5.8.1 -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.zsh.org/' license=('custom') -makedepends=('pcre' 'libcap' 'gdbm') +makedepends=('pcre' 'libcap' 'gdbm' 'yodl') source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} 'zprofile') sha512sums=('f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d' @@ -34,6 +34,9 @@ prepare() { sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd done rm Completion/Linux/Command/_pkgtool + + # force generation of documentation with correct paths + rm Doc/version.yo } build() { diff --git a/zsh/deps b/zsh/deps index 8b13789..ae46189 100644 --- a/zsh/deps +++ b/zsh/deps @@ -1 +1,2 @@ +yodl