[PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
@ 2023-06-10 19:32 mhmdanas
  2023-06-12 14:29 ` [PR PATCH] [Updated] " mhmdanas
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: mhmdanas @ 2023-06-10 19:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.

#### Testing the changes
- I tested the changes in this PR: **briefly** (didn't check that the revbumped packages build properly though)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 35879 bytes --]

From ad07a213daca7f4d63a4922d4a5fe71624cdc8c2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 01/10] gpgme: update to 1.20.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  10 +-
 5 files changed, 5 insertions(+), 330 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e..000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12..000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00..000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ce..000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4..bae91694c53b 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.20.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From 49516d5eed72e7c5cc20cedcc3daed333ced4f74 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 02/10] poppler: update to 23.06.0, adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/poppler/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0b1bca75e5d6..28e3a1e05158 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -350,7 +350,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.129 libpoppler-23.06.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd..ce3f972d49b1 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=23.05.0
+version=23.06.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +15,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
  $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From 207f1d159b3da12366316065ea72039f9700f0f0 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 03/10] poppler-qt5: update to 23.06.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b..903b932d0d73 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.06.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
 # fails to find a bunch of files
 make_check=no
 

From f215c2363e4e4f744fe044cef642089397f36b49 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:34 +0100
Subject: [PATCH 04/10] calligra: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index d0bdd2fec265..38d7984727af 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=13
+revision=14
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 4442ddcd02b10d553c5ed148a0a3754024b18cad Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 05/10] inkscape: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index b1c642e98abc..bd88f632b303 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1.1
-revision=9
+revision=10
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241

From e21da67231b56671d26244fb06b60ec7f0e31d23 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 06/10] ipe: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646..ec7b4b5dc3dc 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From 9c6d93187eb1baf56cd1007428b16f1218084de7 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 07/10] kitinerary: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e34..dbc90e93f84e 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From 196987dcdaf029d94da498a6fb889f2b7a50f847 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 08/10] pdf2djvu: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/pdf2djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7..6d117592c9ab 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From 3fc5d78f3b65e3e322c7b4c6548beef384efebf5 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:36 +0100
Subject: [PATCH 09/10] scribus: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 7794c71b0e6c..5fd3f79d1931 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

From 94d6f43e2ee59e3a1620f6d8b0c5cef8d3cee5de Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 10 Jun 2023 14:40:02 +0100
Subject: [PATCH 10/10] libreoffice: revbump for libpoppler-23.06.0.

Thanks to q66, I learned that I'm supposed to bump libreoffice for
poppler bumps too. I hadn't known this because of the shlib detection
being disabled in the template, so I re-enabled it.

uucp doesn't seem to be used in libreoffice anymore, so remove it from
hostmakedepends.
---
 srcpkgs/libreoffice/template | 60 ++++++++++++++----------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..c4c49c0b456c 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -174,8 +175,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -463,7 +462,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
@@ -495,7 +493,6 @@ do_install() {
 libreoffice-common_package() {
 	short_desc+=" - Common files"
 	depends="hunspell hyphen mythes openldap libreoffice-i18n-en-US>=${version}_${revision}"
-	skiprdeps=/usr/lib/libreoffice/program/libofficebean.so
 	pkg_install() {
 		_split common
 	}
@@ -504,7 +501,6 @@ libreoffice-common_package() {
 libreoffice-base_package() {
 	short_desc+=" - Database frontend"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split base
 	}
@@ -513,7 +509,6 @@ libreoffice-base_package() {
 libreoffice-calc_package() {
 	short_desc+=" - Spreadsheet"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split calc
 	}
@@ -522,7 +517,6 @@ libreoffice-calc_package() {
 libreoffice-draw_package() {
 	short_desc+=" - Drawing application"
 	depends="sane libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split draw
 	}
@@ -563,7 +557,6 @@ libreoffice-fonts_package() {
 libreoffice-gnome_package() {
 	short_desc+=" - GNOME integration"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split gnome
 	}
@@ -572,7 +565,6 @@ libreoffice-gnome_package() {
 libreoffice-impress_package() {
 	short_desc+=" - Presentation application"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split impress
 	}
@@ -581,7 +573,6 @@ libreoffice-impress_package() {
 libreoffice-kde_package() {
 	short_desc+=" - KDE integration"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF
 		%dir /usr/lib/libreoffice/program
@@ -600,7 +591,6 @@ libreoffice-kde_package() {
 libreoffice-qt6_package() {
 	short_desc+=" - Qt6 integration"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		cat > ${wrksrc}/file-lists/qt6_list.txt <<-EOF
 		%dir /usr/lib/libreoffice/program
@@ -621,7 +611,6 @@ libreoffice-kit_package() {
 libreoffice-math_package() {
 	short_desc+=" - Equation editor"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split math
 	}
@@ -630,7 +619,6 @@ libreoffice-math_package() {
 libreoffice-postgresql_package() {
 	short_desc+=" - Connector for PostgreSQL"
 	depends="libreoffice-base>=${version}_${revision} libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split postgresql
 	}
@@ -639,7 +627,6 @@ libreoffice-postgresql_package() {
 libreoffice-writer_package() {
 	short_desc+=" - Word processor"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split writer
 	}
@@ -649,7 +636,6 @@ libreoffice-writer_package() {
 libreoffice-xtensions_package() {
 	short_desc+=" - Extensions"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		# Remove empty files
 		find ${DESTDIR}/all -size 0 -delete

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
@ 2023-06-12 14:29 ` mhmdanas
  2023-06-29 20:52 ` [PR REVIEW] " Duncaen
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-06-12 14:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.

#### Testing the changes
- I tested the changes in this PR: **briefly** (didn't check that the revbumped packages build properly though)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 35510 bytes --]

From 958ee539dc1d147f7bc11c55acac25c73bb35874 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.20.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e..000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12..000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00..000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ce..000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4..243a88c0da3d 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.20.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
+
+CXXFLAGS=" -D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+="${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From 8dffa052731c93f8ff49195fc20f687b336e5375 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.06.0, adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/poppler/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 005700403d0d..fe7c73433795 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -350,7 +350,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.129 libpoppler-23.06.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd..ce3f972d49b1 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=23.05.0
+version=23.06.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +15,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
  $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From 4765421aee8f7b28921869057b372be1d382cda3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.06.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b..903b932d0d73 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.06.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
 # fails to find a bunch of files
 make_check=no
 

From 3f97693d85de8e3a8f48e5c93beacf9f14426ea3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index b1c642e98abc..bd88f632b303 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1.1
-revision=9
+revision=10
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241

From eb582340a747be6779bb88d894fee5f6f6c4a422 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646..ec7b4b5dc3dc 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From d4462114ffe976e3559918b1e86449b035581b98 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e34..dbc90e93f84e 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From 05b661c8e51ba9baadfd85e1e73106cec8f4b66e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/pdf2djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7..6d117592c9ab 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From 18a0f6f9ea29e74135b0bf8796517efb574df87c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:36 +0100
Subject: [PATCH 8/9] scribus: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 7794c71b0e6c..5fd3f79d1931 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

From dd552558f2cd1c56c7bcce3f0651a897845b97c5 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 10 Jun 2023 14:40:02 +0100
Subject: [PATCH 9/9] libreoffice: revbump for libpoppler-23.06.0.

Thanks to q66, I learned that I'm supposed to bump libreoffice for
poppler bumps too. I hadn't known this because of the shlib detection
being disabled in the template, so I re-enabled it.

uucp doesn't seem to be used in libreoffice anymore, so remove it from
hostmakedepends.
---
 srcpkgs/libreoffice/template | 60 ++++++++++++++----------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..c4c49c0b456c 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -174,8 +175,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -463,7 +462,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
@@ -495,7 +493,6 @@ do_install() {
 libreoffice-common_package() {
 	short_desc+=" - Common files"
 	depends="hunspell hyphen mythes openldap libreoffice-i18n-en-US>=${version}_${revision}"
-	skiprdeps=/usr/lib/libreoffice/program/libofficebean.so
 	pkg_install() {
 		_split common
 	}
@@ -504,7 +501,6 @@ libreoffice-common_package() {
 libreoffice-base_package() {
 	short_desc+=" - Database frontend"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split base
 	}
@@ -513,7 +509,6 @@ libreoffice-base_package() {
 libreoffice-calc_package() {
 	short_desc+=" - Spreadsheet"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split calc
 	}
@@ -522,7 +517,6 @@ libreoffice-calc_package() {
 libreoffice-draw_package() {
 	short_desc+=" - Drawing application"
 	depends="sane libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split draw
 	}
@@ -563,7 +557,6 @@ libreoffice-fonts_package() {
 libreoffice-gnome_package() {
 	short_desc+=" - GNOME integration"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split gnome
 	}
@@ -572,7 +565,6 @@ libreoffice-gnome_package() {
 libreoffice-impress_package() {
 	short_desc+=" - Presentation application"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split impress
 	}
@@ -581,7 +573,6 @@ libreoffice-impress_package() {
 libreoffice-kde_package() {
 	short_desc+=" - KDE integration"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF
 		%dir /usr/lib/libreoffice/program
@@ -600,7 +591,6 @@ libreoffice-kde_package() {
 libreoffice-qt6_package() {
 	short_desc+=" - Qt6 integration"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		cat > ${wrksrc}/file-lists/qt6_list.txt <<-EOF
 		%dir /usr/lib/libreoffice/program
@@ -621,7 +611,6 @@ libreoffice-kit_package() {
 libreoffice-math_package() {
 	short_desc+=" - Equation editor"
 	depends="libreoffice-writer>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split math
 	}
@@ -630,7 +619,6 @@ libreoffice-math_package() {
 libreoffice-postgresql_package() {
 	short_desc+=" - Connector for PostgreSQL"
 	depends="libreoffice-base>=${version}_${revision} libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split postgresql
 	}
@@ -639,7 +627,6 @@ libreoffice-postgresql_package() {
 libreoffice-writer_package() {
 	short_desc+=" - Word processor"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		_split writer
 	}
@@ -649,7 +636,6 @@ libreoffice-writer_package() {
 libreoffice-xtensions_package() {
 	short_desc+=" - Extensions"
 	depends="libreoffice-common>=${version}_${revision}"
-	noverifyrdeps=yes
 	pkg_install() {
 		# Remove empty files
 		find ${DESTDIR}/all -size 0 -delete

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
  2023-06-12 14:29 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-06-29 20:52 ` Duncaen
  2023-06-29 21:04 ` mhmdanas
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Duncaen @ 2023-06-29 20:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44352#discussion_r1247164506

Comment:
there needs to be a space if you append.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
  2023-06-12 14:29 ` [PR PATCH] [Updated] " mhmdanas
  2023-06-29 20:52 ` [PR REVIEW] " Duncaen
@ 2023-06-29 21:04 ` mhmdanas
  2023-06-29 21:09 ` [PR PATCH] [Updated] " mhmdanas
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-06-29 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44352#discussion_r1247174513

Comment:
Good catch.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (2 preceding siblings ...)
  2023-06-29 21:04 ` mhmdanas
@ 2023-06-29 21:09 ` mhmdanas
  2023-06-30 21:33 ` mhmdanas
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-06-29 21:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.

#### Testing the changes
- I tested the changes in this PR: **briefly** (didn't check that the revbumped packages build properly though)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 32177 bytes --]

From c5ec0f6a46e37f761058d75ea665b7d3b62223ac Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.20.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e..000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12..000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00..000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ce..000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4..abb78e927ba7 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.20.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From 76b7e1f99c5dbd8cc76349ddad947d6cce9c0285 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.06.0, adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/poppler/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ef71bae3f9a7..5a6c1ea07c22 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -347,7 +347,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.129 libpoppler-23.06.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd..ce3f972d49b1 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=23.05.0
+version=23.06.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +15,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
  $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From efa06cf9e400946d709c3930ea2c345cbfa7e9ca Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.06.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b..903b932d0d73 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.06.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
 # fails to find a bunch of files
 make_check=no
 

From 9335044cdc8a3355b8cb14ed407f80a3db99f726 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index aa1ab218a442..9d2ca0eecbc3 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.2.2
-revision=1
+revision=2
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241

From a5b1773f54cb0258f91e1801053920bfd43fbcdf Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646..ec7b4b5dc3dc 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From cf9031c37328abda4c21548e4cae632c9297e9fc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e34..dbc90e93f84e 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From 480b7db4a595bbb00c7cabfbc6f6bb6ca655d46d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/pdf2djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7..6d117592c9ab 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From 03a27e426d742838973532578c7a6e8a4c8f5966 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:36 +0100
Subject: [PATCH 8/9] scribus: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 7794c71b0e6c..5fd3f79d1931 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

From dbba9f033f7a25fd8ae55b4c0ffa8b82dc287473 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH 9/9] libreoffice: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..e67f62d813bf 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -174,8 +175,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -463,7 +462,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (3 preceding siblings ...)
  2023-06-29 21:09 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-06-30 21:33 ` mhmdanas
  2023-08-01 12:20 ` mhmdanas
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-06-30 21:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-musl (cross)


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 32225 bytes --]

