1 files changed, 14 insertions, 18 deletions
diff --git a/source/ap/cups-filters/cups-filters.SlackBuild b/source/ap/cups-filters/cups-filters.SlackBuild
index 6d3f26413..e9cb6e17d 100755
--- a/source/ap/cups-filters/cups-filters.SlackBuild
+++ b/source/ap/cups-filters/cups-filters.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cups-filters
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,7 +78,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/CVE-2023-24805.patch.gz | patch -p1 --verbose || exit 1
+# We "--disable-avahi" because this package can't even use it.
 
 if [ ! -r configure ]; then
   if [ -x ./autogen.sh ]; then
@@ -88,19 +88,20 @@ if [ ! -r configure ]; then
   fi
 fi
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++17 -fpermissive" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --infodir=/usr/info \
+  --runstatedir=/run \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf \
-  --without-php \
+  --disable-avahi \
   --disable-mutool \
   --disable-static \
+  --with-browseremoteprotocols=cups \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || exit 1
@@ -115,30 +116,25 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
-mkdir -p $PKG/etc/rc.d
-mv $PKG/etc/init.d/cups-browsed $PKG/etc/rc.d/rc.cups-browsed
-chmod 0644 $PKG/etc/rc.d/rc.cups-browsed
-rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d
-
-find $PKG/etc -type f -exec mv {} {}.new \;
-
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL ChangeLog NEWS README* THANKS TODO \
+  AUTHORS* CHANGES* CONTRIBUTING* COPYING* ChangeLog* DEVELOPING* INSTALL* LICENSE* NEWS* NOTICE* README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
-# If there's a ChangeLog, installing at least part of the recent history
+# If there's a CHANGES.md, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
+if [ -r CHANGES.md ]; then
   DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
+  cat CHANGES.md | head -n 1000 > $DOCSDIR/CHANGES.md
+  touch -r CHANGES.md $DOCSDIR/CHANGES.md
 fi
 
+# Nope:
+rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/CHANGES-1.x*
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz