From 5eedf7b10f0bb0a53506513ee6093fcdf65a9d3d Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Sat, 18 Mar 2023 11:37:13 +0200 Subject: [PATCH] upg autoconf automake flex m4 make pkgconf correct pacman deps --- autoconf/PKGBUILD | 5 ++--- autoconf/PKGBUILD-arch | 3 +-- autoconf/time | 6 +++--- automake/PKGBUILD | 21 +++++++++++++-------- automake/PKGBUILD-arch | 9 ++++----- automake/deps | 3 ++- automake/time | 8 +++++--- flex/PKGBUILD | 20 +++++++++++--------- flex/PKGBUILD-arch | 18 +++++++++--------- flex/time | 7 ++++--- m4/PKGBUILD | 10 +++++----- m4/PKGBUILD-arch | 3 +-- m4/time | 8 +++++--- make/PKGBUILD | 9 +++++---- make/PKGBUILD-arch | 3 +-- pacman/deps | 2 -- pkgconf/PKGBUILD | 19 +++++++++++++------ pkgconf/PKGBUILD-arch | 7 +++---- pkgconf/clean | 2 +- pkgconf/deps | 5 ++++- pkgconf/i686-pc-linux-gnu.personality | 5 +++++ pkgconf/x86_64-pc-linux-gnu.personality | 5 +++++ 22 files changed, 102 insertions(+), 76 deletions(-) create mode 100644 pkgconf/i686-pc-linux-gnu.personality create mode 100644 pkgconf/x86_64-pc-linux-gnu.personality diff --git a/autoconf/PKGBUILD b/autoconf/PKGBUILD index 81269ad..27713d8 100644 --- a/autoconf/PKGBUILD +++ b/autoconf/PKGBUILD @@ -7,10 +7,9 @@ pkgname=autoconf pkgver=2.71 -pkgrel=03 +pkgrel=04 pkgdesc="A GNU tool for automatically configuring source code" url="https://www.gnu.org/software/autoconf" -groups=('base-devel') depends=('awk' 'm4' 'diffutils' 'perl' 'sh') checkdepends=('gcc-fortran') source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} @@ -59,4 +58,4 @@ sha256sums=(f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 # f33796ff686c45ee946d5862f46b776cf69cad68bf6861ce20847459a3a18a44 # autoconf-2.71.tar.xz.sig ee07bb3f9692bed2b7689bd361ae4e2e9a1bd852864a0c98f90b7b4c8beddfe4) # autoconf-2.71-bash5.2.patch -## 75d63016160c4a14718d3dcbdafc5a6a6278dccb010d5159ef1e0075e02a57d7 autoconf-2.71-03-x86_64.pkg.tar.lz +## 8738cb25e4d5a97cf20f62ffedf5c8d00a60dda11165f2510651c9e9b98370d2 autoconf-2.71-04-x86_64.pkg.tar.lz diff --git a/autoconf/PKGBUILD-arch b/autoconf/PKGBUILD-arch index 6c4c9a6..ba036ab 100644 --- a/autoconf/PKGBUILD-arch +++ b/autoconf/PKGBUILD-arch @@ -4,12 +4,11 @@ pkgname=autoconf pkgver=2.71 -pkgrel=3 +pkgrel=4 pkgdesc="A GNU tool for automatically configuring source code" arch=('any') license=('GPL2' 'GPL3' 'custom') url="https://www.gnu.org/software/autoconf" -groups=('base-devel') depends=('awk' 'm4' 'diffutils' 'perl' 'sh') checkdepends=('gcc-fortran') source=( diff --git a/autoconf/time b/autoconf/time index 5141469..dccd65d 100644 --- a/autoconf/time +++ b/autoconf/time @@ -1,6 +1,6 @@ -real 23m24.353s -user 20m2.992s -sys 2m53.220s +real 17m9.358s +user 14m15.467s +sys 2m49.828s diff --git a/automake/PKGBUILD b/automake/PKGBUILD index 1345ad7..a28101a 100644 --- a/automake/PKGBUILD +++ b/automake/PKGBUILD @@ -1,16 +1,15 @@ #!/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=automake pkgver=1.16.5 -pkgrel=01 +pkgrel=02 pkgdesc="A GNU tool for automatically creating Makefiles" -arch=('any') url="https://www.gnu.org/software/automake" -groups=('base-devel') depends=('perl' 'bash') makedepends=('autoconf') checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope' @@ -22,22 +21,24 @@ checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope' source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}) build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" ./configure --build=$CHOST --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL') @@ -47,3 +48,7 @@ validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573' # Stefano Lattarini sha256sums=(f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469 # automake-1.16.5.tar.xz 3a161ab65921eed55e1a94251d97c8451d4ba3431b55ca560e95a951b5f1d73a) # automake-1.16.5.tar.xz.sig + +## 5cd8c521058f520c1d01ab3c1fce60aa122dc5a46ffc1f42f2fe737b5c05c89e automake-1.16.5-02-x86_64.pkg.tar.lz + + diff --git a/automake/PKGBUILD-arch b/automake/PKGBUILD-arch index cbf404a..9cf8879 100644 --- a/automake/PKGBUILD-arch +++ b/automake/PKGBUILD-arch @@ -4,12 +4,11 @@ pkgname=automake pkgver=1.16.5 -pkgrel=1 +pkgrel=2 pkgdesc="A GNU tool for automatically creating Makefiles" arch=('any') license=('GPL') url="https://www.gnu.org/software/automake" -groups=('base-devel') depends=('perl' 'bash') makedepends=('autoconf') checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope' @@ -26,17 +25,17 @@ validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573' # Stefano Lattarini '155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" ./configure --build=$CHOST --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/automake/deps b/automake/deps index 9232ce1..7df217a 100644 --- a/automake/deps +++ b/automake/deps @@ -1,6 +1,5 @@ ncompress gettext -lzip zip sharutils help2man @@ -14,3 +13,5 @@ cscope ttf-liberation jdk-openjdk libgit2 + + diff --git a/automake/time b/automake/time index b3320af..3ebd5ee 100644 --- a/automake/time +++ b/automake/time @@ -1,4 +1,6 @@ -real 19m47.926s -user 41m53.887s -sys 5m17.968s + +real 67m50.938s +user 33m8.419s +sys 6m23.180s + diff --git a/flex/PKGBUILD b/flex/PKGBUILD index 49fcd19..be2649e 100644 --- a/flex/PKGBUILD +++ b/flex/PKGBUILD @@ -7,9 +7,8 @@ pkgname=flex pkgver=2.6.4 -pkgrel=04 +pkgrel=05 pkgdesc="A tool for generating text-scanning programs" -arch=('x86_64') url="https://github.com/westes/flex" groups=( jobbot ) depends=('glibc' 'm4' 'sh') @@ -20,20 +19,20 @@ source=("https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver. prepare() { cd "$pkgname-$pkgver" patch -p1 -i "$srcdir"/flex-pie.patch - autoreconf + autoreconf -fiv } build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr + # prevent excessive overlinking due to libtool + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make + } check() { - cd "$pkgname-$pkgver" - - # cxx_restart fails - https://github.com/westes/flex/issues/98 - make -k check || true + make -k check -C $pkgname-$pkgver } package() { @@ -46,7 +45,9 @@ package() { } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('custom') @@ -56,5 +57,6 @@ sha256sums=(e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 # f c61ccc11286e1eb2ceeb0f0a8f8437e86f1e41840991566351f438de7eb5a9a2 #flex-2.6.4.tar.gz.sig 20f3cce6b0ea6ab67a902a46b89c292b959994dedcbe6ee5d187f9bba1408b0e) # flex-pie.patch -# 2d0dcfc48997b7d3a4dc35b4c694ddaf06f539db89f75f4bdd7584bc4ca55eec flex-2.6.4-04-x86_64.pkg.tar.xz +## 498e3bee60a27ed486cda045de2a8981f3ecd0cfbebd0b297db47226342ca3bb flex-2.6.4-05-x86_64.pkg.tar.lz + diff --git a/flex/PKGBUILD-arch b/flex/PKGBUILD-arch index 5b65e7c..3fc6dc6 100644 --- a/flex/PKGBUILD-arch +++ b/flex/PKGBUILD-arch @@ -4,16 +4,17 @@ pkgname=flex pkgver=2.6.4 -pkgrel=4 +pkgrel=5 pkgdesc="A tool for generating text-scanning programs" arch=('x86_64') url="https://github.com/westes/flex" license=('custom') -groups=('base-devel') depends=('glibc' 'm4' 'sh') makedepends=('help2man') -source=("https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver.tar.gz"{,.sig} - "flex-pie.patch") +source=( + "https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver.tar.gz"{,.sig} + "flex-pie.patch" +) sha256sums=('e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995' 'SKIP' '20f3cce6b0ea6ab67a902a46b89c292b959994dedcbe6ee5d187f9bba1408b0e') @@ -22,20 +23,19 @@ validpgpkeys=('56C67868E93390AA1039AD1CE4B29C8D64885307') # Will Estes prepare() { cd "$pkgname-$pkgver" patch -p1 -i "$srcdir"/flex-pie.patch - autoreconf + autoreconf -fiv } build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr + # prevent excessive overlinking due to libtool + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } check() { - cd "$pkgname-$pkgver" - - # cxx_restart fails - https://github.com/westes/flex/issues/98 - make -k check || true + make -k check -C $pkgname-$pkgver } package() { diff --git a/flex/time b/flex/time index 7984f8f..d4ad577 100644 --- a/flex/time +++ b/flex/time @@ -1,5 +1,6 @@ -real 0m43.691s -user 1m28.709s -sys 0m5.342s +real 1m15.897s +user 1m6.635s +sys 0m6.604s + diff --git a/m4/PKGBUILD b/m4/PKGBUILD index db1038c..08550ea 100644 --- a/m4/PKGBUILD +++ b/m4/PKGBUILD @@ -7,9 +7,8 @@ pkgname=m4 pkgver=1.4.19 -pkgrel=02 +pkgrel=03 pkgdesc="The GNU macro processor" -arch=('x86_64') url="https://www.gnu.org/software/m4" groups=( jobbot ) depends=('glibc' 'bash') @@ -32,7 +31,9 @@ package() { make prefix="${pkgdir}"/usr install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL3') @@ -41,6 +42,5 @@ validpgpkeys=('71C2CC22B1C4602927D2F3AAA7A16B4A2527436A') # Eric Blake sha256sums=(63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 # m4-1.4.19.tar.xz 9700ba4dca539b06e033b4e3ab37fa5b983becb6c14569a8b8aa02dee6ab666c) # m4-1.4.19.tar.xz.sig -# f72291aed21b65c2fb5fd14641895e3d8609d5cff157b9fc802b69933ae5d61b m4-1.4.19-02-x86_64.pkg.tar.xz - +## f345f75fbca2743cb97347b20bfbf5e516d8878bd8c189ab3ff5584199854f61 m4-1.4.19-03-x86_64.pkg.tar.lz diff --git a/m4/PKGBUILD-arch b/m4/PKGBUILD-arch index 5f1745c..0e6fa0b 100644 --- a/m4/PKGBUILD-arch +++ b/m4/PKGBUILD-arch @@ -4,12 +4,11 @@ pkgname=m4 pkgver=1.4.19 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU macro processor" arch=('x86_64') url="https://www.gnu.org/software/m4" license=('GPL3') -groups=('base-devel') depends=('glibc' 'bash') source=("https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz"{,.sig}) sha256sums=('63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96' diff --git a/m4/time b/m4/time index b446fd1..588f042 100644 --- a/m4/time +++ b/m4/time @@ -1,4 +1,6 @@ -real 0m55.549s -user 1m24.903s -sys 0m9.716s + +real 1m38.300s +user 1m7.870s +sys 0m11.119s + diff --git a/make/PKGBUILD b/make/PKGBUILD index e2c9253..8074380 100644 --- a/make/PKGBUILD +++ b/make/PKGBUILD @@ -7,9 +7,8 @@ pkgname=make pkgver=4.4.1 -pkgrel=01 +pkgrel=02 pkgdesc="GNU make utility to maintain groups of programs" -arch=('x86_64') url="https://www.gnu.org/software/make" groups=( jobbot ) depends=('glibc' 'guile') @@ -31,7 +30,9 @@ package() { make DESTDIR="${pkgdir}" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL3') @@ -40,5 +41,5 @@ validpgpkeys=('6D4EEB02AD834703510B117680CB727A20C79BB2') # Paul Smith sha256sums=(8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9 # make-4.4.1.tar.lz ce4acf9c93e686a8e365f4adc21e8c36575ef9bbeeb2bd8437f215005078a14f) # make-4.4.1.tar.lz.sig -## f71d50b9a082a726caf22b560008e4847243ae5754cceb5dfe082eea6fc6c435 make-4.4.1-01-x86_64.pkg.tar.lz +## 07d9b6fd0a333bad141b593dabc0dc35a1e39c0863a7b9326ee57931011a381b make-4.4.1-02-x86_64.pkg.tar.lz diff --git a/make/PKGBUILD-arch b/make/PKGBUILD-arch index d808df3..c768934 100644 --- a/make/PKGBUILD-arch +++ b/make/PKGBUILD-arch @@ -4,12 +4,11 @@ pkgname=make pkgver=4.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU make utility to maintain groups of programs" arch=('x86_64') url="https://www.gnu.org/software/make" license=('GPL3') -groups=('base-devel') depends=('glibc' 'guile') source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz"{,.sig}) sha256sums=('8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9' diff --git a/pacman/deps b/pacman/deps index d9e62ef..bd3e04f 100644 --- a/pacman/deps +++ b/pacman/deps @@ -5,7 +5,5 @@ python fakechroot cmake bash-completion -lzip - diff --git a/pkgconf/PKGBUILD b/pkgconf/PKGBUILD index c70bb63..cf46dc5 100644 --- a/pkgconf/PKGBUILD +++ b/pkgconf/PKGBUILD @@ -1,22 +1,23 @@ #!/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=pkgconf -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=01 pkgdesc="Package compiler and linker metadata toolkit w/o i686 module" -url="https://github.com/pkgconf/pkgconf" -arch=(x86_64) +# old url="https://github.com/pkgconf/pkgconf" +url="https://gitea.treehouse.systems/ariadne/pkgconf" groups=( jobbot ) depends=(glibc sh) makedepends=(git meson) provides=(pkg-config pkgconfig libpkgconf.so) conflicts=(pkg-config) replaces=(pkg-config) -_commit=cef30268e1a3f79efd607c26abcf556aa314c9c4 # tags/pkgconf-1.8.0 +_commit=5436648cd4c890fa1e99be82adc333dad4f50eff # tags/pkgconf-1.8.1 source=("git+$url#commit=$_commit" i686-pc-linux-gnu.personality x86_64-pc-linux-gnu.personality) @@ -55,10 +56,16 @@ package() { install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(custom:ISC) sha256sums=(SKIP 6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1 # i686-pc-linux-gnu.personality c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5) # x86_64-pc-linux-gnu.personality + +## 49885b1e7250d4abfa1df91a2f9a4009d6cfbcbab9dacfef4991d5e74f81569a pkgconf-1.8.1-01-x86_64.pkg.tar.lz + + diff --git a/pkgconf/PKGBUILD-arch b/pkgconf/PKGBUILD-arch index 2443734..8f44c23 100644 --- a/pkgconf/PKGBUILD-arch +++ b/pkgconf/PKGBUILD-arch @@ -5,10 +5,10 @@ # Contributor: Bartlomiej Piotrowski pkgname=pkgconf -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="Package compiler and linker metadata toolkit" -url="https://github.com/pkgconf/pkgconf" +url="https://gitea.treehouse.systems/ariadne/pkgconf" license=(custom:ISC) arch=(x86_64) depends=(glibc sh) @@ -16,8 +16,7 @@ makedepends=(git meson) provides=(pkg-config pkgconfig libpkgconf.so) conflicts=(pkg-config) replaces=(pkg-config) -groups=(base-devel) -_commit=cef30268e1a3f79efd607c26abcf556aa314c9c4 # tags/pkgconf-1.8.0 +_commit=5436648cd4c890fa1e99be82adc333dad4f50eff # tags/pkgconf-1.8.1 source=("git+$url#commit=$_commit" i686-pc-linux-gnu.personality x86_64-pc-linux-gnu.personality) diff --git a/pkgconf/clean b/pkgconf/clean index 5e00edf..2e25a1f 100644 --- a/pkgconf/clean +++ b/pkgconf/clean @@ -1 +1 @@ -rm -rf {src,pkg,pkgconf,*-pc-linux-gnu.personality} +rm -rf {src,pkg,pkgconf} diff --git a/pkgconf/deps b/pkgconf/deps index d5c1b36..3995316 100644 --- a/pkgconf/deps +++ b/pkgconf/deps @@ -1 +1,4 @@ -git meson +git +meson + + diff --git a/pkgconf/i686-pc-linux-gnu.personality b/pkgconf/i686-pc-linux-gnu.personality new file mode 100644 index 0000000..b76226b --- /dev/null +++ b/pkgconf/i686-pc-linux-gnu.personality @@ -0,0 +1,5 @@ +Triplet: i686-pc-linux-gnu +SysrootDir: / +DefaultSearchPaths: /usr/lib32/pkgconfig:/usr/share/pkgconfig +SystemIncludePaths: /usr/include +SystemLibraryPaths: /usr/lib32 diff --git a/pkgconf/x86_64-pc-linux-gnu.personality b/pkgconf/x86_64-pc-linux-gnu.personality new file mode 100644 index 0000000..4578869 --- /dev/null +++ b/pkgconf/x86_64-pc-linux-gnu.personality @@ -0,0 +1,5 @@ +Triplet: x86_64-pc-linux-gnu +SysrootDir: / +DefaultSearchPaths: /usr/lib/pkgconfig:/usr/share/pkgconfig +SystemIncludePaths: /usr/include +SystemLibraryPaths: /usr/lib