Fri Feb 23 02:27:35 UTC 202420240223022735

a/aaa_libraries-15.1-x86_64-26.txz:  Rebuilt.
  Upgraded: libacl.so.1.1.2302, libattr.so.1.1.2502, liblzma.so.5.4.6,
  libpcre2-8.so.0.12.0, libz.so.1.3.1, libcares.so.2.11.0,
  libexpat.so.1.9.0, libffi.so.8.1.4, libglib-2.0.so.0.7800.4,
  libgmodule-2.0.so.0.7800.4, libgobject-2.0.so.0.7800.4,
  libgthread-2.0.so.0.7800.4, libidn.so.12.6.5, libidn2.so.0.4.0,
  libpng16.so.16.41.0, libpsl.so.5.3.5, libtdb.so.1.4.10, libusb-1.0.so.0.4.0.
a/etc-15.1-x86_64-5.txz:  Rebuilt.
  Added UID 214 and GID 214 for avahi.
a/gettext-0.22.5-x86_64-1.txz:  Upgraded.
a/pkgtools-15.1-noarch-9.txz:  Rebuilt.
  setup.services: support rc.avahidaemon and rc.avahidnsconfd.
a/sysvinit-scripts-15.1-noarch-13.txz:  Rebuilt.
  rc.M: start (if executable) rc.avahidaemon and rc.avahidnsconfd.
ap/cups-2.4.7-x86_64-2.txz:  Rebuilt.
  Recompiled against avahi.
ap/cups-filters-1.28.17-x86_64-4.txz:  Rebuilt.
  Recompiled against avahi.
ap/hplip-3.23.12-x86_64-1.txz:  Upgraded.
  Compiled against avahi.
ap/xmltoman-0.6-x86_64-1.txz:  Added.
  This is needed to generate manpages for avahi.
d/distcc-3.4-x86_64-4.txz:  Rebuilt.
  Recompiled against avahi.
d/gettext-tools-0.22.5-x86_64-1.txz:  Upgraded.
l/avahi-20240220_dffd549-x86_64-1.txz:  Added.
  It was either this, or drop (or fork) hplip. We'll enjoy it in the long run.
  Thanks to David Somero for the original build script, and to Robby Workman
  for years of maintenance.
  Signed-off-by: volkerdi
  Acked-by: alienBOB
l/libdaemon-0.14-x86_64-1.txz:  Added.
  This is needed by avahi.
l/pipewire-1.0.3-x86_64-5.txz:  Rebuilt.
  Recompiled against avahi.
l/pulseaudio-17.0-x86_64-3.txz:  Rebuilt.
  Recompiled against avahi.
n/NetworkManager-1.46.0-x86_64-1.txz:  Upgraded.
n/netatalk-3.1.18-x86_64-2.txz:  Rebuilt.
  Recompiled against avahi.
n/samba-4.19.5-x86_64-2.txz:  Rebuilt.
  Recompiled against avahi.
xap/pidgin-2.14.12-x86_64-3.txz:  Rebuilt.
  Recompiled against avahi.
xap/sane-1.2.1-x86_64-3.txz:  Rebuilt.
  Recompiled against avahi.
extra/bash-completion/bash-completion-2.12.0-noarch-1.txz:  Upgraded.

1 files changed, 3 insertions, 16 deletions

diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index 38247ba4f..9c0ed10ab 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for hplip
 
 # Copyright 2006-2010  Robby Workman, Northport, Alabama, USA
-# Copyright 2006-2021  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hplip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -86,12 +86,6 @@ zcat $CWD/hplip.python3.shebang.diff.gz | patch -p1 --verbose || exit 1
 # Fix the desktop file to show correct icon and category
 zcat $CWD/fix-desktop-file.patch.gz | patch -p1 --verbose || exit 1
 
-# Fix for deprecated python function:
-zcat $CWD/hplip.is_alive.diff.gz | patch -p1 --verbose || exit 1
-
-# Patch for Python 3.10:
-zcat $CWD/hplip.python3.10.diff.gz | patch -p1 --verbose || exit 1
-
 # Choose correct options depending on whether PAM is installed:
 if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
   unset SHADOW_OPTIONS
@@ -112,14 +106,6 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,' \
     prnt/filters/hpps \
     fax/filters/pstotiff
 
-# Forget it folks - this ImageProcessor closed-source blob is broken, and there
-# is no way to fix it. We will use this patch from Debian to remove it from
-# hplip, reverting to the way things worked in the 3.18.6 release. If HP ever
-# sees fit to make ImageProcessor mandatory, we'll likely stick with the last
-# hplip release that can be made to work without it, and any HP printers that
-# require a newer version of hplip will not be supported.
-zcat $CWD/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch.gz | patch -p1 -l --verbose || exit 1
-
 # Add a cups-2.2.x header since some definitions were moved:
 zcat $CWD/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch.gz | patch -p1 -l --verbose || exit 1
 
@@ -157,6 +143,7 @@ PYTHON=/usr/bin/python3 \
   --enable-foomatic-rip-hplip-install \
   --enable-pp-build \
   --disable-foomatic-ppd-install \
+  --disable-imageProcessor-build \
   --enable-foomatic-drv-install \
   --enable-network-build=yes \
   --enable-qt5 \