From 52401eeb1aa6e4f3d75946bd1e0a49b5ac66f114 Mon Sep 17 00:00:00 2001
From: Tim Dickson <dickson.tim@googlemail.com>
Date: Wed, 19 Jul 2023 09:53:26 +0700
Subject: libraries/libpaper: Updated for version 2.1.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/libpaper/libpaper.SlackBuild | 19 +++++++++++--------
 libraries/libpaper/libpaper.info       |  8 ++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'libraries/libpaper')

diff --git a/libraries/libpaper/libpaper.SlackBuild b/libraries/libpaper/libpaper.SlackBuild
index 8c9ced5482..1734dedb15 100644
--- a/libraries/libpaper/libpaper.SlackBuild
+++ b/libraries/libpaper/libpaper.SlackBuild
@@ -9,11 +9,14 @@
 # 25/06/2019 updated for 1.1.27
 # 25/06/2019 updated for 1.1.28
 # 14/04/2022 updated for 1.1.28build2
+# 24/02/2023 updated for 2.0.10 and new upstream location, path for autoconf
+# 16/07/2023 updated for 2.1.1
+# note: we use release source, as archive source misses out submodules.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libpaper
-VERSION=${VERSION:-1.1.28build2}
+VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -52,7 +55,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Set default papersize: a3, a4, a5, b5, letter, legal, executive, note, 11x17
+# Set default papersize: a3, a4, a5, b5, letter, legal, executive, note, 11x17 etc..
+# /etc/paperspecs contains the full list.
 PAPERSIZE=${PAPERSIZE:-a4}
 
 set -e
@@ -61,7 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf "$CWD/${PRGNAM}_${VERSION}.tar.gz"
+tar xvf "$CWD/${PRGNAM}-${VERSION}.tar.gz"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,12 +73,13 @@ find -L . \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
-#patch configure.ac for default paper size
-sed -i "s/PAPERSIZE=letter/PAPERSIZE=$PAPERSIZE/g" configure.ac
-autoreconf -i
+#patch configure.ac to allow with slackware's autoconf version
+sed -i "s/2.71/2.69/g" configure.ac
+#autoreconf -i -f
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  --enable-relocatable \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -85,9 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 make
 make install DESTDIR=$PKG
-
 rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
 # Create a /etc/papersize default file
 mkdir -p $PKG/etc
 echo $PAPERSIZE > $PKG/etc/papersize.new
diff --git a/libraries/libpaper/libpaper.info b/libraries/libpaper/libpaper.info
index 037df1317a..69be3b3c2b 100644
--- a/libraries/libpaper/libpaper.info
+++ b/libraries/libpaper/libpaper.info
@@ -1,8 +1,8 @@
 PRGNAM="libpaper"
-VERSION="1.1.28build2"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/libpaper/"
-DOWNLOAD="https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libpaper/1.1.28build2/libpaper_1.1.28build2.tar.gz"
-MD5SUM="76bf6d105c9d878a0c609e43fc915337"
+VERSION="2.1.1"
+HOMEPAGE="https://github.com/rrthomas/libpaper"
+DOWNLOAD="https://github.com/rrthomas/libpaper/releases/download/v2.1.1/libpaper-2.1.1.tar.gz"
+MD5SUM="3ee7420ed7afae14a3387a4a0e68c60f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3-65-gdbad