From e81a89f1b6ccd3da8cffc51b431e0026126e34b9 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sun, 18 Aug 2019 16:29:50 +0200
Subject: 20190818.2 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 libraries/poppler-qt5/poppler-qt5.SlackBuild | 54 +++++++++++++++-------------
 libraries/poppler-qt5/poppler-qt5.info       |  6 ++--
 2 files changed, 33 insertions(+), 27 deletions(-)

(limited to 'libraries/poppler-qt5')

diff --git a/libraries/poppler-qt5/poppler-qt5.SlackBuild b/libraries/poppler-qt5/poppler-qt5.SlackBuild
index ce99c22afc..40e56259da 100644
--- a/libraries/poppler-qt5/poppler-qt5.SlackBuild
+++ b/libraries/poppler-qt5/poppler-qt5.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=poppler-qt5
-VERSION=${VERSION:-0.45.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.68.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -56,8 +56,8 @@ fi
 
 set -e
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+rm -rf $PKG ${PKG}_2
+mkdir -p $TMP $PKG ${PKG}_2 $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM/-*/}-$VERSION
 tar xvf $CWD/${PRGNAM/-*/}-$VERSION.tar.xz
@@ -69,32 +69,38 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+mkdir build
+cd build
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --enable-xpdf-headers \
-  --enable-poppler-qt4 \
-  --enable-poppler-qt5 \
-  --disable-silent-rules \
-  --enable-cairo-output \
-  --mandir=/usr/man \
-  --disable-static \
-  --without-testdatadir \
-  --enable-zlib \
-  --build=$ARCH-slackware-linux
-
+cmake \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DBUILD_SHARED_LIBS=ON \
+  -DENABLE_QT5=ON \
+  -DENABLE_CMS=lcms2 \
+  -DENABLE_DCTDECODER=libjpeg \
+  -DENABLE_GTK_DOC=ON \
+  -DENABLE_LIBOPENJPEG=openjpeg2 \
+  -DENABLE_XPDF_HEADERS=ON \
+  -DENABLE_ZLIB=ON \
+  -DENABLE_ZLIB_UNCOMPRESS=ON \
+  -DBUILD_GTK_TESTS=OFF \
+  -DBUILD_QT5_TESTS=OFF \
+  -DBUILD_CPP_TESTS=OFF \
+  ..
 make
-make -C qt5 install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-install -m 0644 $PRGNAM.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+make install DESTDIR=${PKG}_2
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/{bin,lib$LIBDIRSUFFIX/pkgconfig,include/poppler}
+mv ${PKG}_2/usr/lib$LIBDIRSUFFIX/lib$PRGNAM.* $PKG/usr/lib$LIBDIRSUFFIX/
+mv ${PKG}_2/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig
+mv ${PKG}_2/usr/bin/pdfdetach $PKG/usr/bin/
+mv ${PKG}_2/usr/include/poppler/qt5 $PKG/usr/include/poppler/
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/poppler-qt5/poppler-qt5.info b/libraries/poppler-qt5/poppler-qt5.info
index e99b4f6e11..f681888f2c 100644
--- a/libraries/poppler-qt5/poppler-qt5.info
+++ b/libraries/poppler-qt5/poppler-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="poppler-qt5"
-VERSION="0.45.0"
+VERSION="0.68.0"
 HOMEPAGE="https://poppler.freedesktop.org/"
-DOWNLOAD="https://poppler.freedesktop.org/poppler-0.45.0.tar.xz"
-MD5SUM="a66e8c3cf6dab91dab5ba90d362c6063"
+DOWNLOAD="https://poppler.freedesktop.org/poppler-0.68.0.tar.xz"
+MD5SUM="722ea5837cdfaae4c98607987000de30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
-- 
cgit v1.2.3