office/apvlv: Updated for version 0.5.0 (+new maintainer).

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 41 insertions, 20 deletions

diff --git a/office/apvlv/README b/office/apvlv/README
index 4dc2a8c2c8..51945a400a 100644
--- a/office/apvlv/README
+++ b/office/apvlv/README
@@ -7,4 +7,4 @@ viewing a directory as contents of a pdf document. Press 'k' or 'j'
 to move selected up or down, 'h' or 'l' to collapse or expand a dir,
 and pressing 't' will open the selected document in a new tab.
 
-This SlackBuild disables UMD file support.
+This SlackBuild additionally enables DjVu and text file support.
diff --git a/office/apvlv/apvlv.SlackBuild b/office/apvlv/apvlv.SlackBuild
index 723a7a96bd..8cea9e3484 100644
--- a/office/apvlv/apvlv.SlackBuild
+++ b/office/apvlv/apvlv.SlackBuild
@@ -6,6 +6,7 @@
 # Took some ideas/parts from an older apvlv SlackBuild form Eugene Wissner:
 
 # Copyright 2010 Eugene Wissner <belka.ew@gmail.com>
+# Copyright 2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -30,8 +31,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=apvlv
-VERSION=${VERSION:-20160627_9ab7626}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.5.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -72,7 +73,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -81,31 +82,33 @@ 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 {} \+
 
-# 20220217 bkw: poppler API change... this include no longer exists, and
-# it turns out it was redundant anyway.
-sed -i '/#include *<goo\/gtypes/d' src/ApvlvPdf.cc
+# Fix man directory
+sed -i "s,apvlv\.1 TYPE MAN,apvlv\.1 DESTINATION \${CMAKE_INSTALL_PREFIX}/man/man1," CMakeLists.txt
+
+# Use the tarball's Startup.pdf
+patch -p1 < $CWD/use_dist_manpdf.patch
 
 mkdir -p build
 cd build
   cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -fpermissive" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DAPVLV_WITH_UMD=false \
-    -DMANDIR=/usr/man \
+    -DAPVLV_WITH_DJVU=yes \
+    -DAPVLV_WITH_TXT=yes \
     -DDOCDIR=/usr/doc/$PRGNAM-$VERSION
   make VERBOSE=1
   make install/strip DESTDIR=$PKG
 cd ..
 
-gzip -9 $PKG/usr/man/man*/*
+gzip -9 $PKG/usr/man/man1/apvlv.1
 
 mv $PKG/etc/apvlvrc $PKG/etc/apvlvrc.new
 
 # Leave the icons in docdir - that path is hardcoded in apvlv binary
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS README THANKS TODO apvlvrc.example \
+  AUTHORS COPYING NEWS README.md THANKS TODO Startup.pdf apvlvrc.example \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/office/apvlv/apvlv.info b/office/apvlv/apvlv.info
index 4df540a600..fb02f27885 100644
--- a/office/apvlv/apvlv.info
+++ b/office/apvlv/apvlv.info
@@ -1,10 +1,10 @@
 PRGNAM="apvlv"
-VERSION="20160627_9ab7626"
-HOMEPAGE="http://naihe2010.github.com/apvlv/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/apvlv-20160627_9ab7626.tar.xz"
-MD5SUM="e7a285ca7ac4d3abc1842519c0f20987"
+VERSION="0.5.0"
+HOMEPAGE="https://github.com/naihe2010/apvlv/"
+DOWNLOAD="https://github.com/naihe2010/apvlv/archive/v0.5.0/apvlv-0.5.0.tar.gz"
+MD5SUM="f89a73deb563d100104ad2f8dc786a91"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Arne Welzel"
-EMAIL="arne.welzel@googlemail.com"
+REQUIRES="webkit2gtk"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/office/apvlv/slack-desc b/office/apvlv/slack-desc
index d648d387e1..56fbc0b579 100644
--- a/office/apvlv/slack-desc
+++ b/office/apvlv/slack-desc
@@ -11,7 +11,7 @@ apvlv:
 apvlv: Apvlv is a PDF viewer based on GTK+2 and poppler which uses
 apvlv: Vim like keybindings.
 apvlv:
-apvlv: Homepage: http://naihe2010.github.com/apvlv/
+apvlv: Homepage: https://github.com/naihe2010/apvlv/
 apvlv:
 apvlv:
 apvlv:
diff --git a/office/apvlv/use_dist_manpdf.patch b/office/apvlv/use_dist_manpdf.patch
new file mode 100644
index 0000000000..45e047df30
--- /dev/null
+++ b/office/apvlv/use_dist_manpdf.patch
@@ -0,0 +1,18 @@
+An up-to-date Startup.pdf is shipped with the dist, so just use that.
+Patch taken from Void Linux:
+https://github.com/void-linux/void-packages/blob/master/srcpkgs/apvlv/patches/use_dist_manpdf.patch
+
+diff -rup CMakeLists.txt.orig CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,10 +76,6 @@ IF (WIN32)
+     INSTALL(DIRECTORY icons DESTINATION ".")
+     INSTALL(DIRECTORY ${CMAKE_HOME_DIRECTORY}/win32/poppler-data DESTINATION ".")
+ ELSE (WIN32)
+-    ADD_CUSTOM_TARGET(Startup.pdf
+-            ALL
+-            COMMAND "man" "-t" "${CMAKE_SOURCE_DIR}/apvlv.1" "|" "ps2pdf" "-" "${CMAKE_SOURCE_DIR}/Startup.pdf"
+-            DEPENDS apvlv.1)
+     INSTALL(FILES apvlvrc.example DESTINATION ${SYSCONFDIR}
+             RENAME apvlvrc)
+     INSTALL(FILES apvlvrc.example Startup.pdf main_menubar.glade DESTINATION ${DOCDIR})