From e1c6a7e4aaf3bca1e057e3625807826150f50fdb Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.20.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e..000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12..000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00..000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ce..000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4..abb78e927ba7 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.20.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From 3b035212e68372624235db8139be367b5fd69bf1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.06.0, adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/poppler/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ef71bae3f9a7..5a6c1ea07c22 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -347,7 +347,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.129 libpoppler-23.06.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd..ebdf6ee70cd0 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -2,8 +2,9 @@
 #
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
+# Revbump libreoffice on SO version bumps.
 pkgname=poppler
-version=23.05.0
+version=23.06.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +16,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
  $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From b5b821aea8f3706acd04a3ac9a6bc78c85131ca3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.06.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b..903b932d0d73 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.06.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
 # fails to find a bunch of files
 make_check=no
 

From 2e0d11f9c7a40062833d2be7531cc7a7aad6af37 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index aa1ab218a442..9d2ca0eecbc3 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.2.2
-revision=1
+revision=2
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241

From 80073a9c096f8049f68822a66dc3552bc2d6267f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646..ec7b4b5dc3dc 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From b31c051495edf8e62aa3c9ea10848b68b90b24fe Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e34..dbc90e93f84e 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From c1c50e6ed02cf45ae4ca4f355d631358c295b389 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/pdf2djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7..6d117592c9ab 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From fb004d99754af30f56cc74b99d6fd5cbd4a4050b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:36 +0100
Subject: [PATCH 8/9] scribus: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 7794c71b0e6c..5fd3f79d1931 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

