diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-05-07 19:40:42 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-05-14 19:27:49 +0700 |
| commit | be1482f2295a9c308cff1fe53c913d7db7006514 (patch) | |
| tree | a09f0d8312100bcb9fb9d0396637633e82a55d5e | |
| parent | b7a016faa13c29ee2f26f72fe2df035ee8b1e325 (diff) | |
academic/openboard: Fix build on current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | academic/openboard/573.patch | 34 | ||||
| -rw-r--r-- | academic/openboard/openboard.SlackBuild | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/academic/openboard/573.patch b/academic/openboard/573.patch new file mode 100644 index 000000000000..8bdc237904b6 --- /dev/null +++ b/academic/openboard/573.patch @@ -0,0 +1,34 @@ +From 2aee390105b4d2e23f52df7bbd88247ce35109b6 Mon Sep 17 00:00:00 2001 +From: letsfindaway <me@letsfindaway.de> +Date: Thu, 10 Mar 2022 18:07:02 +0100 +Subject: [PATCH] fix: compile with poppler >= 22.03 + +- use c++17 (even required for poppler 22.01) +- handle API change +--- + src/pdf/XPDFRenderer.cpp | 2 ++ + src/pdf/pdf.pri | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp +index a81616b82..568265651 100644 +--- a/src/pdf/XPDFRenderer.cpp ++++ b/src/pdf/XPDFRenderer.cpp +@@ -95,6 +95,8 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile) + } + #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 +diff --git a/src/pdf/pdf.pri b/src/pdf/pdf.pri +index 9be1b7feb..aeb09b5bf 100644 +--- a/src/pdf/pdf.pri ++++ b/src/pdf/pdf.pri +@@ -1,3 +1,4 @@ ++CONFIG += c++17 + + HEADERS += src/pdf/GraphicsPDFItem.h \ + src/pdf/PDFRenderer.h \ diff --git a/academic/openboard/openboard.SlackBuild b/academic/openboard/openboard.SlackBuild index d6fa799be0c4..8400b8346d86 100644 --- a/academic/openboard/openboard.SlackBuild +++ b/academic/openboard/openboard.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=openboard SRCNAM=OpenBoard VERSION=${VERSION:-1.6.1} SRCVER=$(echo $VERSION | tr _ -) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,6 +89,7 @@ sed -i "s|lquazip5|lquazip1-qt5|g" OpenBoard.pro # Thanks to Robby Workman for the idea QUAZIPVER=`pkg-config --modversion quazip1-qt5` sed -i "s|QuaZip-Qt5-1.1|QuaZip-Qt5-$QUAZIPVER|g" OpenBoard.pro plugins/cffadaptor/UBCFFAdaptor.pro +patch -p1 < $CWD/573.patch # Patch to run in a window patch -p1 < $CWD/run-in-a-window.patch |