Update patch for poppler>=0.83

    Thanks to loqs at
    https://bbs.archlinux.org/viewtopic.php?pid=1883212

3 files changed, 52 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 632cc91eda31..4935ec37f2da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openboard-git
 	pkgdesc = Interactive whiteboard software for schools and universities
 	pkgver = v1.5.3.r0.g426b1f7a
-	pkgrel = 1
+	pkgrel = 2
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
 	license = GPL3
@@ -38,7 +38,7 @@ pkgbase = openboard-git
 	md5sums = 04c421c140e983d41975943ede5fe61a
 	md5sums = 21d1749400802f8fc0669feaf77de683
 	md5sums = 30a7928f696f958d5e8f06e02c49639f
-	md5sums = 8b774d204501bb8515ee224651a7d624
+	md5sums = ebddda8793f57b7b7e1402c5d271ed86
 	md5sums = 879116c683374b2dde291014e44a29fe
 	md5sums = 79afac7031634bf9e46ba67cbf2a2d0c
 
diff --git a/PKGBUILD b/PKGBUILD
index dbf22a4cfb95..13c14e413e02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
+# shellcheck disable=SC2034,SC2164,SC2154
 
 pkgname=openboard-git
 _fragment="#branch=master"
 pkgver=v1.5.3.r0.g426b1f7a
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive whiteboard software for schools and universities"
 arch=('x86_64')
 url="http://openboard.ch/index.en.html"
@@ -30,18 +31,18 @@ md5sums=('SKIP'
          '04c421c140e983d41975943ede5fe61a'
          '21d1749400802f8fc0669feaf77de683'
          '30a7928f696f958d5e8f06e02c49639f'
-         '8b774d204501bb8515ee224651a7d624'
+         'ebddda8793f57b7b7e1402c5d271ed86'
          '879116c683374b2dde291014e44a29fe'
          '79afac7031634bf9e46ba67cbf2a2d0c')
 
 pkgver() {
-  cd $srcdir/OpenBoard
+  cd "$srcdir/OpenBoard"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd $srcdir/OpenBoard
-  git apply -v $srcdir/*{diff,patch}
+  cd "$srcdir/OpenBoard"
+  git apply -v "$srcdir"/*{diff,patch}
 }
 
 build() {
@@ -53,16 +54,16 @@ build() {
 package() {
   cd "$srcdir/OpenBoard"
 
-  mkdir -p $pkgdir/opt/openboard
+  mkdir -p "$pkgdir/opt/openboard"
 
   for i in customizations etc i18n library; do
-    cp -rp $srcdir/OpenBoard/resources/$i $pkgdir/opt/openboard;
+    cp -rp "$srcdir/OpenBoard/resources/$i" "$pkgdir/opt/openboard"
   done 
 
-  cp -rp $srcdir/OpenBoard/resources/images/OpenBoard.png $pkgdir/opt/openboard/
-  cp -rp build/linux/release/product/OpenBoard $pkgdir/opt/openboard/
+  cp -rp "$srcdir/OpenBoard/resources/images/OpenBoard.png" "$pkgdir/opt/openboard/"
+  cp -rp "build/linux/release/product/OpenBoard" "$pkgdir/opt/openboard/"
 
-  install -D -m 644 $srcdir/openboard.desktop $pkgdir/usr/share/applications/openboard.desktop
-  install -d -m 755 $pkgdir/usr/bin
-  ln -s /opt/openboard/OpenBoard $pkgdir/usr/bin/openboard
+  install -D -m 644 "$srcdir/openboard.desktop" "$pkgdir/usr/share/applications/openboard.desktop"
+  install -d -m 755 "$pkgdir/usr/bin"
+  ln -s /opt/openboard/OpenBoard "$pkgdir/usr/bin/openboard"
 }
diff --git a/poppler.patch b/poppler.patch
index 50c62230e093..24af8b64d8d9 100644
--- a/poppler.patch
+++ b/poppler.patch
@@ -1,5 +1,17 @@
+diff --git a/OpenBoard.pro b/OpenBoard.pro
+index b8a7ae5..0dcf3b8 100644
+--- a/OpenBoard.pro
++++ b/OpenBoard.pro
+@@ -3,6 +3,7 @@ TEMPLATE = app
+ 
+ THIRD_PARTY_PATH=../OpenBoard-ThirdParty
+ 
++CONFIG += c++14
+ CONFIG -= flat
+ CONFIG += debug_and_release \
+           no_include_pwd
 diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
-index a3e828e4..583882aa 100644
+index a3e828e..a77ee49 100644
 --- a/src/pdf/XPDFRenderer.cpp
 +++ b/src/pdf/XPDFRenderer.cpp
 @@ -32,6 +32,7 @@
@@ -10,7 +22,15 @@ index a3e828e4..583882aa 100644
  
  #include "core/memcheck.h"
  
-@@ -51,7 +52,7 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile)
+@@ -47,11 +48,15 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile)
+     {
+         // globalParams must be allocated once and never be deleted
+         // note that this is *not* an instance variable of this XPDFRenderer class
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 83
++        globalParams = std::make_unique<GlobalParams>();
++#else
+         globalParams = new GlobalParams(0);
++#endif
          globalParams->setupBaseFonts(QFile::encodeName(UBPlatformUtils::applicationResourcesDirectory() + "/" + "fonts").data());
      }
  
@@ -19,7 +39,20 @@ index a3e828e4..583882aa 100644
      sInstancesCount.ref();
  }
  
-@@ -99,16 +100,28 @@ QString XPDFRenderer::title() const
+@@ -70,8 +75,12 @@ XPDFRenderer::~XPDFRenderer()
+ 
+     if (sInstancesCount.loadAcquire() == 0 && globalParams)
+     {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 83
++        globalParams.reset();
++#else
+         delete globalParams;
+         globalParams = 0;
++#endif
+     }
+ }
+ 
+@@ -99,16 +108,28 @@ QString XPDFRenderer::title() const
  {
      if (isValid())
      {
@@ -52,7 +85,7 @@ index a3e828e4..583882aa 100644
              }
          }
      }
-@@ -172,12 +185,12 @@ QImage* XPDFRenderer::createPDFImage(int pageNumber, qreal xscale, qreal yscale,
+@@ -172,12 +193,12 @@ QImage* XPDFRenderer::createPDFImage(int pageNumber, qreal xscale, qreal yscale,
          SplashColor paperColor = {0xFF, 0xFF, 0xFF}; // white
          if(mSplash)
              delete mSplash;