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

[Evangelos Foutras]

    Date: Wednesday, December 2, 2020 @ 09:04:12
  Author: foutrelis
Revision: 769113

Fix build with poppler 20.12

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

----------------------------+
 PKGBUILD                   |    8 ++++++--
 gambas-poppler-20.12.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-02 09:04:09 UTC (rev 769112)
+++ PKGBUILD	2020-12-02 09:04:12 UTC (rev 769113)
@@ -42,9 +42,9 @@
 	 'gmime3' 'libxcrypt')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
-        gambas-postgresql-12.patch)
+        gambas-poppler-20.12.patch)
 sha512sums=('c1ccc08f24380fcf74c83c4b88edb30461e4116e133b3ad9903ae0c4e67a2c2a4968c0ad482b505dd853c59001dff3b28207abce2fa841842b3f523c79c348c4'
-            '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49')
+            '8f725fb68b5cc7e6d23943cbd3fef96ffb26eff3c961c0ac4d5ccfee456234ba2ff5f80388e1cd9f5dc1395a629f1da542fab5648bcc47e690d6ddb93d8fe8bd')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -54,6 +54,10 @@
 prepare() {
   cd ${srcdir}/gambas-${pkgver}
 
+  # remove reference to poppler-splash because poppler 20.12 does not
+  # include a .pc file for it; temporary until it gets fixed upstream
+  patch -Np1 -i ../gambas-poppler-20.12.patch
+
   ./reconf-all
 }
 

Added: gambas-poppler-20.12.patch
===================================================================
--- gambas-poppler-20.12.patch	                        (rev 0)
+++ gambas-poppler-20.12.patch	2020-12-02 09:04:12 UTC (rev 769113)
@@ -0,0 +1,11 @@
+diff -upr gambas-3.15.2.orig/gb.poppler/configure.ac gambas-3.15.2/gb.poppler/configure.ac
+--- gambas-3.15.2.orig/gb.poppler/configure.ac	2020-09-17 14:12:42.000000000 +0300
++++ gambas-3.15.2/gb.poppler/configure.ac	2020-12-02 10:35:34.428168215 +0200
+@@ -9,6 +9,6 @@ GB_COMPONENT_PKG_CONFIG(
+   POPPLER,
+   gb.poppler,
+   [src],
+-  'poppler >= 0.20' poppler-splash poppler-glib)
++  'poppler >= 0.20' poppler-glib)
+ AC_OUTPUT( Makefile src/Makefile )
+ GB_PRINT_MESSAGES