From 6fe328cf8e5085a87987583d7cc3c3261859625b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 1 Sep 2019 19:03:23 +0000
Subject: Sun Sep  1 19:03:23 UTC 2019

ap/cups-2.3.0-x86_64-2.txz:  Rebuilt.
  Fixed manpages. Thanks to TurboBlaze.
  Quit renaming/symlinking binaries for LPRng compatibility.
ap/cups-filters-1.25.4-x86_64-1.txz:  Upgraded.
  Compiled against qpdf-9.0.0.
ap/qpdf-9.0.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/imagemagick-6.9.10_63-x86_64-1.txz:  Upgraded.
l/libogg-1.3.4-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.46-x86_64-1.txz:  Upgraded.
  Upgraded to nss-3.46 and nspr-4.22.
---
 source/ap/cups-filters/cups-filters.SlackBuild |  2 ++
 source/ap/cups-filters/cups-filters.qpdf9.diff | 10 ++++++
 source/ap/cups/cups.SlackBuild                 | 45 +++++---------------------
 3 files changed, 20 insertions(+), 37 deletions(-)
 create mode 100644 source/ap/cups-filters/cups-filters.qpdf9.diff

(limited to 'source/ap')

diff --git a/source/ap/cups-filters/cups-filters.SlackBuild b/source/ap/cups-filters/cups-filters.SlackBuild
index be819566..ed8024fb 100755
--- a/source/ap/cups-filters/cups-filters.SlackBuild
+++ b/source/ap/cups-filters/cups-filters.SlackBuild
@@ -78,6 +78,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/cups-filters.qpdf9.diff.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11 -fpermissive" \
 ./configure \
diff --git a/source/ap/cups-filters/cups-filters.qpdf9.diff b/source/ap/cups-filters/cups-filters.qpdf9.diff
new file mode 100644
index 00000000..c6d2b798
--- /dev/null
+++ b/source/ap/cups-filters/cups-filters.qpdf9.diff
@@ -0,0 +1,10 @@
+--- ./filter/pdf.cxx.orig	2019-08-30 04:19:22.000000000 -0500
++++ ./filter/pdf.cxx	2019-09-01 13:35:31.908840669 -0500
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ #include "pdf.h"
+ #include <vector>
++#include <cstring>
+ #include <string>
+ #include <qpdf/QPDF.hh>
+ #include <qpdf/QPDFObjectHandle.hh>
diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild
index 4f9444c6..462851e8 100755
--- a/source/ap/cups/cups.SlackBuild
+++ b/source/ap/cups/cups.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cups
 VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -89,7 +89,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-gnutls=yes \
   --enable-cdsassl=no \
   --docdir=/usr/doc \
-  --without-php \
   --disable-pam \
   --disable-avahi \
   --disable-dnssd \
@@ -159,6 +158,13 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
   mv man ..
 )
 
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
 # Adjust/expand docs:
 ( mkdir -p $PKG/usr/doc
   mv $PKG/usr/share/doc/cups $PKG/usr/doc/cups-$VERSION
@@ -193,41 +199,6 @@ fi
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# Use symlinks to certain binaries so that CUPS and LPRng can coexist:
-SUFFIX=cups
-for file in \
-usr/bin/cancel \
-usr/bin/lp \
-usr/bin/lpq \
-usr/bin/lpr \
-usr/bin/lprm \
-usr/bin/lpstat \
-usr/sbin/lpc ; do
-  ( cd $PKG
-    mv ${file} ${file}-${SUFFIX}
-    ( cd `dirname ${file}` ; ln -sf `basename ${file}`-${SUFFIX} `basename ${file}` )
-  )
-done
-# Now fix the associated man pages:
-mv $PKG/usr/man/man1/cancel.1.gz $PKG/usr/man/man1/cancel-${SUFFIX}.1.gz
-mv $PKG/usr/man/man1/lp.1.gz $PKG/usr/man/man1/lp-${SUFFIX}.1.gz
-mv $PKG/usr/man/man1/lpq.1.gz $PKG/usr/man/man1/lpq-${SUFFIX}.1.gz
-mv $PKG/usr/man/man1/lpr.1.gz $PKG/usr/man/man1/lpr-${SUFFIX}.1.gz
-mv $PKG/usr/man/man1/lprm.1.gz $PKG/usr/man/man1/lprm-${SUFFIX}.1.gz
-mv $PKG/usr/man/man1/lpstat.1.gz $PKG/usr/man/man1/lpstat-${SUFFIX}.1.gz
-mv $PKG/usr/man/man8/lpc.8.gz $PKG/usr/man/man8/lpc-${SUFFIX}.8.gz
-( cd $PKG/usr/man/man1
-  ln -sf cancel-${SUFFIX}.1.gz cancel.1.gz
-  ln -sf lp-${SUFFIX}.1.gz lp.1.gz
-  ln -sf lpq-${SUFFIX}.1.gz lpq.1.gz
-  ln -sf lpr-${SUFFIX}.1.gz lpr.1.gz
-  ln -sf lprm-${SUFFIX}.1.gz lprm.1.gz
-  ln -sf lpstat-${SUFFIX}.1.gz lpstat.1.gz
-)
-( cd $PKG/usr/man/man8
-  ln -sf lpc-${SUFFIX}.8.gz lpc.8.gz
-)
-
 # Add the doinst.sh that installs the .new conffiles:
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
-- 
cgit v1.2.3