3 files changed, 26 insertions, 27 deletions
diff --git a/office/lumina-pdf/lumina-pdf.SlackBuild b/office/lumina-pdf/lumina-pdf.SlackBuild
index e15f0c2339..e78e801288 100644
--- a/office/lumina-pdf/lumina-pdf.SlackBuild
+++ b/office/lumina-pdf/lumina-pdf.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lumina-pdf
 
-# Copyright 2019 Chris Abela, Malta
+# Copyright 2019, 2020 Chris Abela, Malta
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lumina-pdf
-VERSION=${VERSION:-1.5.0_20190822}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,7 +72,7 @@ cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 patch -p0 <$CWD/lumina-pdf.patch
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -98,4 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/office/lumina-pdf/lumina-pdf.info b/office/lumina-pdf/lumina-pdf.info
index 24a62a65c0..1f727a6aa3 100644
--- a/office/lumina-pdf/lumina-pdf.info
+++ b/office/lumina-pdf/lumina-pdf.info
@@ -1,10 +1,10 @@
 PRGNAM="lumina-pdf"
-VERSION="1.5.0_20190822"
+VERSION="1.6.0"
 HOMEPAGE="https://github.com/lumina-desktop/lumina-pdf/"
-DOWNLOAD="https://gitlab.com/chrisabela/downloads/raw/master/lumina-pdf-1.5.0_20190822.tar.gz"
-MD5SUM="e3b07bb0812f97973767e7c09f1df54c"
+DOWNLOAD="https://github.com/lumina-desktop/lumina-pdf/archive/v1.6.0/lumina-pdf-1.6.0.tar.gz"
+MD5SUM="725a2b37775b6fb36b8653e86b5442d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="poppler-qt5"
+REQUIRES=""
 MAINTAINER="Chris Abela"
 EMAIL="kristofru@gmail.com"
diff --git a/office/lumina-pdf/lumina-pdf.patch b/office/lumina-pdf/lumina-pdf.patch
index 6e78576c07..0e3fd5c5fa 100644
--- a/office/lumina-pdf/lumina-pdf.patch
+++ b/office/lumina-pdf/lumina-pdf.patch
@@ -1,23 +1,12 @@
-diff -Naur lumina-pdf/src-qt5/Renderer-poppler.cpp lumina-pdf-patched/src-qt5/Renderer-poppler.cpp
---- lumina-pdf/src-qt5/Renderer-poppler.cpp	2019-08-21 11:46:01.653515619 +0000
-+++ lumina-pdf-patched/src-qt5/Renderer-poppler.cpp	2019-08-23 10:54:36.334600721 +0000
-@@ -70,7 +70,7 @@
-     } // invalid password
-   }
+diff -Naur lumina-pdf-1.6.0/src-qt5/Renderer-poppler.cpp lumina-pdf-1.6.0-patched/src-qt5/Renderer-poppler.cpp
+--- lumina-pdf-1.6.0/src-qt5/Renderer-poppler.cpp	2020-02-04 20:56:36.000000000 +0100
++++ lumina-pdf-1.6.0-patched/src-qt5/Renderer-poppler.cpp	2020-05-18 13:34:31.211851748 +0200
+@@ -72,7 +72,7 @@
+   DOC->setRenderHint(Poppler::Document::Antialiasing);
+   DOC->setRenderHint(Poppler::Document::TextAntialiasing);
    // qDebug() << "Opening File:" << path;
 -  doctitle = DOC->title();
 +  // doctitle = DOC->title();
    if (doctitle.isEmpty()) {
      doctitle = path.section("/", -1);
    }
-diff -Naur lumina-pdf/src-qt5/drawablepage.h lumina-pdf-patched/src-qt5/drawablepage.h
---- lumina-pdf/src-qt5/drawablepage.h	2019-08-21 11:46:01.653515619 +0000
-+++ lumina-pdf-patched/src-qt5/drawablepage.h	2019-08-23 10:48:00.544733374 +0000
-@@ -4,6 +4,7 @@
- #include <QImage>
- #include <QSize>
- #include <poppler/qt5/poppler-qt5.h>
-+#include <memory>
- 
- namespace LuminaPDF {
-