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

[Antonio Rojas]

    Date: Tuesday, January 7, 2020 @ 21:28:30
  Author: arojas
Revision: 550098

Fix build with poppler 0.83

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

---------------------------+
 PKGBUILD                  |    7 +++++--
 gambas-poppler-0.83.patch |   13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-07 21:25:21 UTC (rev 550097)
+++ PKGBUILD	2020-01-07 21:28:30 UTC (rev 550098)
@@ -41,8 +41,10 @@
          'libxslt' 'libgnome-keyring' 'gsl' 'gst-plugins-base-libs' 'alure' 'gtkglext' 'ncurses'
 	 'gmime3')
 options=('!emptydirs' 'libtool')
-source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2")
-sha512sums=('677d1ed3e1bf6b8cf6be658b8fef1f6904c052368a4d6d8f7c0d30797a37b0e5ec56b19f1c5f60f0df82bffa814a8969ae2d4c8d1f312eccda4f7025a5d78c01')
+source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
+         gambas-poppler-0.83.patch)
+sha512sums=('677d1ed3e1bf6b8cf6be658b8fef1f6904c052368a4d6d8f7c0d30797a37b0e5ec56b19f1c5f60f0df82bffa814a8969ae2d4c8d1f312eccda4f7025a5d78c01'
+            '1c603540749f2b797052833a50653711c05611df4228efcf57b3ad9f39f225b2b85cbad5a8994a586645832781c199719f710534472fa66574028998fe7b87a1')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -52,6 +54,7 @@
 prepare() {
   cd ${srcdir}/gambas-${pkgver}
 
+  patch -p1 -i ../gambas-poppler-0.83.patch # Fix build with poppler 0.83 (OpenMandriva)
   ./reconf-all
 }
 

Added: gambas-poppler-0.83.patch
===================================================================
--- gambas-poppler-0.83.patch	                        (rev 0)
+++ gambas-poppler-0.83.patch	2020-01-07 21:28:30 UTC (rev 550098)
@@ -0,0 +1,13 @@
+diff --git a/gb.pdf/src/main.cpp b/gb.pdf/src/main.cpp
+index 93af4b1..0464e0c 100644
+--- a/gb.pdf/src/main.cpp
++++ b/gb.pdf/src/main.cpp
+@@ -56,7 +56,7 @@ int EXPORT GB_INIT(void)
+ 	if (!globalParams)
+ 	{
+ #if POPPLER_VERSION_0_6
+-		globalParams = new GlobalParams();
++		globalParams = std::unique_ptr<GlobalParams>();
+ #else
+ 		globalParams = new GlobalParams("/etc/xpdfrc");
+ #endif