diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-05-16 09:21:10 +1200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-05-21 08:25:02 +0700 |
| commit | 6f958f23e2c6efa423cd74da14e962179dfb16d0 (patch) | |
| tree | a235ac009b55ed85e1f2b85ee2ca59df00e11983 | |
| parent | 61acfc6a00ecb473693d6afe635b8c7cdbbdb29d (diff) | |
academic/openboard: Fix applying patch for -current.
gzip the patch to preserve line endings from conversion by git.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | academic/openboard/573.patch | 34 | ||||
| -rw-r--r-- | academic/openboard/573.patch.gz | bin | 0 -> 692 bytes | |||
| -rw-r--r-- | academic/openboard/openboard.SlackBuild | 2 |
3 files changed, 1 insertions, 35 deletions
diff --git a/academic/openboard/573.patch b/academic/openboard/573.patch deleted file mode 100644 index 8bdc237904b6..000000000000 --- a/academic/openboard/573.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/573.patch.gz b/academic/openboard/573.patch.gz Binary files differnew file mode 100644 index 000000000000..16865b53821a --- /dev/null +++ b/academic/openboard/573.patch.gz diff --git a/academic/openboard/openboard.SlackBuild b/academic/openboard/openboard.SlackBuild index 8400b8346d86..671171bdb869 100644 --- a/academic/openboard/openboard.SlackBuild +++ b/academic/openboard/openboard.SlackBuild @@ -89,7 +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 +zcat $CWD/573.patch.gz | patch -p1 # Patch to run in a window patch -p1 < $CWD/run-in-a-window.patch |