From 4fc010ab59c79d48f43c308ca0591e01fdb12af5 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH 9/9] libreoffice: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9414ffd34b9b..e67f62d813bf 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -174,8 +175,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -463,7 +462,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (4 preceding siblings ...)
  2023-06-30 21:33 ` mhmdanas
@ 2023-08-01 12:20 ` mhmdanas
  2023-08-01 12:22 ` [PR PATCH] [Updated] [ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0 mhmdanas
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-08-01 12:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-musl (cross)


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 32268 bytes --]

From 7803c4d2d27e3071a1ca7dbcf1100b7b19e68e54 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.21.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e3..0000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12e..0000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00f..0000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ced..0000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4c..c1a5d3c20a6bb 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.21.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From a136160db3db6daf46817b21af1e46f3ce307033 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.07.0, adopt.

---
 common/shlibs            |  2 +-
 srcpkgs/poppler/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d528aa798ee5..533ee7aac61ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -353,7 +353,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.130 libpoppler-23.07.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd8..897317a4fd386 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -2,8 +2,9 @@
 #
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
+# Revbump libreoffice on SO version bumps.
 pkgname=poppler
-version=23.05.0
+version=23.07.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +16,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
- $(vopt_if boost boost-devel)"
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
+ zlib-devel $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="f29b4b4bf47572611176454c8f21506d71d27eca5011a39aa44038b30b957db0
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From ac27a5ad56ed9c4796d166305493b5afb79b8d7a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.07.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b1..2124220950442 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.07.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=f29b4b4bf47572611176454c8f21506d71d27eca5011a39aa44038b30b957db0
 # fails to find a bunch of files
 make_check=no
 

From 9e9b28fc5bfbff944d9b7c5f1e9eb6e99f3a44be Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 49633b61fd861..18640fa73ef8c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.2.2
-revision=1
+revision=2
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241

From 45855c4b0764b3f003152d5605ab829f5ebe889f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646c..ec7b4b5dc3dcb 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From 2ab4fb16f24eb5fd76c78d2790324d5a56da68fc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e342..dbc90e93f84ee 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From 07aeb0f488e207235af4b39324b45e723b37ed9a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/pdf2djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7e..6d117592c9ab7 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From 04a10cc04141ff139979f5766bbc9a32793b190f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH 8/9] libreoffice: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 35c83414acaf1..1a293a2559849 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=2
+revision=3
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -170,8 +171,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -459,7 +458,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"

From 6579ed981c1f14b57533deb29cccc633af730e8f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 31 Jul 2023 13:38:38 +0100
Subject: [PATCH 9/9] scribus: revbump for libpoppler-23.06.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 5fd3f79d19318..8a6f408500563 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=9
+revision=10
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (5 preceding siblings ...)
  2023-08-01 12:20 ` mhmdanas
