From: mhmdanas <mhmdanas@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [ci skip] poppler: update to 23.07.0, gpgme: update to 1.21.0.
Date: Sun, 06 Aug 2023 16:44:16 +0200 [thread overview]
Message-ID: <20230806144416.zIiY8Di5jSGSCDGm53SjNxXkpXWL65CVy-Ytn92XVnc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44352@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2023-08-06 14:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230806144416.zIiY8Di5jSGSCDGm53SjNxXkpXWL65CVy-Ytn92XVnc@z \
--to=mhmdanas@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).