From 40ae193b512eb4305f09c8bf41a3f75bea3c1a4b Mon Sep 17 00:00:00 2001 From: joborun Date: Wed, 24 Apr 2024 04:46:24 +0300 Subject: [PATCH] upg gpgme btrfs-progs --- btrfs-progs/PKGBUILD | 5 ++--- btrfs-progs/PKGBUILD-arch | 2 +- gpgme/PKGBUILD | 7 +++---- gpgme/PKGBUILD-arch | 33 ++++----------------------------- python/PKGBUILD-arch | 31 ++++++++----------------------- 5 files changed, 18 insertions(+), 60 deletions(-) diff --git a/btrfs-progs/PKGBUILD b/btrfs-progs/PKGBUILD index b19c236..038e2e8 100644 --- a/btrfs-progs/PKGBUILD +++ b/btrfs-progs/PKGBUILD @@ -7,7 +7,7 @@ pkgname=btrfs-progs pkgver=6.8 -pkgrel=02 +pkgrel=03 pkgdesc='Btrfs filesystem utilities w/o systemd' makedepends=('asciidoc' 'xmlto' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx' 'python-sphinx_rtd_theme') @@ -77,5 +77,4 @@ sha256sums=(9c21645feac182611e28b47769d5f613cb9e2ecab58ece60b10e6c55a9ead575 # bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs 35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs -## 06a539baec2c2312fa57726abbaf1ba0b8339c0ebe419a70e3fd90727d06ab55 btrfs-progs-6.8-02-x86_64.pkg.tar.lz - +## a9881a0126d2243e2ea7f6d30534619090b0c2f0089226dd2a0da0fe86d18ca2 btrfs-progs-6.8-03-x86_64.pkg.tar.lz diff --git a/btrfs-progs/PKGBUILD-arch b/btrfs-progs/PKGBUILD-arch index aec4b3b..fa91ee9 100644 --- a/btrfs-progs/PKGBUILD-arch +++ b/btrfs-progs/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=btrfs-progs pkgver=6.8 -pkgrel=2 +pkgrel=3 pkgdesc='Btrfs filesystem utilities' arch=('x86_64') makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools' 'e2fsprogs' diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD index f5309ec..7ce09e1 100644 --- a/gpgme/PKGBUILD +++ b/gpgme/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=gpgme #pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme) pkgname=(gpgme python-gpgme) # qgpgme) pkgver=1.23.2 -pkgrel=02 +pkgrel=04 pkgdesc="A C wrapper library for GnuPG" #options=('debug') ## uncomment this to have the debug pkg produced url='https://www.gnupg.org/related_software/gpgme/' @@ -123,8 +123,7 @@ validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist sig sha256sums=(9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 # gpgme-1.23.2.tar.bz2 23d825e204c13c22416c2387276a08fa654bfaa9a0dbb1e4e9c8e66044451547) # gpgme-1.23.2.tar.bz2.sig -#34c6f18f6fc44f21185a4f8530db0fc2d89b577f0336426c8a82574ef2be4f56) # gpgme-1.23.2.tar.bz2.sig -## d95244e13d6aade4fa15b4b858d7f7c30891c4af6119d5c7a301e8aa33b5c665 gpgme-1.23.2-02-x86_64.pkg.tar.lz -## be31cf37d019b15ce510a4320b4ae1307e48033808ac4541e6f061ba662d1a19 python-gpgme-1.23.2-02-x86_64.pkg.tar.lz +## 88c62fe2ebe25f19e8adf8a9efde7ea4424dc38eeb3181ce13dba24c1016d4fc gpgme-1.23.2-04-x86_64.pkg.tar.lz +## 7ca42c5302833503e768dbac95127bfefd5ee70118f17b30d1490218e77a387d python-gpgme-1.23.2-04-x86_64.pkg.tar.lz diff --git a/gpgme/PKGBUILD-arch b/gpgme/PKGBUILD-arch index 14f1a4f..5f8790f 100644 --- a/gpgme/PKGBUILD-arch +++ b/gpgme/PKGBUILD-arch @@ -3,9 +3,9 @@ # Contributor: Sarah Hay pkgbase=gpgme -pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme) +pkgname=(gpgme qgpgme-qt6 python-gpgme) pkgver=1.23.2 -pkgrel=2 +pkgrel=4 pkgdesc='A C wrapper library for GnuPG' arch=('x86_64') url='https://www.gnupg.org/related_software/gpgme/' @@ -18,7 +18,6 @@ makedepends=( 'python-installer' 'python-setuptools' 'python-wheel' - 'qt5-base' 'qt6-base' 'swig' ) @@ -33,9 +32,6 @@ prepare() { sed -i 's/-unknown//' autogen.sh autoreconf -fi - - # Building qt5 and qt6 bindings in the same source tree is not supported - cp -r ${srcdir}/${pkgbase}-${pkgver}{,-qt6} } build() { @@ -54,15 +50,6 @@ build() { cd lang/python/ top_builddir="$srcdir/$pkgbase-$pkgver" python -m build --wheel --no-isolation ) - - cd ../${pkgbase}-${pkgver}-qt6 - ./configure \ - --prefix=/usr \ - --disable-fd-passing \ - --disable-static \ - --disable-gpgsm-test \ - --enable-languages=cpp,qt6 - make } check() { @@ -85,27 +72,15 @@ package_gpgme() { make DESTDIR="${pkgdir}" install # split qgpgme - rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*} + rm -r "${pkgdir}"/usr/lib/{cmake/QGpgmeQt6/,libqgpgmeqt6.*} rm -r "${pkgdir}"/usr/lib/python* } -package_qgpgme-qt5() { - pkgdesc="Qt5 bindings for GPGme" - depends=('gpgme' 'qt5-base') - provides=('qgpgme') - replaces=('qgpgme') - - cd ${pkgbase}-${pkgver}/lang/qt - - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/include -} - package_qgpgme-qt6() { pkgdesc="Qt6 bindings for GPGme" depends=('gpgme' 'qt6-base') - cd ${pkgbase}-${pkgver}-qt6/lang/qt + cd ${pkgbase}-${pkgver}/lang/qt make DESTDIR="${pkgdir}" install rm -r "${pkgdir}"/usr/include diff --git a/python/PKGBUILD-arch b/python/PKGBUILD-arch index bd91ad3..25cceb9 100644 --- a/python/PKGBUILD-arch +++ b/python/PKGBUILD-arch @@ -9,7 +9,7 @@ shopt -s extglob pkgbase=python pkgname=(python python-tests) -pkgver=3.11.8 +pkgver=3.12.2 pkgrel=1 _pybasever=${pkgver%.*} pkgdesc="The Python programming language" @@ -21,13 +21,14 @@ makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xv source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc} python-expat-2.6.patch::https://github.com/python/cpython/pull/115289.patch EXTERNALLY-MANAGED) -sha512sums=('434e727fa370def348838fd84acb69b4d309cfb03f61bf5069150164e9ca005637ac01dfbf997f445607d4e28d02c8bed0858b36589240ccadaa4c14c19f2320' +sha512sums=('2ccfae7b9f95d8e15ea85d3f66eea5f6a8fdcaffc0b405095fecb33efc0df50b831c1215542910ced948b54e6de1f7242b0b8b9afc5f89079451c552430d7d9f' 'SKIP' '0868854a6b2647706a3c98443fbacf275fe31f85c7cb78301db46e395c17cac9a02512cf0db40b981eae9ffe9d9d5fc8e0a83635adb0e2545ca134d9830cd1e0' '62a6fbfbaeaa3ba7c54e109d9c3b7f67e73bb21986da4c1fcc5d28cca83d71e0fcae28e1fc70ee8ddce7dea8cd0b64e18d1031dae3a2eae5eaa379c53efd53a0') validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) 'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) - 'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado + 'A035C8C19219BA821ECEA86B64E628F8D684696D' # Pablo Galindo Salgado + '7169605F62C751356D054A26A821E680E5FA6305') # Thomas Wouters prepare() { cd Python-${pkgver} @@ -39,7 +40,6 @@ prepare() { # Ensure that we are using the system copy of various libraries (expat, libffi, and libmpdec), # rather than copies shipped in the tarball rm -r Modules/expat - rm -r Modules/_ctypes/{darwin,libffi}* rm -r Modules/_decimal/libmpdec } @@ -77,6 +77,7 @@ check() { # the to-be-installed debug package # test_socket: https://github.com/python/cpython/issues/79428 # test_unittest: https://github.com/python/cpython/issues/108927 + # test_tkk: AssertionError: Tuples differ: (0,) != ('0',) cd Python-${pkgver} @@ -86,7 +87,8 @@ check() { LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum" \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_tk -x test_pyexpat -x test_socket -x test_unittest + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_tk -x test_ttk -x test_ttk.test_widgets \ + -x test_tkinter -x test_pyexpat -x test_socket -x test_unittest } package_python() { @@ -127,10 +129,7 @@ package_python() { # Split tests cd "$pkgdir"/usr/lib/python*/ - rm -r {ctypes/test,distutils/tests,idlelib/idle_test,lib2to3/tests,tkinter/test,unittest/test} - cd test - # FS#76193 - rm -r !(support) + rm -r {test,idlelib/idle_test} } package_python-tests() { @@ -141,19 +140,5 @@ package_python-tests() { make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" libinstall cd "$pkgdir"/usr/lib/python*/ - rm -r !(test|ctypes|distutils|idlelib|lib2to3|tkinter|unittest) - cd "$pkgdir"/usr/lib/python*/test - rm -r support - cd "$pkgdir"/usr/lib/python*/ctypes - rm -r !(test) - cd "$pkgdir"/usr/lib/python*/distutils - rm -r !(tests) - cd "$pkgdir"/usr/lib/python*/idlelib - rm -r !(idle_test) - cd "$pkgdir"/usr/lib/python*/lib2to3 - rm -r !(tests) - cd "$pkgdir"/usr/lib/python*/tkinter - rm -r !(test) - cd "$pkgdir"/usr/lib/python*/unittest rm -r !(test) }