@ 2023-08-01 12:22 ` mhmdanas
  2023-08-06 14:43 ` mhmdanas
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-08-01 12:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR (all packages) locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 32268 bytes --]

From 7803c4d2d27e3071a1ca7dbcf1100b7b19e68e54 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.21.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e3..0000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12e..0000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00f..0000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ced..0000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4c..c1a5d3c20a6bb 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.21.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From a136160db3db6daf46817b21af1e46f3ce307033 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.07.0, adopt.

---
 common/shlibs            |  2 +-
 srcpkgs/poppler/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d528aa798ee5..533ee7aac61ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -353,7 +353,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.130 libpoppler-23.07.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd8..897317a4fd386 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -2,8 +2,9 @@
 #
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
+# Revbump libreoffice on SO version bumps.
 pkgname=poppler
-version=23.05.0
+version=23.07.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +16,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
- $(vopt_if boost boost-devel)"
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
+ zlib-devel $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="f29b4b4bf47572611176454c8f21506d71d27eca5011a39aa44038b30b957db0
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From ac27a5ad56ed9c4796d166305493b5afb79b8d7a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.07.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b1..2124220950442 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.07.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=f29b4b4bf47572611176454c8f21506d71d27eca5011a39aa44038b30b957db0
 # fails to find a bunch of files
 make_check=no
 

From e7580c9654225ea5993d0d30876e34add7998e8c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.07.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 49633b61fd861..18640fa73ef8c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.2.2
-revision=1
+revision=2
 build_style=cmake
 # builds executables then runs checks
 # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241

From 3a758dd71a2a1ca74ff10e90143967c699e1dac7 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.07.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646c..ec7b4b5dc3dcb 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From 4a21926eefdae2ced5a739b3db5a4b2f0103b7e6 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.07.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e342..dbc90e93f84ee 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From bef0826c6345fbf0dc7455cf66e30e6ed32b831c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.07.0_1.

---
 srcpkgs/pdf2djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7e..6d117592c9ab7 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From 090331b144d11edfc0777ae57597c4cc22b5b361 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH 8/9] libreoffice: revbump for libpoppler-23.07.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 35c83414acaf1..1a293a2559849 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=2
+revision=3
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -170,8 +171,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -459,7 +458,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"

From b53d48cda6c73003b655b6c7a692b93f6845408f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 31 Jul 2023 13:38:38 +0100
Subject: [PATCH 9/9] scribus: revbump for libpoppler-23.07.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 5fd3f79d19318..8a6f408500563 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=9
+revision=10
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (6 preceding siblings ...)
  2023-08-01 12:22 ` [PR PATCH] [Updated] [ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0 mhmdanas
@ 2023-08-06 14:43 ` mhmdanas
  2023-08-06 14:44 ` mhmdanas
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-08-06 14:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR (all packages) locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 32248 bytes --]

From cff282fde966e76a5c2163240cb2f4b9724c8b5d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.21.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e3..0000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12e..0000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00f..0000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ced..0000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4c..c1a5d3c20a6bb 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.21.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From 8814b4b33b4e096a37baac1767a8e3af35b1dc15 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.08.0, adopt.

---
 common/shlibs            |  2 +-
 srcpkgs/poppler/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ddb0e8ab87091..3c3defa53d1b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -353,7 +353,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.130 libpoppler-23.08.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd8..2be3e5ab35e47 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -2,8 +2,9 @@
 #
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
+# Revbump libreoffice on SO version bumps.
 pkgname=poppler
-version=23.05.0
+version=23.08.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +16,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
- $(vopt_if boost boost-devel)"
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
+ zlib-devel $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="4a4bf7fc903b9f1a2ab7d04b7c5d8220db9bc6261cc73fdb9a826dc272f49aa8
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From b3a8f2d06f148307c5b42ab3c8b8fc10d33d0484 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.08.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b1..2a48ed659920e 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.08.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=4a4bf7fc903b9f1a2ab7d04b7c5d8220db9bc6261cc73fdb9a826dc272f49aa8
 # fails to find a bunch of files
 make_check=no
 

From b2b182de56c53f7ea566aef546093dbcee125613 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index b6b29f0790ed1..56365acf8d85c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.3
-revision=1
+revision=2
 build_style=cmake
 make_check_target="check"
 hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel

From aeb7fd6903045ad4d213e88e814cce59a43ff9b3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646c..ec7b4b5dc3dcb 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From 09bfd9256378faa9ef8047ad3d4670cd7e0862c8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e342..dbc90e93f84ee 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From 4cdd669e2e843e1b620db5dc835ed6b304ac2bc7 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/pdf2djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7e..6d117592c9ab7 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"

From c4636cc01123f59ea87a5b907cc0a90e7ed9c541 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH 8/9] libreoffice: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 35c83414acaf1..1a293a2559849 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=2
+revision=3
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -170,8 +171,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -459,7 +458,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"

From 6da9039d044be457d71a8bbb6c8e813d3d0629d5 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 31 Jul 2023 13:38:38 +0100
Subject: [PATCH 9/9] scribus: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 5fd3f79d19318..8a6f408500563 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=9
+revision=10
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (7 preceding siblings ...)
  2023-08-06 14:43 ` mhmdanas
