From 083c200307600f4d40b30ca3b20bbbb793a79390 Mon Sep 17 00:00:00 2001
From: Lenard Spencer
Date: Sat, 2 Jan 2021 08:42:19 +0700
Subject: office/fop: Update script.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 office/fop/README         | 11 ++++++-----
 office/fop/fop.SlackBuild |  4 ++--
 office/fop/fop.info       | 10 +++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'office')

diff --git a/office/fop/README b/office/fop/README
index d8c102386f..43f142d2ed 100644
--- a/office/fop/README
+++ b/office/fop/README
@@ -13,10 +13,11 @@ described in the W3C Recommendation from 05 December 2006, and that
 complies with the November 2001 Portable Document Format Specification
 (Version 1.4) from Adobe Systems.
 
-The default build is for jdk 8 and older (including openjdk).  To build
-on jdk11 and newer, pass JDK11=yes to the build script.
+The default build is for jdk 7 and 8 (including openjdk).  To build
+on jdk11 and newer, pass JDK11=yes to the build scrip.  If you are
+still running the (incredibly ancient) jdk 6, please use fop-legacy,
+also available on SBo.
 
-jai and jai-imageio are optional but recommended dependencies.
+Requires apache-ant and apache-maven.
 
-NOTE:
-This build needs a working connection to the internet.
+jai and jai-imageio are optional but recommended dependencies.
diff --git a/office/fop/fop.SlackBuild b/office/fop/fop.SlackBuild
index b5f4f9a5ce..186fb0efd7 100644
--- a/office/fop/fop.SlackBuild
+++ b/office/fop/fop.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=fop
 VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -92,7 +92,7 @@ sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml
 
 # Copy updated {pdf,font}box files:
 rm fop/lib/fontbox-2.0.*.jar || true
-cp $CWD/{font,pdf}box-2.0.21.jar fop/lib
+cp $CWD/{font,pdf}box-2.0.*.jar fop/lib
 
 # Copy hyphenation tables:
 unzip $CWD/offo-hyphenation.zip
diff --git a/office/fop/fop.info b/office/fop/fop.info
index e1f35c0c25..1fe8adfae7 100644
--- a/office/fop/fop.info
+++ b/office/fop/fop.info
@@ -2,15 +2,15 @@ PRGNAM="fop"
 VERSION="2.5"
 HOMEPAGE="https://xmlgraphics.apache.org/fop/"
 DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.5-src.tar.gz \
-          http://mirror.reverse.net/pub/apache/pdfbox/2.0.21/fontbox-2.0.21.jar \
-          http://mirror.reverse.net/pub/apache/pdfbox/2.0.21/pdfbox-2.0.21.jar \
+          http://mirror.reverse.net/pub/apache/pdfbox/2.0.22/fontbox-2.0.22.jar \
+          http://mirror.reverse.net/pub/apache/pdfbox/2.0.22/pdfbox-2.0.22.jar \
           https://downloads.sourceforge.net/offo/2.2/offo-hyphenation.zip"
 MD5SUM="5e7e87ef12845d31bce7a1fe8d61f501 \
-        5840ff3bcc1e2ea1d066b7f0114c359b \
-        aa28f5d7a9a89bb46391643315d5307b \
+        dba672a1fa1386423d94aced4b573e22 \
+        7de0d7e4c89e5e07d0298ca112907921 \
         bf9c09bf05108ef9661b8f08d91c2336"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-maven apache-ant"
+REQUIRES="apache-ant apache-maven"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
-- 
cgit v1.2.3