3 files changed, 45 insertions, 50 deletions
diff --git a/office/pdfstudioviewer/README b/office/pdfstudioviewer/README
index 250390b3ffc8..0ea5287a982e 100644
--- a/office/pdfstudioviewer/README
+++ b/office/pdfstudioviewer/README
@@ -17,10 +17,4 @@ Key features of PDF Studio Viewer:
  * Document Storage Integrations
  * DocuSign Integration
 
-By default PDF Studio Viewer uses the system-wide Java.
-
-If you pass OWNJAVA=yes to the SlackBuild script:
-OWNJAVA=yes ./pdfstudioviewer.SlackBuild
-a version of Java that comes packaged with PDF Studio Viewer will be
-installed under the PDF Studio Viewer installation directory, this Java
-will not be used by other programs.
+Java comes bundled with the PDF Studio Viewer.
diff --git a/office/pdfstudioviewer/pdfstudioviewer.SlackBuild b/office/pdfstudioviewer/pdfstudioviewer.SlackBuild
index 3a259626d62e..8737323bb579 100644
--- a/office/pdfstudioviewer/pdfstudioviewer.SlackBuild
+++ b/office/pdfstudioviewer/pdfstudioviewer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pdfstudioviewer
 
-# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2019-2024, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pdfstudioviewer
-VERSION=${VERSION:-2020.4.0}
+VERSION=${VERSION:-2024.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -39,16 +39,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-case "$ARCH" in
-    i?86) DEBARCH="" ;;
-  x86_64) DEBARCH=64 ;;
-       *) printf "\n$ARCH is unsupported for the PDF Studio Viewer.\n\n"
-          exit 1 ;;
-esac
-
-# 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
@@ -63,38 +53,40 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/PDFStudioViewer_v${VERSION//./_}_linux${DEBARCH}.deb data.tar.gz | tar xvz
+ar p $CWD/PDFStudioViewer_v${VERSION//./_}_linux64.deb data.tar.gz | tar xvz
+case "$ARCH" in
+  x86_64) ;;
+       *) rm -f  opt/$PRGNAM$YEAR/lib/libSaneLib_64.so
+          rm -rf opt/$PRGNAM$YEAR/lib/swt
+          rm -rf opt/$PRGNAM$YEAR/lib/tess
+          rm -rf opt/$PRGNAM$YEAR/jre
+          tar xvf $CWD/bellsoft-jre*-linux-*.tar.gz
+          mv jre* opt/$PRGNAM$YEAR/jre
+esac
 mkdir -p usr/bin
-ln -s /opt/pdfstudioviewer${YEAR}/pdfstudioviewer${YEAR} usr/bin/pdfstudioviewer
+ln -s /opt/$PRGNAM$YEAR/$PRGNAM$YEAR $PKG/usr/bin/$PRGNAM
 
 mkdir -p usr/share/applications
-echo -e "[Desktop Entry]
+cat > usr/share/applications/$PRGNAM$YEAR.desktop << EOF
+[Desktop Entry]
 Type=Application
-Name=PDF Studio Viewer ${YEAR}
-Exec=/bin/sh "/opt/pdfstudioviewer${YEAR}/pdfstudioviewer${YEAR}"
-Icon=/opt/pdfstudioviewer${YEAR}/.install4j/pdfstudioviewer${YEAR}.png
+Name=PDF Studio Viewer $YEAR
+Exec=/bin/sh "/opt/$PRGNAM$YEAR/$PRGNAM$YEAR"
+Icon=/opt/$PRGNAM$YEAR/.install4j/$PRGNAM$YEAR.png
 Terminal=false
 Categories=Office;Viewer;
-MimeType=application/pdf;" \
-> usr/share/applications/${PRGNAM}${YEAR}.desktop
+MimeType=application/pdf;
+EOF
 
-mkdir -p usr/doc/$PRGNAM-$VERSION
+rm -f opt/$PRGNAM$YEAR/updater
+rm -f opt/$PRGNAM$YEAR/pdfstudiosu
 
-if [ "${OWNJAVA:-no}" = "yes" ]; then
-  cd opt/pdfstudioviewer${YEAR}/jre
-  for pack_file in lib/*.jar.pack; do
-    jar_file=$( echo "$pack_file" | awk '{ print substr($0,1,length-5) }' )
-    bin/unpack200 -r "$pack_file" "$jar_file"
-  done
-  for pack_file in lib/ext/*.jar.pack; do
-    jar_file=$( echo "$pack_file" | awk '{ print substr($0,1,length-5) }' )
-    bin/unpack200 -r "$pack_file" "$jar_file"
-  done
-  bin/java -Xshare:dump &>/dev/null
-  cd $PKG
-else
-  rm -rf opt/pdfstudioviewer${YEAR}/jre
-fi
+sed -i -e \
+'s|-include-options.*user\.vmoptions|-include-options \${HOME}/.config/PDFStudioViewer/user.vmoptions|' \
+opt/$PRGNAM$YEAR/$PRGNAM$YEAR.vmoptions
+
+find -L opt/$PRGNAM$YEAR/lib opt/$PRGNAM$YEAR/jre/lib \
+  -type f -name "*.so" -exec chmod 755 {} \;
 
 chown -R root:root .
 find -L . \
@@ -104,8 +96,15 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 chmod 0755 $PKG
 
+opt/$PRGNAM$YEAR/jre/bin/java -Xshare:dump &>/dev/null
+
+find $PKG -path $PKG/opt/$PRGNAM$YEAR/jre -prune -o -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 usr/doc/$PRGNAM-$VERSION
 for f in additionalcopyrights.html license_viewer.html; do
-  unzip -p opt/pdfstudioviewer${YEAR}/lib/pdfstudio.jar \
+  unzip -p opt/$PRGNAM$YEAR/lib/pdfstudio.jar \
   resources/$f > usr/doc/$PRGNAM-$VERSION/$f
 done
 cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/office/pdfstudioviewer/pdfstudioviewer.info b/office/pdfstudioviewer/pdfstudioviewer.info
index 9515a0a516a6..0df275d75142 100644
--- a/office/pdfstudioviewer/pdfstudioviewer.info
+++ b/office/pdfstudioviewer/pdfstudioviewer.info
@@ -1,10 +1,12 @@
 PRGNAM="pdfstudioviewer"
-VERSION="2020.4.0"
+VERSION="2024.0.1"
 HOMEPAGE="https://www.qoppa.com/pdfstudioviewer/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/PDFStudioViewer_v2020_4_0_linux.deb"
-MD5SUM="b00266ac215c57010652919cf5ecd997"
-DOWNLOAD_x86_64="https://slackware.uk/~urchlay/src/PDFStudioViewer_v2020_4_0_linux64.deb"
-MD5SUM_x86_64="915bf1db64f138d75c5bb314b44c6c07"
-REQUIRES="zulu-openjdk8"
+DOWNLOAD="https://download.qoppa.com/pdfstudioviewer/v2024/PDFStudioViewer_v2024_0_1_linux64.deb \
+          https://github.com/bell-sw/Liberica/releases/download/17.0.12+10/bellsoft-jre17.0.12+10-linux-i586.tar.gz"
+MD5SUM="bff9bcef76992031595b93795da46a05 \
+        8eedc1b804595be6efb27957ff1c47b7"
+DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudioviewer/v2024/PDFStudioViewer_v2024_0_1_linux64.deb"
+MD5SUM_x86_64="bff9bcef76992031595b93795da46a05"
+REQUIRES=""
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"