@ 2023-08-06 14:44 ` mhmdanas
  2023-08-07 17:13 ` [PR PATCH] [Updated] [ci skip] poppler{,-qt5}: update to 23.08.0, " mhmdanas
  2023-08-07 23:05 ` [PR PATCH] [Merged]: " Duncaen
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-08-06 14:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR (all packages) locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 32441 bytes --]

From cff282fde966e76a5c2163240cb2f4b9724c8b5d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.21.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e3..0000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12e..0000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00f..0000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ced..0000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4c..c1a5d3c20a6bb 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.21.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From 8814b4b33b4e096a37baac1767a8e3af35b1dc15 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.08.0, adopt.

---
 common/shlibs            |  2 +-
 srcpkgs/poppler/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ddb0e8ab87091..3c3defa53d1b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -353,7 +353,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.130 libpoppler-23.08.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd8..2be3e5ab35e47 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -2,8 +2,9 @@
 #
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
+# Revbump libreoffice on SO version bumps.
 pkgname=poppler
-version=23.05.0
+version=23.08.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +16,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
- $(vopt_if boost boost-devel)"
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
+ zlib-devel $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="4a4bf7fc903b9f1a2ab7d04b7c5d8220db9bc6261cc73fdb9a826dc272f49aa8
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From b3a8f2d06f148307c5b42ab3c8b8fc10d33d0484 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.08.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b1..2a48ed659920e 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.08.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=4a4bf7fc903b9f1a2ab7d04b7c5d8220db9bc6261cc73fdb9a826dc272f49aa8
 # fails to find a bunch of files
 make_check=no
 

From b2b182de56c53f7ea566aef546093dbcee125613 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index b6b29f0790ed1..56365acf8d85c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.3
-revision=1
+revision=2
 build_style=cmake
 make_check_target="check"
 hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel

From aeb7fd6903045ad4d213e88e814cce59a43ff9b3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646c..ec7b4b5dc3dcb 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From 09bfd9256378faa9ef8047ad3d4670cd7e0862c8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e342..dbc90e93f84ee 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From efab7920316056c78c7a9fffdaae65103ebaa9a9 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.08.0_1.

Also add missing runtime dependency.
---
 srcpkgs/pdf2djvu/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7e..ef7433c0c98ae 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,10 +1,11 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"
+depends="djvulibre"
 short_desc="Create DjVu files from PDF files"
 maintainer="Stanislav Paskalev <spaskalev@protonmail.com>"
 license="GPL-2.0-only"

From ab1e42f0c7d2d2cd7426c404a282e6a53c27c892 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH 8/9] libreoffice: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 35c83414acaf1..1a293a2559849 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.3.2
-revision=2
+revision=3
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -170,8 +171,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -459,7 +458,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"

From acb720ae552becff1d55d75837f8b1d6b2e6d219 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 31 Jul 2023 13:38:38 +0100
Subject: [PATCH 9/9] scribus: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 5fd3f79d19318..8a6f408500563 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=9
+revision=10
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [ci skip] poppler{,-qt5}: update to 23.08.0, gpgme: update to 1.21.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (8 preceding siblings ...)
  2023-08-06 14:44 ` mhmdanas
@ 2023-08-07 17:13 ` mhmdanas
  2023-08-07 23:05 ` [PR PATCH] [Merged]: " Duncaen
  10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-08-07 17:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages poppler-23.06.0
https://github.com/void-linux/void-packages/pull/44352

[ci skip] poppler{,-qt5}: update to 23.08.0, gpgme: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR (all packages) locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/44352.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-23.06.0-44352.patch --]
[-- Type: text/x-diff, Size: 32441 bytes --]

From 8ab5c46b158160b2f5c7a78abd9761a35066dd00 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:32:31 +0100
Subject: [PATCH 1/9] gpgme: update to 1.21.0.

---
 .../gpgme/patches/0001-tests-log-error.patch  |  51 ------
 .../0002-tests-expiration-time-unsigned.patch | 159 ------------------
 .../gpgme/patches/0003-tests-fix-32bit.patch  |  75 ---------
 .../gpgme/patches/fix-error-conditions.patch  |  40 -----
 srcpkgs/gpgme/template                        |  16 +-
 5 files changed, 8 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/gpgme/patches/0001-tests-log-error.patch
 delete mode 100644 srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
 delete mode 100644 srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
 delete mode 100644 srcpkgs/gpgme/patches/fix-error-conditions.patch

