|
@@ -2,7 +2,7 @@
|
|
Summary: HP printer drivers & utilities for Linux
|
|
Summary: HP printer drivers & utilities for Linux
|
|
Summary(ja): HP プリンタの Linux 向けドライバとユーティリティ
|
|
Summary(ja): HP プリンタの Linux 向けドライバとユーティリティ
|
|
Name: hplip
|
|
Name: hplip
|
|
-Version: 3.21.10
|
|
|
|
|
|
+Version: 3.22.6
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
Group: publishing
|
|
Group: publishing
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
@@ -20,6 +20,7 @@ Source3: %{name}.metainfo.xml
|
|
Source4: hp-laserjet_cp_1025nw.ppd.gz
|
|
Source4: hp-laserjet_cp_1025nw.ppd.gz
|
|
Source5: hp-laserjet_professional_p_1102w.ppd.gz
|
|
Source5: hp-laserjet_professional_p_1102w.ppd.gz
|
|
Source6: hplip-repack.sh
|
|
Source6: hplip-repack.sh
|
|
|
|
+Source7: hp-plugin.in
|
|
|
|
|
|
Source1000: hplip.desktop.vine
|
|
Source1000: hplip.desktop.vine
|
|
|
|
|
|
@@ -41,45 +42,45 @@ Patch15: hplip-ppd-ImageableArea.patch
|
|
Patch16: hplip-scan-tmp.patch
|
|
Patch16: hplip-scan-tmp.patch
|
|
Patch17: hplip-log-stderr.patch
|
|
Patch17: hplip-log-stderr.patch
|
|
Patch18: hplip-avahi-parsing.patch
|
|
Patch18: hplip-avahi-parsing.patch
|
|
-Patch20: hplip-dj990c-margin.patch
|
|
|
|
-Patch21: hplip-strncpy.patch
|
|
|
|
-Patch22: hplip-no-write-bytecode.patch
|
|
|
|
-Patch23: hplip-silence-ioerror.patch
|
|
|
|
-Patch24: hplip-3165-sourceoption.patch
|
|
|
|
-Patch25: hplip-noernie.patch
|
|
|
|
-Patch26: hplip-appdata.patch
|
|
|
|
-Patch27: hplip-check-cups.patch
|
|
|
|
-Patch30: hplip-typo.patch
|
|
|
|
|
|
+Patch19: hplip-dj990c-margin.patch
|
|
|
|
+Patch20: hplip-strncpy.patch
|
|
|
|
+Patch21: hplip-no-write-bytecode.patch
|
|
|
|
+Patch22: hplip-silence-ioerror.patch
|
|
|
|
+Patch23: hplip-sourceoption.patch
|
|
|
|
+Patch24: hplip-noernie.patch
|
|
|
|
+Patch25: hplip-appdata.patch
|
|
|
|
+Patch26: hplip-check-cups.patch
|
|
|
|
+Patch27: hplip-typo.patch
|
|
# python3 - recent HP release removed encoding/decoding to utf-8 in fax/pmlfax.py -
|
|
# python3 - recent HP release removed encoding/decoding to utf-8 in fax/pmlfax.py -
|
|
# that results in text string going into translate function in base/utils.py, which
|
|
# that results in text string going into translate function in base/utils.py, which
|
|
# expects binary string because of parameters. Remove this patch if base/utils.py
|
|
# expects binary string because of parameters. Remove this patch if base/utils.py
|
|
# code gets fixed.
|
|
# code gets fixed.
|
|
-Patch31: hplip-use-binary-str.patch
|
|
|
|
|
|
+Patch28: hplip-use-binary-str.patch
|
|
# m278-m281 doesn't work correctly again
|
|
# m278-m281 doesn't work correctly again
|
|
-Patch32: hplip-error-print.patch
|
|
|
|
-Patch33: hplip-hpfax-importerror-print.patch
|
|
|
|
-Patch34: hplip-wifisetup.patch
|
|
|
|
|
|
+Patch29: hplip-error-print.patch
|
|
|
|
+Patch30: hplip-hpfax-importerror-print.patch
|
|
|
|
+Patch31: hplip-wifisetup.patch
|
|
# pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers
|
|
# pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers
|
|
# to choose (Bz#1641100, launchpad#1799212)
|
|
# to choose (Bz#1641100, launchpad#1799212)
|
|
-Patch35: hplip-keyserver.patch
|
|
|
|
|
|
+Patch32: hplip-keyserver.patch
|
|
# QMessagebox call was copy-pasted from Qt4 version, but Qt5 has different arguments,
|
|
# QMessagebox call was copy-pasted from Qt4 version, but Qt5 has different arguments,
|
|
# This patch solves most of them
|
|
# This patch solves most of them
|
|
-Patch36: 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch
|
|
|
|
|
|
+Patch33: 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch
|
|
# HP upstream introduced new binary blob, which is not open-source, so it violates
|
|
# HP upstream introduced new binary blob, which is not open-source, so it violates
|
|
# FPG by two ways - shipping binary blob and non open source code - so it needs to be removed.
|
|
# FPG by two ways - shipping binary blob and non open source code - so it needs to be removed.
|
|
# Patch is taken from Debian.
|
|
# Patch is taken from Debian.
|
|
-#Patch37: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
|
|
|
|
|
|
+Patch34: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
|
|
# In hplip-3.18.10 some parts of UI code was commented out, which leaved hp-toolbox
|
|
# In hplip-3.18.10 some parts of UI code was commented out, which leaved hp-toolbox
|
|
# unusable (crashed on the start). The patch removes usages of variables, which were
|
|
# unusable (crashed on the start). The patch removes usages of variables, which were
|
|
# commented out.
|
|
# commented out.
|
|
# The patch is taken from Debian.
|
|
# The patch is taken from Debian.
|
|
-Patch38: 0027-Fixed-incomplete-removal-of-hp-toolbox-features-whic.patch
|
|
|
|
|
|
+Patch35: 0027-Fixed-incomplete-removal-of-hp-toolbox-features-whic.patch
|
|
# hp-setup crashed when user wanted to define a path to PPD file. It was due
|
|
# hp-setup crashed when user wanted to define a path to PPD file. It was due
|
|
# byte + string variables incompatibility and it is fixed by decoding the
|
|
# byte + string variables incompatibility and it is fixed by decoding the
|
|
# bytes-like variable
|
|
# bytes-like variable
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1814272
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1814272
|
|
-Patch39: hplip-add-ppd-crash.patch
|
|
|
|
|
|
+Patch36: hplip-add-ppd-crash.patch
|
|
# external scripts, which are downloaded and run by hp-plugin, try to create links
|
|
# external scripts, which are downloaded and run by hp-plugin, try to create links
|
|
# in non-existing dirs. These scripts ignore errors, so plugin is installed fine
|
|
# in non-existing dirs. These scripts ignore errors, so plugin is installed fine
|
|
# but then internal hp-plugin can check for plugin state, where links are checked too.
|
|
# but then internal hp-plugin can check for plugin state, where links are checked too.
|
|
@@ -88,67 +89,67 @@ Patch39: hplip-add-ppd-crash.patch
|
|
# because their external scripts try to create links in non-existing dirs.
|
|
# because their external scripts try to create links in non-existing dirs.
|
|
# Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
|
|
# Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
|
|
# Reported upstream: https://bugs.launchpad.net/hplip/+bug/1814574
|
|
# Reported upstream: https://bugs.launchpad.net/hplip/+bug/1814574
|
|
-Patch40: hplip-missing-links.patch
|
|
|
|
|
|
+Patch37: hplip-missing-links.patch
|
|
# change in 3.18.9 in scanext.c caused broken scanning for HP LaserJet 3052. Since I cannot figure
|
|
# change in 3.18.9 in scanext.c caused broken scanning for HP LaserJet 3052. Since I cannot figure
|
|
# it out what author wanted by the change (it sets option number 9 to true, but different handles
|
|
# it out what author wanted by the change (it sets option number 9 to true, but different handles
|
|
# have different options, so I'm not sure what author wanted to set).
|
|
# have different options, so I'm not sure what author wanted to set).
|
|
# Remove the change for now, it works for user and me.
|
|
# Remove the change for now, it works for user and me.
|
|
-Patch41: hplip-hplj-3052.patch
|
|
|
|
|
|
+Patch38: hplip-hplj-3052.patch
|
|
# hpmud parses mdns txt record badly
|
|
# hpmud parses mdns txt record badly
|
|
# upstream tickets: https://bugs.launchpad.net/hplip/+bug/1797501
|
|
# upstream tickets: https://bugs.launchpad.net/hplip/+bug/1797501
|
|
# https://bugs.launchpad.net/hplip/+bug/1817214
|
|
# https://bugs.launchpad.net/hplip/+bug/1817214
|
|
# https://bugs.launchpad.net/hplip/+bug/1821932
|
|
# https://bugs.launchpad.net/hplip/+bug/1821932
|
|
# with no response from upstream
|
|
# with no response from upstream
|
|
# Patch taken from Debian https://lists.debian.org/debian-printing/2018/11/msg00049.html
|
|
# Patch taken from Debian https://lists.debian.org/debian-printing/2018/11/msg00049.html
|
|
-Patch42: hplip-hpmud-string-parse.patch
|
|
|
|
|
|
+Patch39: hplip-hpmud-string-parse.patch
|
|
# Part of https://bugzilla.redhat.com/show_bug.cgi?id=1694663
|
|
# Part of https://bugzilla.redhat.com/show_bug.cgi?id=1694663
|
|
# It was found out that specific device needs plugin for scanning
|
|
# It was found out that specific device needs plugin for scanning
|
|
# Reported upstream as https://bugs.launchpad.net/hplip/+bug/1822762
|
|
# Reported upstream as https://bugs.launchpad.net/hplip/+bug/1822762
|
|
-Patch43: hplip-m278-m281-needs-plugin.patch
|
|
|
|
|
|
+Patch40: hplip-m278-m281-needs-plugin.patch
|
|
# hpcups crashes when a printer needs a plugin and does not have one installed
|
|
# hpcups crashes when a printer needs a plugin and does not have one installed
|
|
# it crashes in destructor, because pointer is not initialized
|
|
# it crashes in destructor, because pointer is not initialized
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
|
|
# reported upstream
|
|
# reported upstream
|
|
-Patch44: hplip-hpcups-crash.patch
|
|
|
|
|
|
+Patch41: hplip-hpcups-crash.patch
|
|
# Fixing the issues found by coverity scan
|
|
# Fixing the issues found by coverity scan
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1808145
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1808145
|
|
-Patch45: hplip-covscan.patch
|
|
|
|
|
|
+Patch42: hplip-covscan.patch
|
|
# Segfault during logging to syslog because argument are switched
|
|
# Segfault during logging to syslog because argument are switched
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1727162
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1727162
|
|
# upstream https://bugs.launchpad.net/hplip/+bug/1837846
|
|
# upstream https://bugs.launchpad.net/hplip/+bug/1837846
|
|
-Patch46: hplip-logging-segfault.patch
|
|
|
|
|
|
+Patch43: hplip-logging-segfault.patch
|
|
# Traceback in hp-systray when there are no resource
|
|
# Traceback in hp-systray when there are no resource
|
|
# wanted to report upstream, but launchpad ends with timeout error
|
|
# wanted to report upstream, but launchpad ends with timeout error
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1738321
|
|
# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1738321
|
|
-Patch47: hplip-systray-blockerror.patch
|
|
|
|
|
|
+Patch44: hplip-systray-blockerror.patch
|
|
# several printers were removed in 3.19.1, but actually someone still uses them
|
|
# several printers were removed in 3.19.1, but actually someone still uses them
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
|
|
# bugzillas 1742949, 1740132, 1739855
|
|
# bugzillas 1742949, 1740132, 1739855
|
|
-Patch48: hplip-missing-drivers.patch
|
|
|
|
|
|
+Patch45: hplip-missing-drivers.patch
|
|
# laserjet 2200 and other devices have different device id than HP expects...
|
|
# laserjet 2200 and other devices have different device id than HP expects...
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1772698
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1772698
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1853002
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1853002
|
|
-Patch49: hplip-model-mismatch.patch
|
|
|
|
|
|
+Patch46: hplip-model-mismatch.patch
|
|
# sixext has problems with python3 strings (bz#1573430)
|
|
# sixext has problems with python3 strings (bz#1573430)
|
|
# reported https://bugs.launchpad.net/bugs/1480152
|
|
# reported https://bugs.launchpad.net/bugs/1480152
|
|
-Patch50: hplip-unicodeerror.patch
|
|
|
|
|
|
+Patch47: hplip-unicodeerror.patch
|
|
# error with new gcc, already reported in upstream as
|
|
# error with new gcc, already reported in upstream as
|
|
# https://bugs.launchpad.net/hplip/+bug/1836735
|
|
# https://bugs.launchpad.net/hplip/+bug/1836735
|
|
-Patch51: hplip-fix-Wreturn-type-warning.patch
|
|
|
|
|
|
+Patch48: hplip-fix-Wreturn-type-warning.patch
|
|
# upstream check for python clears OS build system
|
|
# upstream check for python clears OS build system
|
|
# CFLAGS
|
|
# CFLAGS
|
|
# https://bugs.launchpad.net/hplip/+bug/1879445
|
|
# https://bugs.launchpad.net/hplip/+bug/1879445
|
|
-Patch52: hplip-configure-python.patch
|
|
|
|
|
|
+Patch49: hplip-configure-python.patch
|
|
# taken from hplip upstream report - toolbox uses deprecated method
|
|
# taken from hplip upstream report - toolbox uses deprecated method
|
|
# setMargin(), which generates an exception, resulting in a infinite loop
|
|
# setMargin(), which generates an exception, resulting in a infinite loop
|
|
# of request on cupsd
|
|
# of request on cupsd
|
|
# https://bugs.launchpad.net/hplip/+bug/1880275
|
|
# https://bugs.launchpad.net/hplip/+bug/1880275
|
|
-Patch53: hplip-dialog-infinite-loop.patch
|
|
|
|
|
|
+Patch50: hplip-dialog-infinite-loop.patch
|
|
# searching algorithm did not expect '-' in model name and thought it is a new PDL
|
|
# searching algorithm did not expect '-' in model name and thought it is a new PDL
|
|
# it resulted in incorrect PPD match, so e.g. hpijs driver was used instead of hpcups
|
|
# it resulted in incorrect PPD match, so e.g. hpijs driver was used instead of hpcups
|
|
# bug: https://bugzilla.redhat.com/show_bug.cgi?id=1590014
|
|
# bug: https://bugzilla.redhat.com/show_bug.cgi?id=1590014
|
|
# reported upstream: https://bugs.launchpad.net/hplip/+bug/1881587
|
|
# reported upstream: https://bugs.launchpad.net/hplip/+bug/1881587
|
|
-Patch54: hplip-find-driver.patch
|
|
|
|
|
|
+Patch51: hplip-find-driver.patch
|
|
# hp-clean didn't work for Photosmart C1410 because it was comparing
|
|
# hp-clean didn't work for Photosmart C1410 because it was comparing
|
|
# string length with buffer size for string object, which is different,
|
|
# string length with buffer size for string object, which is different,
|
|
# causing cleaning to fail - the fix is to make the object bytes-like,
|
|
# causing cleaning to fail - the fix is to make the object bytes-like,
|
|
@@ -157,55 +158,46 @@ Patch54: hplip-find-driver.patch
|
|
# for the device, but there can be similar issues with other devices
|
|
# for the device, but there can be similar issues with other devices
|
|
# bug https://bugzilla.redhat.com/show_bug.cgi?id=1833308
|
|
# bug https://bugzilla.redhat.com/show_bug.cgi?id=1833308
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1882193
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1882193
|
|
-Patch55: hplip-clean-ldl.patch
|
|
|
|
|
|
+Patch52: hplip-clean-ldl.patch
|
|
# 3.20.6 turned off requirement for most devices which needed it
|
|
# 3.20.6 turned off requirement for most devices which needed it
|
|
# - it will cause malfunction of printing and scanning for them
|
|
# - it will cause malfunction of printing and scanning for them
|
|
# https://bugs.launchpad.net/hplip/+bug/1883898
|
|
# https://bugs.launchpad.net/hplip/+bug/1883898
|
|
-Patch56: hplip-revert-plugins.patch
|
|
|
|
-# python3.9 removes threading.Thread.isAlive() and it is substituted
|
|
|
|
-# by threading.Thread.is_alive()
|
|
|
|
-# https://bugzilla.redhat.com/show_bug.cgi?id=1861055
|
|
|
|
-# reported upstream https://bugs.launchpad.net/fedora/+bug/1889280
|
|
|
|
-#Patch57: hplip-thread-isalive-removed.patch
|
|
|
|
-# glibc moved timeb.h into compat package and it will be removed in the future
|
|
|
|
-# the code doesn't use anything from timeb.h, so it is safe to remove it
|
|
|
|
-# reported upstream https://bugs.launchpad.net/hplip/+bug/1900977
|
|
|
|
-#Patch58: hplip-timeb-removed.patch
|
|
|
|
|
|
+Patch53: hplip-revert-plugins.patch
|
|
# non-sudoers cannot authenticate
|
|
# non-sudoers cannot authenticate
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1904888
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1904888
|
|
-Patch59: hplip-check-userperms.patch
|
|
|
|
|
|
+Patch54: hplip-check-userperms.patch
|
|
# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly
|
|
# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly
|
|
# getOpenFileName returns a tuple, but hp-fab expects a simple variable
|
|
# getOpenFileName returns a tuple, but hp-fab expects a simple variable
|
|
# reported upstream as https://bugs.launchpad.net/hplip/+bug/1914743
|
|
# reported upstream as https://bugs.launchpad.net/hplip/+bug/1914743
|
|
-Patch60: hplip-fab-import.patch
|
|
|
|
|
|
+Patch55: hplip-fab-import.patch
|
|
# if an user tries to install scanner via hp-setup (printer/fax utility)
|
|
# if an user tries to install scanner via hp-setup (printer/fax utility)
|
|
# it fails further down - break out earlier with a message
|
|
# it fails further down - break out earlier with a message
|
|
# reported upstream as https://bugs.launchpad.net/hplip/+bug/1916114
|
|
# reported upstream as https://bugs.launchpad.net/hplip/+bug/1916114
|
|
-Patch61: hplip-hpsetup-noscanjets.patch
|
|
|
|
-# 1951922 - hp-systray doesn't support a valid --qt5 option
|
|
|
|
-# reported upstream https://bugs.launchpad.net/hplip/+bug/1925480
|
|
|
|
-Patch62: hplip-systray-qt5.patch
|
|
|
|
|
|
+Patch56: hplip-hpsetup-noscanjets.patch
|
|
# 1963114 - patch for hplip firmware load timeout fix
|
|
# 1963114 - patch for hplip firmware load timeout fix
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1922404
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1922404
|
|
-Patch63: hplip-hpfirmware-timeout.patch
|
|
|
|
-# 1976465 - [hplip] PY_SSIZE_T_CLEAN macro must be defined for '#' formats
|
|
|
|
-# reported upstream https://bugs.launchpad.net/hplip/+bug/1933973
|
|
|
|
-Patch64: hplip-pyssizet_clean.patch
|
|
|
|
|
|
+Patch57: hplip-hpfirmware-timeout.patch
|
|
# 1985251 - Incorrect permission for gpg directory
|
|
# 1985251 - Incorrect permission for gpg directory
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1938442
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1938442
|
|
-Patch65: hplip-gpgdir-perms.patch
|
|
|
|
|
|
+Patch58: hplip-gpgdir-perms.patch
|
|
# 1987141 - hp-plugin installs malformed udev files
|
|
# 1987141 - hp-plugin installs malformed udev files
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1847477
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1847477
|
|
-Patch66: hplip-plugin-udevissues.patch
|
|
|
|
|
|
+Patch59: hplip-plugin-udevissues.patch
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1938504
|
|
# reported upstream https://bugs.launchpad.net/hplip/+bug/1938504
|
|
-Patch67: hplip-osname-mismatch.patch
|
|
|
|
-# 2015428 - python3.10 has Callable in collections.abc
|
|
|
|
-# reported as https://bugs.launchpad.net/hplip/+bug/1948801
|
|
|
|
-Patch68: hplip-py310-collections-abc.patch
|
|
|
|
-# 2015428 - python3.10 doesn't do an implicit conversion when passing decimals
|
|
|
|
-# fractions and others to an integer argument
|
|
|
|
-# reported as https://bugs.launchpad.net/hplip/+bug/1948801
|
|
|
|
-Patch69: hplip-qt5-convert2int.patch
|
|
|
|
|
|
+Patch60: hplip-osname-mismatch.patch
|
|
|
|
+# 2080235 - Misleading errors about missing shared libraries when scanning
|
|
|
|
+# downstream patch to prevent errors:
|
|
|
|
+# - when loading libhpmud.so - unversioned .so files belong into devel packages,
|
|
|
|
+# but dlopen() in hplip was set to load the unversioned .so - so to remove rpmlint
|
|
|
|
+# error (when libhpmud.so is in non-devel package) and prevent runtime dependency on -devel
|
|
|
|
+# package (if libhpmud.so had been moved to -devel) the dlopen on unversioned .so file was
|
|
|
|
+# removed
|
|
|
|
+# - /lib64/libm.so is not symlink but ld script, which cannot be used in dlopen()
|
|
|
|
+Patch61: hplip-no-libhpmud-libm-warnings.patch
|
|
|
|
+# hplip 3.22.6 doesn't use the correct arguments for snprintf
|
|
|
|
+# reported as https://bugs.launchpad.net/hplip/+bug/1982185
|
|
|
|
+Patch62: hplip-snprintf-format.patch
|
|
|
|
+Patch63: hplip-plugin-script.patch
|
|
|
|
|
|
# Vine Patches
|
|
# Vine Patches
|
|
Patch70: hplip-drop-imageProcessor.patch
|
|
Patch70: hplip-drop-imageProcessor.patch
|
|
@@ -399,131 +391,122 @@ done
|
|
%patch18 -p1 -b .parsing
|
|
%patch18 -p1 -b .parsing
|
|
|
|
|
|
# Fixed left/right margins for HP DeskJet 990C (LP #1405212).
|
|
# Fixed left/right margins for HP DeskJet 990C (LP #1405212).
|
|
-%patch20 -p1 -b .dj990c-margin
|
|
|
|
|
|
+%patch19 -p1 -b .dj990c-margin
|
|
|
|
|
|
# Fixed uses of strncpy throughout.
|
|
# Fixed uses of strncpy throughout.
|
|
-%patch21 -p1 -b .strncpy
|
|
|
|
|
|
+%patch20 -p1 -b .strncpy
|
|
|
|
|
|
# Don't try to write bytecode cache for hpfax backend (bug #1192761)
|
|
# Don't try to write bytecode cache for hpfax backend (bug #1192761)
|
|
# or hp-config_usb_printer (bug #1266903)
|
|
# or hp-config_usb_printer (bug #1266903)
|
|
# or hpps filter (bug #1241548).
|
|
# or hpps filter (bug #1241548).
|
|
-%patch22 -p1 -b .no-write-bytecode
|
|
|
|
|
|
+%patch21 -p1 -b .no-write-bytecode
|
|
|
|
|
|
# Ignore IOError when logging output (bug #712537).
|
|
# Ignore IOError when logging output (bug #712537).
|
|
-%patch23 -p1 -b .silence-ioerror
|
|
|
|
|
|
+%patch22 -p1 -b .silence-ioerror
|
|
|
|
|
|
# [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
|
|
# [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
|
|
-%patch24 -p1 -b .sourceoption
|
|
|
|
|
|
+%patch23 -p1 -b .sourceoption
|
|
|
|
|
|
# hplip license problem (bug #1364711)
|
|
# hplip license problem (bug #1364711)
|
|
-%patch25 -p1 -b .no-ernie
|
|
|
|
|
|
+%patch24 -p1 -b .no-ernie
|
|
|
|
|
|
# hplip appdata
|
|
# hplip appdata
|
|
-%patch26 -p1 -b .appdata
|
|
|
|
|
|
+%patch25 -p1 -b .appdata
|
|
|
|
|
|
# hp-check shows 'CUPS incompatible or not running' even if CUPS is running (bug #1456467)
|
|
# hp-check shows 'CUPS incompatible or not running' even if CUPS is running (bug #1456467)
|
|
-%patch27 -p1 -b .check-cups
|
|
|
|
|
|
+%patch26 -p1 -b .check-cups
|
|
|
|
|
|
# hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined (bug #1533869)
|
|
# hp-firmware:NameError: name 'INTERACTIVE_MODE4' is not defined (bug #1533869)
|
|
-%patch30 -p1 -b .typo
|
|
|
|
|
|
+%patch27 -p1 -b .typo
|
|
|
|
|
|
-%patch31 -p1 -b .use-binary-str
|
|
|
|
|
|
+%patch28 -p1 -b .use-binary-str
|
|
|
|
|
|
# TypeError: 'Error' object does not support indexing (bug #1564770)
|
|
# TypeError: 'Error' object does not support indexing (bug #1564770)
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
|
|
# in python2 it was possible to acces Exception message by index [0].
|
|
# in python2 it was possible to acces Exception message by index [0].
|
|
# in python3 this is no longer possible and it causes TypeError.
|
|
# in python3 this is no longer possible and it causes TypeError.
|
|
-%patch32 -p1 -b .error-print-fix
|
|
|
|
|
|
+%patch29 -p1 -b .error-print-fix
|
|
|
|
|
|
# TypeError: not all arguments converted during string formatting (bug #1566938)
|
|
# TypeError: not all arguments converted during string formatting (bug #1566938)
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
|
|
# bug caused by more arguments than argument specifiers in formatted string
|
|
# bug caused by more arguments than argument specifiers in formatted string
|
|
-%patch33 -p1 -b .hpfax-import-error-print
|
|
|
|
|
|
+%patch30 -p1 -b .hpfax-import-error-print
|
|
|
|
|
|
# 'WifiSetupDialog' object has no attribute 'wifiobj' (bug #1626877)
|
|
# 'WifiSetupDialog' object has no attribute 'wifiobj' (bug #1626877)
|
|
# upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
|
|
# upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
|
|
# bug caused by typo in wifisetupdialog wifiObj property call
|
|
# bug caused by typo in wifisetupdialog wifiObj property call
|
|
-%patch34 -p1 -b .wifisetup-bad-call-fix
|
|
|
|
|
|
+%patch31 -p1 -b .wifisetup-bad-call-fix
|
|
|
|
|
|
# have pool of keyservers to choose
|
|
# have pool of keyservers to choose
|
|
-%patch35 -p1 -b .keyserver
|
|
|
|
|
|
+%patch32 -p1 -b .keyserver
|
|
|
|
|
|
# TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
|
|
# TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
|
|
# upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
|
|
# bug caused by typo in QMessageBox constructor call
|
|
# bug caused by typo in QMessageBox constructor call
|
|
# this patch fixes more of those typos - some fixed by tkorbar, some taken from ubuntu fix
|
|
# this patch fixes more of those typos - some fixed by tkorbar, some taken from ubuntu fix
|
|
-%patch36 -p1 -b .qmsgbox-typos-fix
|
|
|
|
|
|
+%patch33 -p1 -b .qmsgbox-typos-fix
|
|
|
|
|
|
# removal of non open source code, taken from ubuntu
|
|
# removal of non open source code, taken from ubuntu
|
|
-#patch37 -p1 -b .libimageprocessor-removal
|
|
|
|
|
|
+%patch34 -p1 -b .libimageprocessor-removal
|
|
|
|
|
|
-%__rm prnt/hpcups/libImageProcessor-x86*
|
|
|
|
|
|
+rm prnt/hpcups/libImageProcessor-x86*
|
|
|
|
|
|
-%patch38 -p1 -b .toolbox-crash
|
|
|
|
|
|
+%patch35 -p1 -b .toolbox-crash
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
|
|
-%patch39 -p1 -b .add-ppd-crash
|
|
|
|
|
|
+%patch36 -p1 -b .add-ppd-crash
|
|
# 1671513 - after 'successful' plugin installation it is not installed
|
|
# 1671513 - after 'successful' plugin installation it is not installed
|
|
-%patch40 -p1 -b .missing-links
|
|
|
|
|
|
+%patch37 -p1 -b .missing-links
|
|
# 1684434 - Scanning broken for HP LaserJet 3052
|
|
# 1684434 - Scanning broken for HP LaserJet 3052
|
|
-%patch41 -p1 -b .hp-laserjet-3052-broken-scanning
|
|
|
|
|
|
+%patch38 -p1 -b .hp-laserjet-3052-broken-scanning
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 1)
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 1)
|
|
-%patch42 -p1 -b .hpmud-string-parse
|
|
|
|
|
|
+%patch39 -p1 -b .hpmud-string-parse
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 2)
|
|
# 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 2)
|
|
-%patch43 -p1 -b .m278-m281-needs-plugin
|
|
|
|
|
|
+%patch40 -p1 -b .m278-m281-needs-plugin
|
|
# 1695716 - hpcups crashes in Compressor destructor
|
|
# 1695716 - hpcups crashes in Compressor destructor
|
|
-%patch44 -p1 -b .hpcups-crash
|
|
|
|
|
|
+%patch41 -p1 -b .hpcups-crash
|
|
# fixing issues found by coverity scan
|
|
# fixing issues found by coverity scan
|
|
-%patch45 -p1 -b .covscan
|
|
|
|
|
|
+%patch42 -p1 -b .covscan
|
|
# segfault during logging (1727162)
|
|
# segfault during logging (1727162)
|
|
-%patch46 -p1 -b .logging-segfault
|
|
|
|
|
|
+%patch43 -p1 -b .logging-segfault
|
|
# 1738321 - [abrt] hp-systray:BlockingIOError: [Errno 11] Resource temporarily unavailable
|
|
# 1738321 - [abrt] hp-systray:BlockingIOError: [Errno 11] Resource temporarily unavailable
|
|
-%patch47 -p1 -b .systray-blockerror
|
|
|
|
|
|
+%patch44 -p1 -b .systray-blockerror
|
|
# 1742949, 1740132, 1739855 - missing drivers
|
|
# 1742949, 1740132, 1739855 - missing drivers
|
|
-%patch48 -p1 -b .missing-drivers
|
|
|
|
|
|
+%patch45 -p1 -b .missing-drivers
|
|
# 1772698 - Can't setup printer (HP LJ 2200): no attributes found in model.dat
|
|
# 1772698 - Can't setup printer (HP LJ 2200): no attributes found in model.dat
|
|
-%patch49 -p1 -b .model-mismatch
|
|
|
|
|
|
+%patch46 -p1 -b .model-mismatch
|
|
# 1573430 - sixext.py:to_string_utf8:UnicodeDecodeError: 'utf-8' codec can't decode bytes
|
|
# 1573430 - sixext.py:to_string_utf8:UnicodeDecodeError: 'utf-8' codec can't decode bytes
|
|
-%patch50 -p1 -b .unicodeerror
|
|
|
|
-%patch51 -p1 -b .Wreturn-fix
|
|
|
|
-%patch52 -p1 -b .configure-python
|
|
|
|
-%patch53 -p1 -b .dialog-infinite-loop
|
|
|
|
|
|
+%patch47 -p1 -b .unicodeerror
|
|
|
|
+%patch48 -p1 -b .Wreturn-fix
|
|
|
|
+%patch49 -p1 -b .configure-python
|
|
|
|
+%patch50 -p1 -b .dialog-infinite-loop
|
|
# 1590014 - hplip PPD search doesn't expect '-' in device name
|
|
# 1590014 - hplip PPD search doesn't expect '-' in device name
|
|
-%patch54 -p1 -b .find-driver
|
|
|
|
|
|
+%patch51 -p1 -b .find-driver
|
|
# 1833308 - hp-clean cannot clean HP PSC1410 - Device I/O error
|
|
# 1833308 - hp-clean cannot clean HP PSC1410 - Device I/O error
|
|
-%patch55 -p1 -b .clean-ldl
|
|
|
|
-%patch56 -p1 -b .revert-plugins
|
|
|
|
-# 1861055 - hplip: remove threading.Thread.isAlive method calls - use threading.Thread.is_alive()
|
|
|
|
-#patch57 -p1 -b .thread-isalive-removed
|
|
|
|
-# timed.h is removed from glibc
|
|
|
|
-#patch58 -p1 -b .timed-removed
|
|
|
|
|
|
+%patch52 -p1 -b .clean-ldl
|
|
|
|
+%patch53 -p1 -b .revert-plugins
|
|
# 1899410 - non-sudoers cannot authenticate because of bad username in prompt
|
|
# 1899410 - non-sudoers cannot authenticate because of bad username in prompt
|
|
-%patch59 -p1 -b .check-userperms
|
|
|
|
|
|
+%patch54 -p1 -b .check-userperms
|
|
# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly
|
|
# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly
|
|
-%patch60 -p1 -b .fab-import
|
|
|
|
|
|
+%patch55 -p1 -b .fab-import
|
|
# if an user tries to install scanner via hp-setup (printer/fax utility)
|
|
# if an user tries to install scanner via hp-setup (printer/fax utility)
|
|
# it fails further down - break out earlier with a message
|
|
# it fails further down - break out earlier with a message
|
|
-%patch61 -p1 -b .hpsetup-noscanjets
|
|
|
|
-# 1951922 - hp-systray doesn't support a valid --qt5 option
|
|
|
|
-%patch62 -p1 -b .systray-qt5
|
|
|
|
|
|
+%patch56 -p1 -b .hpsetup-noscanjets
|
|
# 1963114 - patch for hplip firmware load timeout fix
|
|
# 1963114 - patch for hplip firmware load timeout fix
|
|
-%patch63 -p1 -b .hpfirmware-timeout
|
|
|
|
-# 1976465 - [hplip] PY_SSIZE_T_CLEAN macro must be defined for '#' formats
|
|
|
|
-%patch64 -p1 -b .pyssizet_clean
|
|
|
|
|
|
+%patch57 -p1 -b .hpfirmware-timeout
|
|
# 1985251 - Incorrect permission for gpg directory
|
|
# 1985251 - Incorrect permission for gpg directory
|
|
-%patch65 -p1 -b .gpgdir-perms
|
|
|
|
|
|
+%patch58 -p1 -b .gpgdir-perms
|
|
# 1987141 - hp-plugin installs malformed udev files
|
|
# 1987141 - hp-plugin installs malformed udev files
|
|
-%patch66 -p1 -b .hpplugin-udevperms
|
|
|
|
|
|
+%patch59 -p1 -b .hpplugin-udevperms
|
|
# upstream bug https://bugs.launchpad.net/hplip/+bug/1938504
|
|
# upstream bug https://bugs.launchpad.net/hplip/+bug/1938504
|
|
-%patch67 -p1 -b .osname-mismatch
|
|
|
|
-# 2015428 - python3.10 has Callable in collections.abc
|
|
|
|
-%patch68 -p1 -b .abc
|
|
|
|
-# 2015428 - python3.10 doesn't do an implicit conversion when passing decimals
|
|
|
|
-# fractions and others to an integer argument
|
|
|
|
-%patch69 -p1 -b .qt5-convert2int.patch
|
|
|
|
|
|
+%patch60 -p1 -b .osname-mismatch
|
|
|
|
+# 2080235 - Misleading errors about missing shared libraries when scanning
|
|
|
|
+%patch61 -p1 -b .no-libm-libhpmud-warn
|
|
|
|
+# hplip 3.22.6 doesn't use proper arguments for snprintf
|
|
|
|
+%patch62 -p1 -b .snprintf-format
|
|
|
|
+%patch63 -p1 -b .plugin-patch
|
|
|
|
|
|
# vine
|
|
# vine
|
|
|
|
|
|
-%patch70 -p1
|
|
|
|
%patch80 -p1 -b .hpijs
|
|
%patch80 -p1 -b .hpijs
|
|
|
|
|
|
sed -i.duplex-constraints \
|
|
sed -i.duplex-constraints \
|
|
@@ -541,6 +524,9 @@ rm locatedriver
|
|
|
|
|
|
cp -p %{SOURCE4} %{SOURCE5} ppd/hpcups
|
|
cp -p %{SOURCE4} %{SOURCE5} ppd/hpcups
|
|
|
|
|
|
|
|
+# 2129849 - move hp-plugin script into srcdir
|
|
|
|
+cp -p %{SOURCE7} .
|
|
|
|
+
|
|
|
|
|
|
%build
|
|
%build
|
|
# Work-around Makefile.am imperfections.
|
|
# Work-around Makefile.am imperfections.
|
|
@@ -816,6 +802,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
|
|
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Oct 29 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.22.6-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- re-import all patches from rawhide.
|
|
|
|
+
|
|
* Wed Nov 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.21.10-1
|
|
* Wed Nov 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.21.10-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
- dropped Patch37 and 57: fixed in upstream.
|
|
- dropped Patch37 and 57: fixed in upstream.
|