Bug#1012809: openboard: Update for Poppler 22.06

[Nathan Pratta Teodosio]

Package: openboard
Version: 1.6.1+dfsg2-1
Severity: normal
Tags: patch
X-Debbugs-Cc: nathan.teodosio at canonical.com

Dear Maintainer,

Since Poppler 22.06 is making its way into experimental (currently in NEW[1]),
Openboard will need the compatibility changes from upstream to build. I
collected them in the attached patch.

[1]: https://ftp-master.debian.org/new.html


-- System Information:
Debian Release: bookworm/sid
  APT prefers kinetic
  APT policy: (500, 'kinetic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.15.0-33-generic (SMP w/8 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages openboard depends on:
ii  libavcodec58              7:4.4.2-1ubuntu3
ii  libavformat58             7:4.4.2-1ubuntu3
ii  libavutil56               7:4.4.2-1ubuntu3
ii  libc6                     2.35-0ubuntu3
ii  libgcc-s1                 12.1.0-2ubuntu1
ii  libgomp1                  12.1.0-2ubuntu1
pn  libpoppler118             <none>
ii  libqt5core5a              5.15.4+dfsg-2
ii  libqt5gui5                5.15.4+dfsg-2
ii  libqt5multimedia5         5.15.4-1
ii  libqt5multimediawidgets5  5.15.4-1
ii  libqt5network5            5.15.4+dfsg-2
ii  libqt5svg5                5.15.4-1
ii  libqt5webkit5             5.212.0~alpha4-18
ii  libqt5widgets5            5.15.4+dfsg-2
ii  libqt5xml5                5.15.4+dfsg-2
ii  libquazip5-1              0.9.1-2
ii  libssl3                   3.0.3-5ubuntu3
ii  libstdc++6                12.1.0-2ubuntu1
ii  libswresample3            7:4.4.2-1ubuntu3
ii  libswscale5               7:4.4.2-1ubuntu3
ii  libx11-6                  2:1.7.5-1
pn  openboard-common          <none>
ii  zlib1g                    1:1.2.11.dfsg-2ubuntu9

openboard recommends no packages.

Versions of packages openboard suggests:
pn  openboard-contrib  <none>
-------------- next part --------------
Description: Backport for Poppler 22.06 compatibility
Author: Nathan Pratta Teodosio <nathan.teodosio at canonical.com>
--- a/src/pdf/XPDFRenderer.cpp	2022-06-14 11:15:55.508584513 -0300
+++ b/src/pdf/XPDFRenderer.cpp	2022-06-14 11:16:00.312570630 -0300
@@ -95,6 +95,8 @@
     }
 #ifdef USE_XPDF
     mDocument = new PDFDoc(new GString(filename.toLocal8Bit()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
+#elif POPPLER_VERSION_MAJOR > 22 || (POPPLER_VERSION_MAJOR == 22 && POPPLER_VERSION_MINOR >= 3)
+    mDocument = new PDFDoc(std::make_unique<GooString>(filename.toLocal8Bit()));
 #else
     mDocument = new PDFDoc(new GooString(filename.toLocal8Bit()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
 #endif