diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD index 1a2eaae..a5a7d41 100644 --- a/gpgme/PKGBUILD +++ b/gpgme/PKGBUILD @@ -7,18 +7,18 @@ pkgbase=gpgme #pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme) -pkgname=(gpgme python-gpgme qgpgme) -pkgver=1.20.0 -pkgrel=03 +pkgname=(gpgme python-gpgme) # qgpgme) +pkgver=1.21.0 +pkgrel=01 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/' -makedepends=('gnupg' 'libgpg-error' 'python' 'python-setuptools' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel' 'swig' 'qt5-base') +makedepends=('gnupg' 'libgpg-error' 'python' 'python-setuptools' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel' 'swig') # 'qt5-base') source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}) -# # joborun: it is not supported but Arch is forcing it to support both qt5&6 +# # joborun: it is not supported but Arch is forcing it to support both qt5 & 6 # # get the qt pkgs from Arch then because we would rather live without Qt than allow it to penetrate deeper -# # QT's licensing shouldn't be perceived as free any more, Arch tries to support unsupported qt5 and qt6 +# # QT's licensing should not be perceived as free any more, Arch tries to support unsupported qt5 and qt6 # # Arch note below: #prepare() { ## Building qt5 and qt6 bindings in the same source tree is not supported @@ -42,6 +42,15 @@ build() { 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 \ +# --disable-languages=qt6,qt5 +# make } check() { @@ -67,20 +76,31 @@ package_gpgme() { make DESTDIR="${pkgdir}" install # split qgpgme - rm -r "${pkgdir}"/usr/include/{qgpgme,QGpgME}/ - rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*} +# rm -r "${pkgdir}"/usr/include/{qgpgme,QGpgME}/ +# rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*} rm -r "${pkgdir}"/usr/lib/python* } -package_qgpgme() { - pkgdesc="Qt bindings for GPGme" - depends=('gpgme' 'qt5-base') - provides=('qgpgme-qt5') - conflicts=('qgpgme-qt5') - cd ${pkgbase}-${pkgver}/lang/qt +#package_qgpgme-qt5() { +# pkgdesc="Qt5 bindings for GPGme" +# depends=('gpgme' 'qt5-base') +# provides=('qgpgme-qt5') +# conflicts=('qgpgme') +# cd ${pkgbase}-${pkgver}-qt5/lang/qt +# +# make DESTDIR="${pkgdir}" install +#} +# +#package_qgpgme-qt6() { +# pkgdesc="Qt6 bindings for GPGme" +# depends=('gpgme' 'qt6-base') +# +# cd ${pkgbase}-${pkgver}-qt6/lang/qt +# +# make DESTDIR="${pkgdir}" install +# rm -r "${pkgdir}"/usr/include +#} - make DESTDIR="${pkgdir}" install -} package_python-gpgme() { pkgdesc="Python bindings for GPGme" @@ -99,10 +119,9 @@ license=('LGPL') validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020) 'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key) -sha256sums=(25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 # gpgme-1.20.0.tar.bz2 - f32a7e1c6c132ca06dde763b243ab0f4055fb360ced1761829c7dc8b38528db6) # gpgme-1.20.0.tar.bz2.sig +sha256sums=(416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 # gpgme-1.21.0.tar.bz2 + 4d1e5f74cc39cdad4efd591a09026f8e7f045d2bd572f1d79ec34d9ba29be446) # gpgme-1.21.0.tar.bz2.sig -## 8e42d5e48d46fa5b421ac2a8c62c75c074a1eb92798a4ee1c50572eff77af393 gpgme-1.20.0-03-x86_64.pkg.tar.lz -## baebbe004fa495fea3ebea586af85d4509d3c782da4ddced5233888c1dc4fda0 python-gpgme-1.20.0-03-x86_64.pkg.tar.lz -## 3e68c606a394b039971d04e2d3474100b51dd6aec6d84704c29d31d35764deb9 qgpgme-1.20.0-03-x86_64.pkg.tar.lz +## 15449c25c5dada3a7f45ac52b47e547cab4a284f62089c1777af7da3b4ce47f4 gpgme-1.21.0-01-x86_64.pkg.tar.lz +## 64de72fb80ba12ad95243c130df55ba8f918afb1c79263639f45c1977e5f1c9d python-gpgme-1.21.0-01-x86_64.pkg.tar.lz diff --git a/gpgme/PKGBUILD-arch b/gpgme/PKGBUILD-arch index 4e35508..c0b68f7 100644 --- a/gpgme/PKGBUILD-arch +++ b/gpgme/PKGBUILD-arch @@ -3,9 +3,9 @@ # Contributor: Sarah Hay pkgbase=gpgme -pkgname=(gpgme qgpgme python-gpgme) -pkgver=1.20.0 -pkgrel=2 +pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme) +pkgver=1.21.0 +pkgrel=1 pkgdesc='A C wrapper library for GnuPG' arch=('x86_64') url='https://www.gnupg.org/related_software/gpgme/' @@ -19,14 +19,20 @@ makedepends=( 'python-setuptools' 'python-wheel' 'qt5-base' + 'qt6-base' 'swig' ) validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020) 'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key) source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}) -sha256sums=('25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750' +sha256sums=('416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88' 'SKIP') +prepare() { +# Building qt5 and qt6 bindings in the same source tree is not supported + cp -r ${pkgbase}-${pkgver}{,-qt6} +} + build() { cd ${pkgbase}-${pkgver} @@ -43,6 +49,15 @@ 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() { @@ -65,18 +80,30 @@ package_gpgme() { make DESTDIR="${pkgdir}" install # split qgpgme - rm -r "${pkgdir}"/usr/include/{qgpgme,QGpgME}/ rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*} rm -r "${pkgdir}"/usr/lib/python* } -package_qgpgme() { - pkgdesc="Qt bindings for GPGme" +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 + + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/include } package_python-gpgme() { diff --git a/gpgme/deps b/gpgme/deps index b5be470..699c986 100644 --- a/gpgme/deps +++ b/gpgme/deps @@ -5,7 +5,5 @@ python-build python-installer python-wheel python-typing_extensions -qt5-base - diff --git a/groff/PKGBUILD b/groff/PKGBUILD index e6076b4..442c4e0 100644 --- a/groff/PKGBUILD +++ b/groff/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=groff -pkgver=1.22.4 -pkgrel=010 +pkgver=1.23.0 +pkgrel=01 pkgdesc='GNU troff text-formatting system' url='https://www.gnu.org/software/groff/groff.html' groups=( jobbot ) @@ -73,11 +73,10 @@ license=('GPL') validpgpkeys=('2D0C08D2B0AD0D3D8626670272D23FBAC99D4E75') # Bertrand Garrigues -sha256sums=(e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293 # groff-1.22.4.tar.gz - ef546604f5a32814d975f642877dcc9ad8d236489938b39df04e4d42c51fac96 # groff-1.22.4.tar.gz.sig - b1e0bcbe1e0737aed1301066ff92a1e7fa0bd8b80a36321f92f519366a1acdb3 # display-utc-times.patch +sha256sums=(6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13 # groff-1.23.0.tar.gz + 7ec23a8550fba8d942da06b1f84a090d80538ac062e8c73de6a4ad7a4f69e09f # groff-1.23.0.tar.gz.sig + 489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909 # display-utc-times.patch a2f4c5657595c5961c2c2b80e77b1126a2fc0a0caea5c0660b36255b3d85b7ff) # site.tmac -## dbadd2b2a0c233c39d17499d710cdb8bff24a18d020d8a4e40f5d1be8c900dae groff-1.22.4-010-x86_64.pkg.tar.lz - +## 0f8cdc59a4db0ad329938c1fbd172310eb79ad7b1161e7fbcf6445061f00cfed groff-1.23.0-01-x86_64.pkg.tar.lz diff --git a/groff/PKGBUILD-arch b/groff/PKGBUILD-arch index 578e489..a6ac518 100644 --- a/groff/PKGBUILD-arch +++ b/groff/PKGBUILD-arch @@ -1,8 +1,8 @@ # Maintainer: pkgname=groff -pkgver=1.22.4 -pkgrel=10 +pkgver=1.23.0 +pkgrel=1 pkgdesc='GNU troff text-formatting system' arch=('x86_64') url='https://www.gnu.org/software/groff/groff.html' @@ -18,9 +18,9 @@ validpgpkeys=('2D0C08D2B0AD0D3D8626670272D23FBAC99D4E75') # Bertrand Garrigues < source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} display-utc-times.patch 'site.tmac') -sha256sums=('e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293' +sha256sums=('6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13' 'SKIP' - 'b1e0bcbe1e0737aed1301066ff92a1e7fa0bd8b80a36321f92f519366a1acdb3' + '489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909' 'a2f4c5657595c5961c2c2b80e77b1126a2fc0a0caea5c0660b36255b3d85b7ff') prepare() { diff --git a/groff/display-utc-times.patch b/groff/display-utc-times.patch index 6e600e8..fe79bf4 100644 --- a/groff/display-utc-times.patch +++ b/groff/display-utc-times.patch @@ -18,28 +18,26 @@ Patch-Name: display-utc-times.patch src/roff/troff/input.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp -index 7bc017e0..ad7ca54f 100644 ---- a/src/devices/grohtml/post-html.cpp -+++ b/src/devices/grohtml/post-html.cpp -@@ -5016,7 +5016,7 @@ void html_printer::do_file_components (void) - - t = current_time(); - html.begin_comment("CreationDate: ") -- .put_string(ctime(&t), strlen(ctime(&t))-1) -+ .put_string(asctime(gmtime(&t)), strlen(asctime(gmtime(&t)))-1) - .end_comment(); - - if (dialect == html4) -@@ -5129,7 +5129,7 @@ html_printer::~html_printer() - - t = current_time(); - html.begin_comment("CreationDate: ") -- .put_string(ctime(&t), strlen(ctime(&t))-1) -+ .put_string(asctime(gmtime(&t)), strlen(asctime(gmtime(&t)))-1) - .end_comment(); - - if (dialect == html4) +--- a/src/devices/grohtml/post-html.cpp.orig 2023-07-06 18:28:18.581223060 +0200 ++++ b/src/devices/grohtml/post-html.cpp 2023-07-06 18:32:13.369103205 +0200 +@@ -5115,7 +5115,7 @@ + if (do_write_date_comment) { + t = current_time(); + html.begin_comment("CreationDate: ") +- .put_string(ctime(&t), strlen(ctime(&t))-1) ++ .put_string(asctime(gmtime(&t)), strlen(asctime(gmtime(&t)))-1) + .end_comment(); + } + +@@ -5240,7 +5240,7 @@ + if (do_write_date_comment) { + t = current_time(); + html.begin_comment("CreationDate: ") +- .put_string(ctime(&t), strlen(ctime(&t))-1) ++ .put_string(asctime(gmtime(&t)), strlen(asctime(gmtime(&t)))-1) + .end_comment(); + } + diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl index 2ec52d06..134b0962 100644 --- a/src/devices/gropdf/gropdf.pl @@ -75,16 +73,14 @@ index ab3b1d73..b0fb78e1 100644 } for (font_pointer_list *f = font_list; f; f = f->next) { ps_font *psf = (ps_font *)(f->p); -diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp -index a1bd8eaf..f415aa6d 100644 ---- a/src/roff/troff/input.cpp -+++ b/src/roff/troff/input.cpp -@@ -8084,7 +8084,7 @@ static void init_registers() +--- a/src/roff/troff/input.cpp.orig 2023-07-06 18:35:52.483568895 +0200 ++++ b/src/roff/troff/input.cpp 2023-07-06 18:39:50.864850588 +0200 +@@ -8303,7 +8303,7 @@ + time_t #endif /* not LONG_FOR_TIME_T */ t = current_time(); - // Use struct here to work around misfeature in old versions of g++. - struct tm *tt = localtime(&t); -+ struct tm *tt = gmtime(&t); ++ struct tm *tt = gmtime(&t); set_number_reg("seconds", int(tt->tm_sec)); set_number_reg("minutes", int(tt->tm_min)); set_number_reg("hours", int(tt->tm_hour));