Update for Poppler 23.10.0

4 files changed, 23 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1165b25d6da7..58f6686ec513 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 23.08.0
+	pkgver = 23.10.0
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-cairo-backend
 	arch = i686
@@ -11,17 +11,14 @@ pkgbase = poppler-qt-lcd
 	makedepends = boost
 	depends = qt5-base
 	depends = cairo
-	depends = poppler>=23.08.0
-	provides = poppler-qt=23.08.0
-	provides = poppler-qt5=23.08.0
-	conflicts = poppler-qt
-	conflicts = poppler-qt4
+	depends = poppler>=23.10.0
+	provides = poppler-qt5=23.10.0
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-23.08.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-23.10.0.tar.xz
 	source = 0001-Cairo-backend-added-to-Qt5-wrapper.patch
 	source = 0002-Setting-default-Qt5-backend-to-Cairo.patch
-	md5sums = b369afc9511198de5a604ca3baea1ddd
-	md5sums = 9bdd55cf91514800807fc275d5914400
-	md5sums = 70a92c3126ee9324f3c1c850db7effcc
+	md5sums = 3be79099d8725debef73ea07502b771a
+	md5sums = a31d283e04bc0a4cc59d6302c9142e57
+	md5sums = 6d1e3e9c22b5af0f4484d8065e321ae7
 
 pkgname = poppler-qt-lcd
diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
index 2a70552afcd2..29bc8c13b437 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From d5b9a082ac115b3d45aa60952098cab3cb3cc862 Mon Sep 17 00:00:00 2001
+From c83de9c271e25e75e8c7dc18e96476b3c0299297 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 4 Apr 2018 16:36:56 +0100
 Subject: [PATCH 1/2] Cairo backend added to Qt5 wrapper
@@ -12,7 +12,7 @@ Subject: [PATCH 1/2] Cairo backend added to Qt5 wrapper
  5 files changed, 95 insertions(+), 1 deletion(-)
 
 diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
-index 53568ccb..1b0405de 100644
+index e4762028..e8b48fa6 100644
 --- a/qt5/src/CMakeLists.txt
 +++ b/qt5/src/CMakeLists.txt
 @@ -5,6 +5,11 @@ include_directories(
@@ -40,7 +40,7 @@ index 53568ccb..1b0405de 100644
 +endif(HAVE_CAIRO)
  add_library(poppler-qt5 ${poppler_qt5_SRCS})
  generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
- set_target_properties(poppler-qt5 PROPERTIES VERSION 1.32.0 SOVERSION 1)
+ set_target_properties(poppler-qt5 PROPERTIES VERSION 1.33.0 SOVERSION 1)
 @@ -44,6 +56,9 @@ if(MINGW AND BUILD_SHARED_LIBS)
      set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
  endif()
@@ -168,10 +168,10 @@ index 853ee3b9..17798c1e 100644
      return false;
  }
 diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
-index abeb4fdb..380461a3 100644
+index 4236de06..b62afa68 100644
 --- a/qt5/src/poppler-qt5.h
 +++ b/qt5/src/poppler-qt5.h
-@@ -1182,7 +1182,8 @@ public:
+@@ -1183,7 +1183,8 @@ public:
      {
          SplashBackend, ///< Splash backend
          ArthurBackend, ///< \deprecated The old name of the QPainter backend
@@ -198,5 +198,5 @@ index e610413a..26c45088 100644
    string(REPLACE "-" "" test_name ${exe})
    set(${test_name}_SOURCES
 -- 
-2.41.0
+2.42.0
 
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 748d687a2390..cf2ca1946a1e 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From d3740c4523e98c3a593b283331ea4ee4f681c16f Mon Sep 17 00:00:00 2001
+From 71d672ea67a0f2f6c36894631e1c033f63a79751 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 4 Apr 2018 16:37:38 +0100
 Subject: [PATCH 2/2] Setting default Qt5 backend to Cairo
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Setting default Qt5 backend to Cairo
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc
-index 228d8e8e..eb219a8e 100644
+index 956c80fb..3ef3c3d1 100644
 --- a/qt5/src/poppler-private.cc
 +++ b/qt5/src/poppler-private.cc
-@@ -252,7 +252,7 @@ DocumentData::~DocumentData()
+@@ -262,7 +262,7 @@ DocumentData::~DocumentData()
  
  void DocumentData::init()
  {
@@ -21,5 +21,5 @@ index 228d8e8e..eb219a8e 100644
      m_hints = 0;
      m_optContentModel = nullptr;
 -- 
-2.41.0
+2.42.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d4d37650ce5..bb7635ef42a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,22 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=23.08.0
+pkgver=23.10.0
 pkgrel=1
 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
 license=('GPL')
 arch=(i686 x86_64)
-provides=("poppler-qt=${pkgver}" "poppler-qt5=${pkgver}")
-conflicts=('poppler-qt' 'poppler-qt4' 'poppler-qt5')
+provides=("poppler-qt5=${pkgver}")
+conflicts=('poppler-qt5')
 depends=('qt5-base' 'cairo' "poppler>=${pkgver}")
 makedepends=('cmake' 'pkgconfig' 'boost')
 url="https://github.com/giddie/poppler-cairo-backend"
 source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz
         0001-Cairo-backend-added-to-Qt5-wrapper.patch
         0002-Setting-default-Qt5-backend-to-Cairo.patch)
-md5sums=('b369afc9511198de5a604ca3baea1ddd'
-         '9bdd55cf91514800807fc275d5914400'
-         '70a92c3126ee9324f3c1c850db7effcc')
+md5sums=('3be79099d8725debef73ea07502b771a'
+         'a31d283e04bc0a4cc59d6302c9142e57'
+         '6d1e3e9c22b5af0f4484d8065e321ae7')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"