[arch-commits] Commit in gambas3/trunk (2 files)

[Laurent Carlier]

    Date: Thursday, January 23, 2020 @ 17:25:04
  Author: lcarlier
Revision: 555079

upgpkg: gambas3 3.14.3-3: fix segfault with gb.pdf component

Added:
  gambas3/trunk/0001-Fix-segfault-with-poppler-0.83.patch
Modified:
  gambas3/trunk/PKGBUILD

-------------------------------------------+
 0001-Fix-segfault-with-poppler-0.83.patch |   29 ++++++++++++++++++++++++++++
 PKGBUILD                                  |    9 +++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

Added: 0001-Fix-segfault-with-poppler-0.83.patch
===================================================================
--- 0001-Fix-segfault-with-poppler-0.83.patch	                        (rev 0)
+++ 0001-Fix-segfault-with-poppler-0.83.patch	2020-01-23 17:25:04 UTC (rev 555079)
@@ -0,0 +1,29 @@
+From 36c093cb21d9dab3aae35f64d44e5883eefe020e Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Thu, 23 Jan 2020 18:02:44 +0100
+Subject: [PATCH] Fix segfault with poppler>0.83
+
+[GB.PDF]
+* BUG: Fix segfault with poppler > 0.83
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ gb.pdf/src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gb.pdf/src/main.cpp b/gb.pdf/src/main.cpp
+index 2d7f02ca0..62923cc34 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_83
+-		globalParams = std::unique_ptr<GlobalParams>();
++		globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
+ #else
+ 		globalParams = new GlobalParams();
+ #endif
+-- 
+2.25.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-23 17:19:00 UTC (rev 555078)
+++ PKGBUILD	2020-01-23 17:25:04 UTC (rev 555079)
@@ -27,7 +27,7 @@
          'gambas3-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web'
          'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
 pkgver=3.14.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('x86_64')
 url="http://gambas.sourceforge.net/"
@@ -42,9 +42,11 @@
 	 'gmime3')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
-         gambas-postgresql-12.patch)
+        gambas-postgresql-12.patch
+        0001-Fix-segfault-with-poppler-0.83.patch)
 sha512sums=('a32d01b4c1126364fb98d2780153c333aaf9d0baf82a9822dbe534d723808ed320bd07792ab38fd1561301c09091920332c406c2f9421f841e723c863c738479'
-            '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49')
+            '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49'
+            '97aa2241a5faf7580bd0f627c36454b5a310a1265f0fc45e5e194dd4ab51d9b8815ee0ffe1ef7143066920395f484dd7b3a6b3c8ac35b46038218b7bf1355e3e')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -55,6 +57,7 @@
   cd ${srcdir}/gambas-${pkgver}
 
   patch -p1 -i ../gambas-postgresql-12.patch # Workaround build failure with postgresql 12
+  patch -p1 -i ../0001-Fix-segfault-with-poppler-0.83.patch # fixed upstream
   ./reconf-all
 }