4 files changed, 28 insertions, 25 deletions
diff --git a/office/zathura-cb/README b/office/zathura-cb/README
index 148966325c..f49e560b3f 100644
--- a/office/zathura-cb/README
+++ b/office/zathura-cb/README
@@ -1,6 +1,4 @@
 zathura-cb (comic book plugin for zathura)
 
-Adds support for cbz, cbr, cb7, cbt files to the zathura document viewer.
-
-zathura-cb 0.1.7 is the last possible update for Slackware 14.2. Newer
-versions would require a newer gtk+3.
+Adds support for comic book (cbz, cbr, cb7, cbt) files to the zathura
+document viewer.
diff --git a/office/zathura-cb/slack-desc b/office/zathura-cb/slack-desc
index 27990bda4c..54235aeb65 100644
--- a/office/zathura-cb/slack-desc
+++ b/office/zathura-cb/slack-desc
@@ -8,8 +8,8 @@
           |-----handy-ruler------------------------------------------------------|
 zathura-cb: zathura-cb (comic book plugin for zathura)
 zathura-cb:
-zathura-cb: Adds support for cbz, cbr, cb7, cbt files to the zathura document
-zathura-cb: viewer.
+zathura-cb: Adds support for comic book (cbz, cbr, cb7, cbt) files to the zathura
+zathura-cb: document viewer.
 zathura-cb:
 zathura-cb:
 zathura-cb:
diff --git a/office/zathura-cb/zathura-cb.SlackBuild b/office/zathura-cb/zathura-cb.SlackBuild
index b873629e90..edfeb154aa 100644
--- a/office/zathura-cb/zathura-cb.SlackBuild
+++ b/office/zathura-cb/zathura-cb.SlackBuild
@@ -9,7 +9,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zathura-cb
-VERSION=${VERSION:-0.1.7}
+VERSION=${VERSION:-0.1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -57,20 +54,28 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-sed -i "s,-fPIC,$SLKCFLAGS," config.mk
-
-make VERBOSE=1
-strip *.so
-make install DESTDIR=$PKG
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/zathura-cb/zathura-cb.info b/office/zathura-cb/zathura-cb.info
index 96cdee126d..54ebf2a19c 100644
--- a/office/zathura-cb/zathura-cb.info
+++ b/office/zathura-cb/zathura-cb.info
@@ -1,8 +1,8 @@
 PRGNAM="zathura-cb"
-VERSION="0.1.7"
+VERSION="0.1.9"
 HOMEPAGE="https://github.com/pwmt/zathura-cb"
-DOWNLOAD="https://github.com/pwmt/zathura-cb/archive/0.1.7/zathura-cb-0.1.7.tar.gz"
-MD5SUM="909c74071104ce8a72bc1e5bc9df287b"
+DOWNLOAD="https://github.com/pwmt/zathura-cb/archive/0.1.9/zathura-cb-0.1.9.tar.gz"
+MD5SUM="edb8ea85dea3c6cc898c7fac2cf504ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zathura"