Upgrade to upstream version 23.06.0

2 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acbf720655dd..c61a6e99e4ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Thu May 25 17:18:44 UTC 2023
+# Thu Jun 29 10:09:40 UTC 2023
 pkgbase = lib32-poppler
-	pkgver = 23.05.0
+	pkgver = 23.06.0
 	pkgrel = 1
 	url = https://poppler.freedesktop.org/
 	arch = x86_64
@@ -23,12 +23,14 @@ pkgbase = lib32-poppler
 	makedepends = boost
 	makedepends = poppler
 	options = !emptydirs
-	source = https://poppler.freedesktop.org/poppler-23.05.0.tar.xz
-	source = https://poppler.freedesktop.org/poppler-23.05.0.tar.xz.sig
-	source = test::git+https://gitlab.freedesktop.org/poppler/test.git/#commit=ae4c5f64986aeaa6701bb65235eccd99243c76bc
+	source = https://poppler.freedesktop.org/poppler-23.06.0.tar.xz
+	source = https://poppler.freedesktop.org/poppler-23.06.0.tar.xz.sig
+	source = fix-signature-test-failure.patch::https://gitlab.freedesktop.org/poppler/poppler/-/commit/def45c82b36ec393fbaf16d9873db23bc9659b80.patch
+	source = test::git+https://gitlab.freedesktop.org/poppler/test.git/#commit=e3cdc82782941a8d7b8112f83b4a81b3d334601a
 	source = pkgconf32
-	sha512sums = b7fdd519737b95c5898f3ff83a294430390c330d0f3e5526180c956550656be9374a534d6c4e7ebffccaac3364b01d74b75a82d3f703e2575cc1b1273e7a12c3
+	sha512sums = 4f7ac99431b4c4fccbb94080e3964fad2abde67d6c7895090cd72488c00066faf7e5d34c660ab46a63a1009bbc948660cc5db1a4cfa1bbfe78f3bf18e95415f6
 	sha512sums = SKIP
+	sha512sums = 72da4491d6e27929cac452508e08796fc09b7a071e8c67af4bc93afb7e600555bda4adfe3023e1e1fab98805e4d3dd5741ed018608876939375e92230b59f87f
 	sha512sums = SKIP
 	sha512sums = f704e11f3054312e35974194af845e00fdc795aa97e82d425fb52ff8e628702926551b583f0354f9f9e7eafeb71c7f348c288457ff19a8c4807c58f637d0d946
 
@@ -40,7 +42,7 @@ pkgname = lib32-poppler
 	depends = lib32-fontconfig
 	depends = lib32-openjpeg2
 	depends = lib32-lcms2
-	depends = poppler>=23.05.0
+	depends = poppler>=23.06.0
 	depends = lib32-nss
 	depends = curl
 	optdepends = poppler-data: encoding data to display PDF documents containing CJK characters
@@ -49,8 +51,8 @@ pkgname = lib32-poppler
 
 pkgname = lib32-poppler-glib
 	pkgdesc = Poppler glib bindings (32-bit)
-	depends = lib32-poppler=23.05.0
+	depends = lib32-poppler=23.06.0
 	depends = lib32-glib2
-	depends = poppler-glib>=23.05.0
+	depends = poppler-glib>=23.06.0
 	provides = libpoppler-glib.so
 
diff --git a/PKGBUILD b/PKGBUILD
index 2c1e13f058d5..f3437bfb4130 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 pkgbase=lib32-poppler
 _pkgbase=poppler
 pkgname=('lib32-poppler' 'lib32-poppler-glib')
-pkgver=23.05.0
-_commit=ae4c5f64986aeaa6701bb65235eccd99243c76bc
+pkgver=23.06.0
+_commit=e3cdc82782941a8d7b8112f83b4a81b3d334601a
 pkgrel=1
 arch=(x86_64)
 license=('GPL')
@@ -19,16 +19,22 @@ options=('!emptydirs')
 url="https://poppler.freedesktop.org/"
 # https://gitlab.freedesktop.org/poppler/poppler
 source=(https://poppler.freedesktop.org/${_pkgbase}-${pkgver}.tar.xz{,.sig}
+        fix-signature-test-failure.patch::https://gitlab.freedesktop.org/poppler/poppler/-/commit/def45c82b36ec393fbaf16d9873db23bc9659b80.patch
         test::git+https://gitlab.freedesktop.org/poppler/test.git/#commit=$_commit
         pkgconf32)
-sha512sums=('b7fdd519737b95c5898f3ff83a294430390c330d0f3e5526180c956550656be9374a534d6c4e7ebffccaac3364b01d74b75a82d3f703e2575cc1b1273e7a12c3'
+sha512sums=('4f7ac99431b4c4fccbb94080e3964fad2abde67d6c7895090cd72488c00066faf7e5d34c660ab46a63a1009bbc948660cc5db1a4cfa1bbfe78f3bf18e95415f6'
             'SKIP'
+            '72da4491d6e27929cac452508e08796fc09b7a071e8c67af4bc93afb7e600555bda4adfe3023e1e1fab98805e4d3dd5741ed018608876939375e92230b59f87f'
             'SKIP'
             'f704e11f3054312e35974194af845e00fdc795aa97e82d425fb52ff8e628702926551b583f0354f9f9e7eafeb71c7f348c288457ff19a8c4807c58f637d0d946')
 validpgpkeys=('CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7') # "Albert Astals Cid <aacid@kde.org>"
 
 prepare() {
   mkdir -p build
+  cd ${_pkgbase}-${pkgver}
+  sed -i 's/^\(  set(ENABLE_GPGME ON)\)/#\1/' CMakeLists.txt
+  # Don't fail signature basics tests if backend is not configured
+  patch -Np1 -i ../fix-signature-test-failure.patch
 }
 
 build() {
@@ -47,6 +53,7 @@ build() {
     -DENABLE_LIBOPENJPEG="unmaintained" \
     -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
     -DENABLE_GTK_DOC=OFF \
+    -DENABLE_GPGME=OFF \
     -DENABLE_QT5=OFF
   make
 }