[packages/hplip] - updated to 3.25.8
qboosh
qboosh at pld-linux.org
Fri Dec 26 16:23:07 CET 2025
commit 609eed328020c2b236b91e52ecdb95005804651f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Dec 26 16:23:33 2025 +0100
- updated to 3.25.8
hplip-binary-fixup.patch | 58 ---------------------
hplip-pcardext-disable.patch | 17 -------
hplip.spec | 117 +++++++++++++++++++++----------------------
pld-distro.patch | 101 +++++++++++++++++++++++++++----------
4 files changed, 133 insertions(+), 160 deletions(-)
---
diff --git a/hplip.spec b/hplip.spec
index 22d0399..32b45ee 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -13,19 +13,15 @@
Summary: Hewlett-Packard Linux Imaging and Printing suite - printing and scanning using HP devices
Summary(pl.UTF-8): Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP
Name: hplip
-Version: 3.25.2
+Version: 3.25.8
Release: 1
License: BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest)
Group: Applications/System
-Source0: http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
-# Source0-md5: 1f49ef7d5c6f17f2dd753ddf54a67704
+Source0: https://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
+# Source0-md5: 105c8182489d71447113d7c37cb61be4
Patch0: %{name}-desktop.patch
Patch1: unresolved.patch
Patch2: pld-distro.patch
-# note: this patch adds support to fixing only certain binary plugins. Newer plugin
-# version have different md5 sums, different offsets, so handling new binaries need
-# to be added
-Patch3: %{name}-binary-fixup.patch
Patch4: %{name}-destdir.patch
Patch5: %{name}-udev-rules.patch
Patch7: remove-all-ImageProcessor-functionality.patch
@@ -34,10 +30,10 @@ Patch9: hplip-covscan.patch
Patch10: hplip-scan-hpaio-include.patch
Patch11: hplip-hpaio-gcc14.patch
Patch12: hplip-scan-orblite-c99.patch
-Patch13: hplip-pcardext-disable.patch
URL: http://hplipopensource.com/
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: avahi-devel
BuildRequires: cups-devel >= 1.2
BuildRequires: cups-ppdc >= 1.2
%{?with_dbus:BuildRequires: dbus-devel >= 1.0.0}
@@ -177,7 +173,6 @@ urządzenia HP AiO.
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
-#patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 7 -p1
@@ -186,7 +181,6 @@ urządzenia HP AiO.
%patch -P 10 -p1
%patch -P 11 -p1
%patch -P 12 -p1
-%patch -P 13 -p1
%{__sed} -i -e '1s,^#!/usr/bin/env python$,#!%{__python3},' *.py fax/filters/pstotiff prnt/filters/hpps
find base fax installer prnt scan ui ui4 -name '*.py' | xargs \
@@ -279,30 +273,31 @@ fi
%defattr(644,root,root,755)
%doc doc/*
%attr(755,root,root) %{_bindir}/hpijs
-%attr(755,root,root) %{_bindir}/hp-align
-%attr(755,root,root) %{_bindir}/hp-check
-%attr(755,root,root) %{_bindir}/hp-clean
-%attr(755,root,root) %{_bindir}/hp-colorcal
-%attr(755,root,root) %{_bindir}/hp-config_usb_printer
-%attr(755,root,root) %{_bindir}/hp-diagnose_plugin
-%attr(755,root,root) %{_bindir}/hp-diagnose_queues
-%attr(755,root,root) %{_bindir}/hp-firmware
-%attr(755,root,root) %{_bindir}/hp-doctor
-%attr(755,root,root) %{_bindir}/hp-info
-%attr(755,root,root) %{_bindir}/hp-levels
-%attr(755,root,root) %{_bindir}/hp-logcapture
-%attr(755,root,root) %{_bindir}/hp-makecopies
-%attr(755,root,root) %{_bindir}/hp-makeuri
-%attr(755,root,root) %{_bindir}/hp-pkservice
-%attr(755,root,root) %{_bindir}/hp-plugin
-%attr(755,root,root) %{_bindir}/hp-probe
-%attr(755,root,root) %{_bindir}/hp-query
-%attr(755,root,root) %{_bindir}/hp-scan
-%attr(755,root,root) %{_bindir}/hp-sendfax
-%attr(755,root,root) %{_bindir}/hp-setup
-%attr(755,root,root) %{_bindir}/hp-testpage
-%attr(755,root,root) %{_bindir}/hp-timedate
-%attr(755,root,root) %{_bindir}/hp-unload
+# symlinks
+%{_bindir}/hp-align
+%{_bindir}/hp-check
+%{_bindir}/hp-clean
+%{_bindir}/hp-colorcal
+%{_bindir}/hp-config_usb_printer
+%{_bindir}/hp-diagnose_plugin
+%{_bindir}/hp-diagnose_queues
+%{_bindir}/hp-firmware
+%{_bindir}/hp-doctor
+%{_bindir}/hp-info
+%{_bindir}/hp-levels
+%{_bindir}/hp-logcapture
+%{_bindir}/hp-makecopies
+%{_bindir}/hp-makeuri
+%{_bindir}/hp-pkservice
+%{_bindir}/hp-plugin
+%{_bindir}/hp-probe
+%{_bindir}/hp-query
+%{_bindir}/hp-scan
+%{_bindir}/hp-sendfax
+%{_bindir}/hp-setup
+%{_bindir}/hp-testpage
+%{_bindir}/hp-timedate
+%{_bindir}/hp-unload
%dir %{_datadir}/hplip
%{_datadir}/hplip/__init__.py
%dir %{_datadir}/hplip/copier
@@ -352,9 +347,10 @@ fi
%{_datadir}/hplip/scan
%attr(755,root,root) %{_datadir}/hplip/dat2drv
%attr(755,root,root) %{_datadir}/hplip/locatedriver
-%attr(755,root,root) %{py3_sitedir}/cupsext.so
-%attr(755,root,root) %{py3_sitedir}/hpmudext.so
-%attr(755,root,root) %{py3_sitedir}/scanext.so
+%{py3_sitedir}/cupsext.so
+%{py3_sitedir}/hpmudext.so
+%{py3_sitedir}/pcardext.so
+%{py3_sitedir}/scanext.so
%dir %{_sysconfdir}/hp
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hp/hplip.conf
/lib/udev/rules.d/56-hpmud.rules
@@ -364,16 +360,17 @@ fi
%files gui-tools
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/hp-devicesettings
-%attr(755,root,root) %{_bindir}/hp-fab
-%attr(755,root,root) %{_bindir}/hp-faxsetup
-%attr(755,root,root) %{_bindir}/hp-linefeedcal
-%attr(755,root,root) %{_bindir}/hp-pqdiag
-%attr(755,root,root) %{_bindir}/hp-print
-%attr(755,root,root) %{_bindir}/hp-printsettings
-%attr(755,root,root) %{_bindir}/hp-systray
-%attr(755,root,root) %{_bindir}/hp-toolbox
-%attr(755,root,root) %{_bindir}/hp-wificonfig
+# symlinks
+%{_bindir}/hp-devicesettings
+%{_bindir}/hp-fab
+%{_bindir}/hp-faxsetup
+%{_bindir}/hp-linefeedcal
+%{_bindir}/hp-pqdiag
+%{_bindir}/hp-print
+%{_bindir}/hp-printsettings
+%{_bindir}/hp-systray
+%{_bindir}/hp-toolbox
+%{_bindir}/hp-wificonfig
%attr(755,root,root) %{_datadir}/hplip/devicesettings.py
%attr(755,root,root) %{_datadir}/hplip/wificonfig.py
%attr(755,root,root) %{_datadir}/hplip/fab.py
@@ -393,23 +390,24 @@ fi
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libhpdiscovery.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhpdiscovery.so.0
-%attr(755,root,root) %{_libdir}/libhpip.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhpip.so.0
-%attr(755,root,root) %{_libdir}/libhpipp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhpipp.so.0
-%attr(755,root,root) %{_libdir}/libhpmud.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhpmud.so.0
+%{_libdir}/libhpdiscovery.so.*.*.*
+%ghost %{_libdir}/libhpdiscovery.so.0
+%{_libdir}/libhpip.so.*.*.*
+%ghost %{_libdir}/libhpip.so.0
+%{_libdir}/libhpipp.so.*.*.*
+%ghost %{_libdir}/libhpipp.so.0
+%{_libdir}/libhpmud.so.*.*.*
+%ghost %{_libdir}/libhpmud.so.0
%files sane
%defattr(644,root,root,755)
%doc scan/sane/hpaio.desc
-%attr(755,root,root) %{_bindir}/hp-uiscan
+# symlink
+%{_bindir}/hp-uiscan
+%{_libdir}/sane/libsane-hpaio.so.*.*.*
+%{_libdir}/sane/libsane-hpaio.so.1
%{_datadir}/applications/hp-uiscan.desktop
%{_datadir}/hplip/uiscan.py
-%attr(755,root,root) %{_libdir}/sane/libsane-hpaio.so.*.*.*
-%attr(755,root,root) %{_libdir}/sane/libsane-hpaio.so.1
%files ppd
%defattr(644,root,root,755)
@@ -422,7 +420,8 @@ fi
%files -n cups-backend-hp
%defattr(644,root,root,755)
%attr(755,root,root) %{cups_backenddir}/hp
-%attr(755,root,root) %{cups_filterdir}/foomatic-rip-hplip
+# symlink to foomatic-rip
+%{cups_filterdir}/foomatic-rip-hplip
%attr(755,root,root) %{cups_filterdir}/hpcups
%attr(755,root,root) %{cups_filterdir}/hpps
%{cups_datadir}/drv/hp
diff --git a/hplip-binary-fixup.patch b/hplip-binary-fixup.patch
deleted file mode 100644
index bb0a7d0..0000000
--- a/hplip-binary-fixup.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- hplip-3.11.10/base/pkit.py.org 2011-11-30 20:01:59.640469386 +0100
-+++ hplip-3.11.10/base/pkit.py 2011-11-30 20:06:43.216664960 +0100
-@@ -30,6 +30,11 @@
- import shutil
- import stat
-
-+try:
-+ from hashlib import md5 as md5
-+except ImportError:
-+ from md5 import md5
-+
- # Local
- from base.logger import *
- from base.g import *
-@@ -318,7 +323,32 @@
- log.debug("shutdown: %s" % str(e))
- return False
-
--
-+def binaryPatch(f):
-+ try:
-+ # file, md5sum, replace content at address with specified byte
-+ patches = { 'lj-x86_32.so' : { 'md5': '30bdf8c844508a53d80362f9eba670c5',
-+ # https://bugs.launchpad.net/hplip/+bug/666780
-+ 'replace' : [ (0xA068, 0x10) ] },
-+ 'lj-x86_64.so' : { 'md5': '28e1b2cde011cbbcd4b5c85c1866c893',
-+ # https://bugs.launchpad.net/hplip/+bug/666780
-+ 'replace' : [ (0xD0D0, 0x10) ] }
-+ }
-+ fs = os.path.basename(f)
-+ if fs in patches:
-+ d = open(f, 'rb').read()
-+ m = md5()
-+ m.update(d)
-+ m.digest()
-+ if patches[fs]['md5'] == m.hexdigest():
-+ file = open(f, 'rb+')
-+ for (addr, val) in patches[fs]['replace']:
-+ file.seek(addr)
-+ file.write(chr(val))
-+ file.close()
-+ except Exception, e:
-+ log.error("Could not patch binary `%s' for known issues." % str(e))
-+ return False
-+ return True
-
- def copyPluginFiles(src_dir):
- os.chdir(src_dir)
-@@ -411,6 +441,9 @@
- continue
-
- else:
-+
-+ binaryPatch(trg)
-+
- if not os.path.exists(trg):
- log.error("Target file %s does not exist. File copy failed." % trg)
- continue
diff --git a/hplip-pcardext-disable.patch b/hplip-pcardext-disable.patch
deleted file mode 100644
index 342c4d3..0000000
--- a/hplip-pcardext-disable.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up hplip-3.25.2/Makefile.am.pcardext-disable hplip-3.25.2/Makefile.am
---- hplip-3.25.2/Makefile.am.pcardext-disable 2025-04-11 10:23:29.576593786 +0200
-+++ hplip-3.25.2/Makefile.am 2025-04-11 10:24:08.259842784 +0200
-@@ -306,13 +306,6 @@ if !HPLIP_CLASS_DRIVER
- pcarddir = $(hplipdir)/pcard
- dist_pcard_DATA = pcard/__init__.py pcard/photocard.py
-
--# pcardext
--pcardextdir = $(PYTHONEXECDIR)
--pcardext_LTLIBRARIES = pcardext.la
--pcardext_la_LDFLAGS = -module -avoid-version
--pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c pcard/pcardext/pcardext.h
--pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
--
- # prnt
- prntdir = $(hplipdir)/prnt
- dist_prnt_DATA = prnt/cups.py prnt/__init__.py prnt/ldl.py prnt/pcl.py prnt/colorcal.py
diff --git a/pld-distro.patch b/pld-distro.patch
index 60aea2f..0501ded 100644
--- a/pld-distro.patch
+++ b/pld-distro.patch
@@ -1,18 +1,18 @@
---- hplip-3.22.6/installer/distros.dat.orig 2022-07-10 22:48:06.595991488 +0200
-+++ hplip-3.22.6/installer/distros.dat 2022-07-10 22:49:19.547691691 +0200
-@@ -94,7 +94,7 @@
+--- hplip-3.25.8/installer/distros.dat.orig 2025-12-25 22:55:49.746392491 +0100
++++ hplip-3.25.8/installer/distros.dat 2025-12-26 14:39:52.039534849 +0100
+@@ -93,7 +93,7 @@
# ****************************************
[distros]
--distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,zorin,mxlinux,elementary
-+distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,zorin,mxlinux,elementary,pld
+-distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,zorin,mxlinux,elementary,almalinux
++distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,zorin,mxlinux,elementary,almalinux,pld
# ****************************************
-@@ -19541,3 +19541,130 @@
- same_as_version=6.1
+@@ -20407,3 +20407,179 @@ same_as_version=9.5
# ****************************************
+
+
+[pld]
+index=60
@@ -42,6 +42,7 @@
+network_supported=1
+parallel_supported=1
+usb_supported=1
++libusb01=0
+packaged_version=
+release_date=
+notes=
@@ -50,21 +51,33 @@
+ppd_dir=/usr/share/cups/model
+fix_ppd_symlink=0
+drv_dir=/usr/lib/cups/driver
-+ui_toolkit=qt4
++ui_toolkit=qt5
+native_cups=1
+
+[pld:3:cups]
+packages=cups,cups-client
+
++[pld:3:cups-ddk
++packages=cups
++
+[pld:3:cups-devel]
+packages=cups-devel
+
++[pld:3:cups-image]
++packages=cups-image-lib
++
++[pld:3:dbus]
++packages=dbus-devel
++
+[pld:3:gcc]
+packages=gcc,gcc-c++
+
+[pld:3:gs]
+packages=ghostscript
+
++[pld:3:libavahi-dev]
++packages=avahi-devel
++
+[pld:3:libcrypto]
+packages=openssl-devel
+
@@ -75,7 +88,7 @@
+packages=net-snmp-devel
+
+[pld:3:libpthread]
-+packages=glibc-headers
++packages=glibc-devel
+
+[pld:3:libtool]
+packages=libtool
@@ -86,8 +99,11 @@
+[pld:3:make]
+packages=make
+
++[pld:3:network]
++packages=wget
++
+[pld:3:pil]
-+packages=python-PIL
++packages=python-pillow
+
+[pld:3:ppdev]
+packages=
@@ -96,24 +112,66 @@
+[pld:3:pyqt]
+packages=python-PyQt
+
-+[pld:3:python-devel]
-+packages=python-devel
-+
+[pld:3:pyqt4]
+packages=python-PyQt4
+
+[pld:3:pyqt4-dbus]
-+packages=python-dbus
++packages=python-PyQt4
+
-+[pld:3:python23]
-+packages=python
++[pld:3:pyqt5]
++packages=python-PyQt5
++
++[pld:3:pyqt5-dbus]
++packages=python-PyQt5
+
+[pld:3:python2X]
+packages=python
+
++[pld:3:python-dbus]
++packages=python-dbus,python-pygobject
++
++[pld:3:python-devel]
++packages=python-devel
++
++[pld:3:python-xml]
++packages=python-modules
++
+[pld:3:reportlab]
+packages=python-ReportLab
+
++[pld:3:python3X]
++packages=python3
++
++[pld:3:python3-dbus]
++packages=python3-dbus
++
++[pld:3:python3-devel]
++packages=python3-devel
++
++[pld:3:python3-notify2]
++packages=python3-notify2
++
++[pld:3:python3-pil]
++packages=python3-pillow]
++
++[pld:3:python3-pyqt4]
++packages=python3-PyQt4
++
++[pld:3:python3-pyqt4-dbus]
++packages=python3-PyQt4
++
++[pld:3:python3-pyqt5]
++packages=python3-PyQt5
++
++[pld:3:python3-pyqt5-dbus]
++packages=python3-PyQt5
++
++[pld:3:python3-reportlab]
++packages=python3-reportlab]
++
++[pld:3:python3-xml]
++packages=python3-modules
++
+[pld:3:sane]
+packages=sane-backends
+
@@ -126,17 +184,8 @@
+[pld:3:xsane]
+packages=xsane
+
-+[pld:3:python-dbus]
-+packages=python-dbus,python-pygobject
-+
-+[pld:3:dbus]
-+packages=dbus-devel
-+
-+[pld:3:cups-image]
-+packages=cups-devel
-+
+[pld:3:python-notify]
-+packages=python-notify
++packages=python-notify2
+
+[pld:3:policykit]
+packages=polkit,polkit-gnome
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hplip.git/commitdiff/609eed328020c2b236b91e52ecdb95005804651f
More information about the pld-cvs-commit
mailing list