From 56576cf004e4195322520b2bc0b527389674a3c6 Mon Sep 17 00:00:00 2001 From: joborun Date: Sat, 17 Feb 2024 10:09:38 +0200 Subject: [PATCH] upg libblockdev nvme-cli qt6-base --- libblockdev/PKGBUILD | 5 +++-- libblockdev/PKGBUILD-arch | 2 +- nvme-cli/PKGBUILD | 16 +++++++++++++--- nvme-cli/PKGBUILD-arch | 14 ++++++++++++-- php7/PKGBUILD | 3 --- php7/PKGBUILD-arch | 1 - php7/deps | 1 + qt6-base/PKGBUILD | 17 ++++++++--------- qt6-base/PKGBUILD-arch | 9 +++------ 9 files changed, 41 insertions(+), 27 deletions(-) diff --git a/libblockdev/PKGBUILD b/libblockdev/PKGBUILD index ddb1381..52cb6d9 100644 --- a/libblockdev/PKGBUILD +++ b/libblockdev/PKGBUILD @@ -7,7 +7,7 @@ usr/bin/bash pkgname=libblockdev pkgver=3.0.4 -pkgrel=01 +pkgrel=02 pkgdesc="A library for manipulating block devices w/o systemd" #url="https://github.com/rhinstaller/libblockdev" url="https://github.com/storaged-project/libblockdev" @@ -70,4 +70,5 @@ license=('LGPL') sha256sums=(49841ff92db0ab032931e6f2b5eab63e5969b0ddc14b067b60e46a6eb6c60e47) # libblockdev-3.0.4.tar.gz -## 7db5d0d71965d08370ede20d830fdda02dcd36602775c9382e2c8e556201a86c libblockdev-3.0.4-01-x86_64.pkg.tar.lz +## 241bbe2e4a51bb916c2b4e0011005cc30510729e5d44dddbae458ba1ed9a5b0c libblockdev-3.0.4-02-x86_64.pkg.tar.lz + diff --git a/libblockdev/PKGBUILD-arch b/libblockdev/PKGBUILD-arch index 8c0d013..13db1dd 100644 --- a/libblockdev/PKGBUILD-arch +++ b/libblockdev/PKGBUILD-arch @@ -2,7 +2,7 @@ pkgname=libblockdev pkgver=3.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A library for manipulating block devices" arch=('x86_64') url="https://github.com/storaged-project/libblockdev" diff --git a/nvme-cli/PKGBUILD b/nvme-cli/PKGBUILD index f3b1fab..cc4ee75 100644 --- a/nvme-cli/PKGBUILD +++ b/nvme-cli/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=nvme-cli -pkgver=2.7.1 +pkgver=2.8 pkgrel=01 pkgdesc="NVM-Express user space tooling for Linux w/o systemd" url="https://github.com/linux-nvme/nvme-cli" @@ -21,6 +21,11 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/${pkgname}/archi build() { cd "${pkgname}-${pkgver}" + + # this uses malloc_usable_size, which is incompatible with fortification level 3 + export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + meson setup \ --prefix /usr \ --libexecdir lib \ @@ -43,6 +48,11 @@ build() { package() { cd "${pkgname}-${pkgver}" + + # this uses malloc_usable_size, which is incompatible with fortification level 3 + export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + DESTDIR="$pkgdir" meson install -C .build rm -rf $pkgdir/usr/false @@ -54,7 +64,7 @@ arch=(x86_64) license=('GPL') -sha256sums=(4c69d0f3c8b553110d0f63f5876d56627abd2d9f5d3904e2480cedd03cb15654) # nvme-cli-2.7.1.tar.gz +sha256sums=(0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531) # nvme-cli-2.8.tar.gz -## 6800a0b8782281dab57a31b598520d88cc324e14c6707a81ece855669d1f29a5 nvme-cli-2.7.1-01-x86_64.pkg.tar.lz +## 8317931939274fc533277448b47eb5ddbb7e546bf64f06ad14edd9e00c97d5aa nvme-cli-2.8-01-x86_64.pkg.tar.lz diff --git a/nvme-cli/PKGBUILD-arch b/nvme-cli/PKGBUILD-arch index d8214f0..ef53a01 100644 --- a/nvme-cli/PKGBUILD-arch +++ b/nvme-cli/PKGBUILD-arch @@ -5,7 +5,7 @@ # Contributor: Martin Schrodt pkgname=nvme-cli -pkgver=2.7.1 +pkgver=2.8 pkgrel=1 pkgdesc="NVM-Express user space tooling for Linux" arch=('x86_64') @@ -17,10 +17,15 @@ options=(strip) install=nvme-cli.install # checkdepends=('python2-nose' 'python-nose') source=("$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('4c69d0f3c8b553110d0f63f5876d56627abd2d9f5d3904e2480cedd03cb15654') +sha256sums=('0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531') build() { cd "${pkgname}-${pkgver}" + + # this uses malloc_usable_size, which is incompatible with fortification level 3 + export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + meson setup \ --prefix /usr \ --sysconfdir /etc \ @@ -43,5 +48,10 @@ build() { package() { cd "${pkgname}-${pkgver}" + + # this uses malloc_usable_size, which is incompatible with fortification level 3 + export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + DESTDIR="$pkgdir" meson install -C .build } diff --git a/php7/PKGBUILD b/php7/PKGBUILD index 3e7f8b1..9a5102f 100644 --- a/php7/PKGBUILD +++ b/php7/PKGBUILD @@ -349,6 +349,3 @@ sha256sums=(924846abf93bc613815c55dd3f5809377813ac62a9ec4eb3778675b82a27b927 # e02f657e2661ad01081835ded7fcdb0fbe9177b7d0acc4aeaae4164a593a991f # php.ini.patch d94d22ad8bcd13829addda84e9de6b73fa04be9bc6da8622086c7e19c97ab724 # enchant-2.patch 52d7d524ce54c73afde7ddc21b354e76578c8a83fbad0496a743c1ea4916bfe1) # php7.patch - - - diff --git a/php7/PKGBUILD-arch b/php7/PKGBUILD-arch index 3b0edff..402c793 100644 --- a/php7/PKGBUILD-arch +++ b/php7/PKGBUILD-arch @@ -30,7 +30,6 @@ makedepends=('apache' 'aspell' 'c-client' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl' 'oniguruma') checkdepends=('procps-ng') -options=(debug) source=("https://php.net/distributions/php-${pkgver}.tar.xz"{,.asc} 'php7-openssl3.patch::https://github.com/php/php-src/commit/a0972deb0f441fc7991001cb51efc994b70a3b51.patch' 'php7-openssl3-eof.patch::https://github.com/php/php-src/commit/74f75db0c3665677ec006cd379fd561feacffdc6.patch' diff --git a/php7/deps b/php7/deps index 1f6e277..26735e8 100644 --- a/php7/deps +++ b/php7/deps @@ -17,3 +17,4 @@ libnsl oniguruma argon2 + diff --git a/qt6-base/PKGBUILD b/qt6-base/PKGBUILD index 4a24e82..8e015e1 100644 --- a/qt6-base/PKGBUILD +++ b/qt6-base/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=qt6-base pkgname=(qt6-base qt6-xcb-private-headers) _qtver=6.6.2 pkgver=${_qtver/-/} -pkgrel=03 +pkgrel=04 url='https://www.qt.io' pkgdesc='A cross-platform application and UI framework w/o systemd' depends=(brotli dbus double-conversion fontconfig freetype2 gcc-libs @@ -37,13 +37,13 @@ groups=(qt6) _pkgfn=${pkgbase/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz qt6-base-cflags.patch - qt6-base-nostrip.patch - qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07) + qt6-base-nostrip.patch) +# qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07) prepare() { patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake - patch -d $_pkgfn -Rp1 < qt-6.6.2-revert-ABI-break.patch # Revert ABI break in 6.6.2 +# patch -d $_pkgfn -Rp1 < qt-6.6.2-revert-ABI-break.patch # Revert ABI break in 6.6.2 } build() { @@ -111,9 +111,8 @@ license=(GPL3 LGPL3 FDL custom) sha256sums=(b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b # qtbase-everywhere-src-6.6.2.tar.xz 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch - 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094 # qt6-base-nostrip.patch - ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97) # qt-6.6.2-revert-ABI-break.patch - -## 872254bd492324afa0e118656a18be52645ee876998a96b4270c50c6293414a1 qt6-base-6.6.2-03-x86_64.pkg.tar.lz -## ce011d8ce0de77220a56ae50d1256396c6d76683c670f9913dcfabaa252616ee qt6-xcb-private-headers-6.6.2-03-x86_64.pkg.tar.lz + 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch +# ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97) # qt-6.6.2-revert-ABI-break.patch +## e09c6dacbd28d155e061aa46577907de6f2fb76864e4e0dc949e0008a063edfb qt6-base-6.6.2-04-x86_64.pkg.tar.lz +## ecea87efcad4edb899acda149fe99148ddaaab00f6dff29c0b7f2bcd77a3e4dd qt6-xcb-private-headers-6.6.2-04-x86_64.pkg.tar.lz diff --git a/qt6-base/PKGBUILD-arch b/qt6-base/PKGBUILD-arch index 76a3992..c708e65 100644 --- a/qt6-base/PKGBUILD-arch +++ b/qt6-base/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgbase=qt6-base pkgname=(qt6-base qt6-xcb-private-headers) _qtver=6.6.2 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=4 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -81,17 +81,14 @@ groups=(qt6) _pkgfn=${pkgbase/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz qt6-base-cflags.patch - qt6-base-nostrip.patch - qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07) + qt6-base-nostrip.patch) sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' - '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094' - 'ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97') + '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') prepare() { patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake - patch -d $_pkgfn -Rp1 < qt-6.6.2-revert-ABI-break.patch # Revert ABI break in 6.6.2 } build() {