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

[Evangelos Foutras]

    Date: Wednesday, June 2, 2021 @ 16:41:47
  Author: foutrelis
Revision: 953258

upgpkg: gambas3 3.15.2-11: poppler 21.06.0 rebuild

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

----------------------------+
 PKGBUILD                   |   12 +++++++++---
 gambas-poppler-21.06.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-02 15:35:46 UTC (rev 953257)
+++ PKGBUILD	2021-06-02 16:41:47 UTC (rev 953258)
@@ -27,7 +27,7 @@
          'gambas3-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web-gui' 'gambas3-gb-web'
          'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
 pkgver=3.15.2
-pkgrel=10
+pkgrel=11
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('x86_64')
 url="http://gambas.sourceforge.net/"
@@ -42,9 +42,11 @@
          'gmime3' 'libxcrypt')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
-        gambas-poppler-20.12.patch)
+        gambas-poppler-20.12.patch
+        gambas-poppler-21.06.patch)
 sha512sums=('c1ccc08f24380fcf74c83c4b88edb30461e4116e133b3ad9903ae0c4e67a2c2a4968c0ad482b505dd853c59001dff3b28207abce2fa841842b3f523c79c348c4'
-            '8f725fb68b5cc7e6d23943cbd3fef96ffb26eff3c961c0ac4d5ccfee456234ba2ff5f80388e1cd9f5dc1395a629f1da542fab5648bcc47e690d6ddb93d8fe8bd')
+            '8f725fb68b5cc7e6d23943cbd3fef96ffb26eff3c961c0ac4d5ccfee456234ba2ff5f80388e1cd9f5dc1395a629f1da542fab5648bcc47e690d6ddb93d8fe8bd'
+            '2b815bc6001e5379494d83d44839546f26f5f8fa4a0a2b2e8da1207699337cf3859f5c23c54b5157161310428ac5cd72ecd90078db62a01777d0475ca8c64c90')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -58,6 +60,10 @@
   # include a .pc file for it; temporary until it gets fixed upstream
   patch -Np1 -i ../gambas-poppler-20.12.patch
 
+  # OutlineItem::close has been removed in poppler 21.06 as pointless
+  # https://gitlab.freedesktop.org/poppler/poppler/-/commit/8f9115bf4
+  patch -Np1 -i ../gambas-poppler-21.06.patch
+
   ./reconf-all
 }
 

Added: gambas-poppler-21.06.patch
===================================================================
--- gambas-poppler-21.06.patch	                        (rev 0)
+++ gambas-poppler-21.06.patch	2021-06-02 16:41:47 UTC (rev 953258)
@@ -0,0 +1,12 @@
+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)
+ 
+ 	if (VPROP(GB_INTEGER))
+ 		item->open();
+-	else
+-		item->close();
+ 
+ END_PROPERTY
+