[arch-commits] Commit in gambas3/trunk (PKGBUILD gambas-poppler-21.06.patch)

[Evangelos Foutras]

    Date: Thursday, June 3, 2021 @ 02:58:35
  Author: foutrelis
Revision: 954285

Switch to upstream patch for poppler 21.06.0

Modified:
  gambas3/trunk/PKGBUILD
  gambas3/trunk/gambas-poppler-21.06.patch

----------------------------+
 PKGBUILD                   |    3 ++-
 gambas-poppler-21.06.patch |   40 ++++++++++++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-03 02:58:17 UTC (rev 954284)
+++ PKGBUILD	2021-06-03 02:58:35 UTC (rev 954285)
@@ -46,7 +46,7 @@
         gambas-poppler-21.06.patch)
 sha512sums=('c1ccc08f24380fcf74c83c4b88edb30461e4116e133b3ad9903ae0c4e67a2c2a4968c0ad482b505dd853c59001dff3b28207abce2fa841842b3f523c79c348c4'
             '8f725fb68b5cc7e6d23943cbd3fef96ffb26eff3c961c0ac4d5ccfee456234ba2ff5f80388e1cd9f5dc1395a629f1da542fab5648bcc47e690d6ddb93d8fe8bd'
-            '2b815bc6001e5379494d83d44839546f26f5f8fa4a0a2b2e8da1207699337cf3859f5c23c54b5157161310428ac5cd72ecd90078db62a01777d0475ca8c64c90')
+            '580805ae153a7f35709382ba8bca8eece3cb82bc6028aa5b9439af4416313890338f809d92e6d39e7b4384b5fc3d52eb603b9e727f3c7723335472860f969978')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -58,6 +58,7 @@
 
   # remove reference to poppler-splash because poppler 20.12 does not
   # include a .pc file for it; temporary until it gets fixed upstream
+  # (fixed by https://gitlab.com/gambas/gambas/-/commit/2dc81d0b9887)
   patch -Np1 -i ../gambas-poppler-20.12.patch
 
   # OutlineItem::close has been removed in poppler 21.06 as pointless

Modified: gambas-poppler-21.06.patch
===================================================================
--- gambas-poppler-21.06.patch	2021-06-03 02:58:17 UTC (rev 954284)
+++ gambas-poppler-21.06.patch	2021-06-03 02:58:35 UTC (rev 954285)
@@ -1,12 +1,40 @@
-diff -upr gambas-3.15.2.orig/gb.pdf/src/CPdfDocument.cpp gambas-3.15.2/gb.pdf/src/CPdfDocument.cpp
---- gambas-3.15.2.orig/gb.pdf/src/CPdfDocument.cpp	2020-09-17 14:12:42.000000000 +0300
-+++ gambas-3.15.2/gb.pdf/src/CPdfDocument.cpp	2021-06-02 19:19:30.576503642 +0300
-@@ -766,8 +766,6 @@ BEGIN_PROPERTY(PDFINDEX_is_open)
+From dbd2bb3a27c90e419b7f9019478004312b5b977d Mon Sep 17 00:00:00 2001
+From: gambas <g4mba5 at gmail.com>
+Date: Thu, 3 Jun 2021 00:44:42 +0200
+Subject: [PATCH] Make 'gb.pdf' compile with poppler 21.06.0.
+
+[GB.PDF]
+* BUG: Make 'gb.pdf' compile with poppler 21.06.0.
+---
+ gb.pdf/configure.ac         | 2 ++
+ gb.pdf/src/CPdfDocument.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
+index d4de2c29c..a695f13bd 100644
+--- a/gb.pdf/configure.ac
++++ b/gb.pdf/configure.ac
+@@ -29,6 +29,8 @@ if test "$have_poppler" = "yes"; then
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_85, $((1-$?)), Poppler version >= 0.85)
+   pkg-config --atleast-version=0.86.0 poppler
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_86, $((1-$?)), Poppler version >= 0.86)
++  pkg-config --atleast-version=21.06.0 poppler
++  AC_DEFINE_UNQUOTED(POPPLER_VERSION_21_06_0, $((1-$?)), Poppler version >= 21.06.0)
+ fi
  
+ AC_OUTPUT( \
+diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
+index 9102af09a..89d7f8033 100644
+--- a/gb.pdf/src/CPdfDocument.cpp
++++ b/gb.pdf/src/CPdfDocument.cpp
+@@ -766,8 +766,10 @@ BEGIN_PROPERTY(PDFINDEX_is_open)
+ 
  	if (VPROP(GB_INTEGER))
  		item->open();
--	else
--		item->close();
++#ifndef POPPLER_VERSION_21_06_0
+ 	else
+ 		item->close();
++#endif
  
  END_PROPERTY