diff --git a/srcpkgs/gpgme/patches/0001-tests-log-error.patch b/srcpkgs/gpgme/patches/0001-tests-log-error.patch
deleted file mode 100644
index 50443efe2e7e3..0000000000000
--- a/srcpkgs/gpgme/patches/0001-tests-log-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81d4b7f2d7077297d76af5728949d8f2bdff8cd5 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 14:56:13 +0200
-Subject: [PATCH] qt,tests: Log the actual error code if the assertion fails
-
-* lang/qt/tests/t-addexistingsubkey.cpp (
-AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
-AddExistingSubkeyJobTest::testAddExistingSubkeySync,
-AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
-QCOMPARE instead of QVERIFY for asserting equality.
---
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 589c90bf..2e654cec 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -168,7 +168,7 @@ private Q_SLOTS:
-         QSignalSpy spy (this, SIGNAL(asyncDone()));
-         QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-     }
-@@ -190,7 +190,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
-         QCOMPARE(key.subkey(2).expirationTime(), 0);
-@@ -213,7 +213,7 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
-+        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-         key.update();
-         QCOMPARE(key.numSubkeys(), 3u);
- 
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch b/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
deleted file mode 100644
index 57aef8852a12e..0000000000000
--- a/srcpkgs/gpgme/patches/0002-tests-expiration-time-unsigned.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From f2b48de26b8f8c48c293423eda712831544924f6 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Wed, 17 Aug 2022 15:22:29 +0200
-Subject: [PATCH] qt,tests: Make sure expiration time is interpreted as
- unsigned number
-
-* lang/qt/tests/t-addexistingsubkey.cpp,
-lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
-uint_least32_t.
---
-
-This doesn't change the outcome of the tests (they also pass without
-this change because of the expiration dates of the test keys), but it's
-still good practise to treat the expiration time as an unsigned number
-if the assertions check that the expiration time is in some range.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp |  6 +++---
- lang/qt/tests/t-changeexpiryjob.cpp   | 26 +++++++++++++-------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 2e654cec..87eadf43 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -222,9 +222,9 @@ private Q_SLOTS:
-         // several times
-         const auto allowedDeltaTSeconds = 1;
-         const auto expectedExpirationRange = std::make_pair(
--            sourceSubkey.expirationTime() - allowedDeltaTSeconds,
--            sourceSubkey.expirationTime() + allowedDeltaTSeconds);
--        const auto actualExpiration = key.subkey(2).expirationTime();
-+            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-         QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                  ("actual: " + std::to_string(actualExpiration) +
-                   "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
-index 090002f3..3da74d46 100644
---- a/lang/qt/tests/t-changeexpiryjob.cpp
-+++ b/lang/qt/tests/t-changeexpiryjob.cpp
-@@ -70,7 +70,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -101,7 +101,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -110,7 +110,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -133,7 +133,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
-+        const auto primaryKeyExpiration = uint_least32_t(key.subkey(0).expirationTime());
- 
-         {
-             // Create the job
-@@ -164,11 +164,11 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -196,7 +196,7 @@ private Q_SLOTS:
-         QVERIFY(!key.isNull());
-         QVERIFY(!key.subkey(0).isNull());
-         QVERIFY(!key.subkey(1).isNull());
--        const auto subkeyExpiration = key.subkey(1).expirationTime();
-+        const auto subkeyExpiration = uint_least32_t(key.subkey(1).expirationTime());
- 
-         {
-             // Create the job
-@@ -228,7 +228,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(3).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -237,7 +237,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
-             }
-         }
-@@ -291,7 +291,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(4).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -300,7 +300,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -359,7 +359,7 @@ private Q_SLOTS:
-                 newExpirationDate.toSecsSinceEpoch() - 10,
-                 QDateTime::currentDateTime().addDays(5).toSecsSinceEpoch());
-             {
--                const auto actualExpiration = key.subkey(0).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(0).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                          "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-@@ -368,7 +368,7 @@ private Q_SLOTS:
-                          "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-             }
-             {
--                const auto actualExpiration = key.subkey(1).expirationTime();
-+                const auto actualExpiration = uint_least32_t(key.subkey(1).expirationTime());
-                 QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-                         ("actual: " + std::to_string(actualExpiration) +
-                           "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch b/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
deleted file mode 100644
index aaaf57582f00f..0000000000000
--- a/srcpkgs/gpgme/patches/0003-tests-fix-32bit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2e7a61b898fccc1c20000b79dee83cd980901fa9 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:55:09 +0200
-Subject: [PATCH] qt,tests: Make test pass on 32-bit systems
-
-* lang/qt/tests/t-addexistingsubkey.cpp
-(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
-negative expiration date.
---
-
-On 32-bit systems the expiration date of the test key overflows. This
-will cause the AddExistingSubkeyJob to fail. We expect it to fail with
-an "invalid time" error.
-
-GnuPG-bug-id: 6137
----
- lang/qt/tests/t-addexistingsubkey.cpp | 42 ++++++++++++++++++++---------------
- 1 file changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
-index 87eadf43..c0eee57b 100644
---- a/lang/qt/tests/t-addexistingsubkey.cpp
-+++ b/lang/qt/tests/t-addexistingsubkey.cpp
-@@ -213,24 +213,30 @@ private Q_SLOTS:
- 
-         const auto result = job->exec(key, sourceSubkey);
- 
--        QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
--        key.update();
--        QCOMPARE(key.numSubkeys(), 3u);
--
--        // allow 1 second different expiration because gpg calculates with
--        // expiration as difference to current time and takes current time
--        // several times
--        const auto allowedDeltaTSeconds = 1;
--        const auto expectedExpirationRange = std::make_pair(
--            uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
--            uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
--        const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
--        QVERIFY2(actualExpiration >= expectedExpirationRange.first,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
--        QVERIFY2(actualExpiration <= expectedExpirationRange.second,
--                 ("actual: " + std::to_string(actualExpiration) +
--                  "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        if (sourceSubkey.expirationTime() > 0) {
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_NO_ERROR));
-+            key.update();
-+            QCOMPARE(key.numSubkeys(), 3u);
-+
-+            // allow 1 second different expiration because gpg calculates with
-+            // expiration as difference to current time and takes current time
-+            // several times
-+            const auto allowedDeltaTSeconds = 1;
-+            const auto expectedExpirationRange = std::make_pair(
-+                uint_least32_t(sourceSubkey.expirationTime()) - allowedDeltaTSeconds,
-+                uint_least32_t(sourceSubkey.expirationTime()) + allowedDeltaTSeconds);
-+            const auto actualExpiration = uint_least32_t(key.subkey(2).expirationTime());
-+            QVERIFY2(actualExpiration >= expectedExpirationRange.first,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
-+            QVERIFY2(actualExpiration <= expectedExpirationRange.second,
-+                    ("actual: " + std::to_string(actualExpiration) +
-+                    "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
-+        } else {
-+            // on 32-bit systems the expiration date of the test key overflows;
-+            // in this case we expect an appropriate error code
-+            QCOMPARE(result.code(), static_cast<int>(GPG_ERR_INV_TIME));
-+        }
-     }
- 
- private:
--- 
-2.11.0
-
diff --git a/srcpkgs/gpgme/patches/fix-error-conditions.patch b/srcpkgs/gpgme/patches/fix-error-conditions.patch
deleted file mode 100644
index f70e167784ced..0000000000000
--- a/srcpkgs/gpgme/patches/fix-error-conditions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fa5c80aeba4528b3bdf41ec5740e7db5d4b6d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
-Date: Thu, 18 Aug 2022 10:43:19 +0200
-Subject: [PATCH] cpp: Fix handling of "no key" or "invalid time" situations
-
-* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-(GpgAddExistingSubkeyEditInteractor::Private::nextState): Fix inverted
-logic of string comparisons.
---
-
-This fixes the problem that the interactor didn't return the proper
-error code if gpg didn't accept the key grip or the expiration date.
-
-GnuPG-bug-id: 6137
----
- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-index 547e613d..8eec7460 100644
---- a/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-+++ b/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp
-@@ -136,7 +136,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keygen.flags") == 0) {
-             return FLAGS;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.keygrip")) {
-+                   strcmp(args, "keygen.keygrip") == 0) {
-             err = NO_KEY_ERROR;
-             return ERROR;
-         }
-@@ -157,7 +157,7 @@ unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int
-                 strcmp(args, "keyedit.prompt") == 0) {
-             return QUIT;
-         } else if (status == GPGME_STATUS_GET_LINE &&
--                   strcmp(args, "keygen.valid")) {
-+                   strcmp(args, "keygen.valid") == 0) {
-             err = INV_TIME_ERROR;
-             return ERROR;
-         }
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 55dfa970fec4c..c1a5d3c20a6bb 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.18.0
-revision=3
+version=1.21.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -13,17 +13,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+checksum=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" ac_cv_sys_file_offset_bits=no"
 elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-	CXXFLAGS="${CFLAGS}"
+	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
-
 libgpgme_package() {
 	# posix-util.c call gpgconf to get GnuPG binaries
 	depends="gnupg>=2"
@@ -48,7 +48,7 @@ gpgme-devel_package() {
 gpgmepp_package() {
 	short_desc+=" - C++ library"
 	pkg_install() {
-		vmove usr/lib/libgpgmepp.so.*
+		vmove "usr/lib/libgpgmepp.so.*"
 	}
 }
 
@@ -66,7 +66,7 @@ gpgmepp-devel_package() {
 gpgmeqt_package() {
 	short_desc+=" - Qt binding"
 	pkg_install() {
-		vmove usr/lib/libqgpgme.so.*
+		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 

From 87be02a7deaebf4d27899a76f5de131050204c53 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 16:34:09 +0100
Subject: [PATCH 2/9] poppler: update to 23.08.0, adopt.

---
 common/shlibs            |  2 +-
 srcpkgs/poppler/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ddb0e8ab87091..3c3defa53d1b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -353,7 +353,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.128 libpoppler-23.05.0_1
+libpoppler.so.130 libpoppler-23.08.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index b9674deecbfd8..2be3e5ab35e47 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -2,8 +2,9 @@
 #
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
+# Revbump libreoffice on SO version bumps.
 pkgname=poppler
-version=23.05.0
+version=23.08.0
 revision=1
 _testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
 create_wrksrc=yes
@@ -15,16 +16,16 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
  -DTESTDATADIR='${XBPS_BUILDDIR}/poppler-${version}/testdatadir'"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
- nss-devel libcurl-devel libopenjpeg2-devel
- $(vopt_if boost boost-devel)"
+ nss-devel libcurl-devel libopenjpeg2-devel gpgmepp-devel
+ zlib-devel $(vopt_if boost boost-devel)"
 short_desc="PDF rendering library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz
  https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
-checksum="38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum="4a4bf7fc903b9f1a2ab7d04b7c5d8220db9bc6261cc73fdb9a826dc272f49aa8
  ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
 
 build_options="gir boost"

From 48321bce3445702ddb9fb9fe88d5f3ee6c159014 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:58:33 +0100
Subject: [PATCH 3/9] poppler-qt5: update to 23.08.0, adopt.

---
 srcpkgs/poppler-qt5/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 7772805ac31b1..2a48ed659920e 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=23.05.0
+version=23.08.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
@@ -13,14 +13,15 @@ configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF
  -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF"
 hostmakedepends="pkg-config qt5-devel qt6-base-devel"
 makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel
- fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel"
+ fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel
+ gpgmepp-devel"
 short_desc="PDF rendering library - Qt5 bindings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
 distfiles="https://poppler.freedesktop.org/poppler-${version}.tar.xz"
-checksum=38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990
+checksum=4a4bf7fc903b9f1a2ab7d04b7c5d8220db9bc6261cc73fdb9a826dc272f49aa8
 # fails to find a bunch of files
 make_check=no
 

From 89ca635d6e41ee751045817ee0418b2c80eb777c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 4/9] inkscape: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index b6b29f0790ed1..56365acf8d85c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.3
-revision=1
+revision=2
 build_style=cmake
 make_check_target="check"
 hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel

From c4e48c9d6a8d3fc52cb952e99a0340031b5fa62f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 5/9] ipe: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bf04fbc23646c..ec7b4b5dc3dcb 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=9
+revision=10
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From c3a65f935ae3a07113812b674b08e688857f6c53 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 6/9] kitinerary: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index f15756816e342..dbc90e93f84ee 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.04.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

From 5e948398036863cd6e34e08e9a34d0555da2a004 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 9 Jun 2023 17:59:35 +0100
Subject: [PATCH 7/9] pdf2djvu: revbump for libpoppler-23.08.0_1.

Also add missing runtime dependency.
---
 srcpkgs/pdf2djvu/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pdf2djvu/template b/srcpkgs/pdf2djvu/template
index 0c76cd60dde7e..ef7433c0c98ae 100644
--- a/srcpkgs/pdf2djvu/template
+++ b/srcpkgs/pdf2djvu/template
@@ -1,10 +1,11 @@
 # Template file for 'pdf2djvu'
 pkgname=pdf2djvu
 version=0.9.19
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config djvulibre gettext"
 makedepends="djvulibre-devel poppler-devel libgraphicsmagick-devel exiv2-devel libuuid-devel"
+depends="djvulibre"
 short_desc="Create DjVu files from PDF files"
 maintainer="Stanislav Paskalev <spaskalev@protonmail.com>"
 license="GPL-2.0-only"

From 2fb574c142d2a78f9b9cb04c61bd5b1a7f0eff3a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH 8/9] libreoffice: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 8c080b7e8439e..a5ade73cc1969 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.5.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -170,8 +171,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -459,7 +458,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"

From d708e41a5610b044ae5ff0befdfa694697c30545 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 31 Jul 2023 13:38:38 +0100
Subject: [PATCH 9/9] scribus: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 5fd3f79d19318..8a6f408500563 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.8
-revision=9
+revision=10
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Merged]: [ci skip] poppler{,-qt5}: update to 23.08.0, gpgme: update to 1.21.0.
  2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
                   ` (9 preceding siblings ...)
  2023-08-07 17:13 ` [PR PATCH] [Updated] [ci skip] poppler{,-qt5}: update to 23.08.0, " mhmdanas
@ 2023-08-07 23:05 ` Duncaen
  10 siblings, 0 replies; 12+ messages in thread
From: Duncaen @ 2023-08-07 23:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 923 bytes --]

There's a merged pull request on the void-packages repository

[ci skip] poppler{,-qt5}: update to 23.08.0, gpgme: update to 1.21.0.
https://github.com/void-linux/void-packages/pull/44352

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR (all packages) locally for my native architecture, x86_64-glibc


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-08-07 23:05 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-10 19:32 [PR PATCH] [ci skip] poppler: update to 23.06.0, gpgme: update to 1.20.0 mhmdanas
2023-06-12 14:29 ` [PR PATCH] [Updated] " mhmdanas
2023-06-29 20:52 ` [PR REVIEW] " Duncaen
2023-06-29 21:04 ` mhmdanas
2023-06-29 21:09 ` [PR PATCH] [Updated] " mhmdanas
2023-06-30 21:33 ` mhmdanas
2023-08-01 12:20 ` mhmdanas
2023-08-01 12:22 ` [PR PATCH] [Updated] [ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0 mhmdanas
2023-08-06 14:43 ` mhmdanas
2023-08-06 14:44 ` mhmdanas
2023-08-07 17:13 ` [PR PATCH] [Updated] [ci skip] poppler{,-qt5}: update to 23.08.0, " mhmdanas
2023-08-07 23:05 ` [PR PATCH] [Merged]: " Duncaen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).