Update to hplip-3.22.4.

This commit is contained in:
ajacoutot 2022-04-29 07:52:37 +00:00
parent d0ff48bc88
commit 0bfd60c40d
4 changed files with 20 additions and 16 deletions

View File

@ -7,14 +7,10 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.22.2
V= 3.22.4
DISTNAME= hplip-${V}
SUBST_VARS= V
REVISION-hpaio= 0
REVISION-hpcups= 0
REVISION-main= 0
# https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
MASTER_SITES0= https://src.fedoraproject.org/rpms/hplip/raw/rawhide/f/
PATCHFILES= 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch:0

View File

@ -1,6 +1,6 @@
SHA256 (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = r1AFXMXXdB126in1K8leeXVFYiAyI2bu1XXb05gulrc=
SHA256 (hplip-3.22.2.tar.gz) = E8KQIL46sJbuffvmz1abm5akq29yXZwNXQ6MKyrCiVg=
SHA256 (hplip-3.22.4.tar.gz) = e+nlR8WsQJFxYO809Z+CJ10drqV3Bn9+7rKuB8e+wRA=
SHA256 (hplip-fab-import.patch) = wCkzPVzyzyzUsnFeXRuzsDns91UQ988f4wFOPosAHYk=
SIZE (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = 21964
SIZE (hplip-3.22.2.tar.gz) = 27341972
SIZE (hplip-3.22.4.tar.gz) = 27479009
SIZE (hplip-fab-import.patch) = 610

View File

@ -39,7 +39,7 @@ Index: Makefile.in
prnt/ipp-usb/HPLIP.conf scan/sane/hpaio.desc \
installer/text_install.py data/localization/hplip_de.ts \
data/localization/hplip_es.ts data/localization/hplip_fr.ts \
@@ -4629,7 +4625,7 @@ dist_unrel_DATA =
@@ -4645,7 +4641,7 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/orblitei.h scan/sane/orblite.h scan/sane/orblite.c \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/OrbliteScan/LinuxCommon.h scan/sane/OrbliteScan/MacCommon.h
@ -48,7 +48,7 @@ Index: Makefile.in
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
# The following is a interlibrary dependency that must be compiled first.
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la \
@@ -4637,7 +4633,6 @@ dist_unrel_DATA =
@@ -4653,7 +4649,6 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ libhpipp.la \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(DBUS_LIBS) \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ -lcups \
@ -56,7 +56,7 @@ Index: Makefile.in
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(am__append_1)
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) \
@@ -4659,7 +4654,6 @@ dist_unrel_DATA =
@@ -4675,7 +4670,6 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@libhpmud_la_LDFLAGS = \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ -version-info \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ 0:6:0 -lpthread \
@ -64,7 +64,7 @@ Index: Makefile.in
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(am__append_6) \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(am__append_9) \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(am__append_11)
@@ -4713,7 +4707,7 @@ dist_unrel_DATA =
@@ -4729,7 +4723,7 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@ -73,7 +73,7 @@ Index: Makefile.in
@HPLIP_BUILD_TRUE@dist_hplip_state_DATA =
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir)
@@ -4913,7 +4907,7 @@ dist_unrel_DATA =
@@ -4929,7 +4923,7 @@ dist_unrel_DATA =
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
@ -82,7 +82,7 @@ Index: Makefile.in
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4982,8 +4976,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4998,8 +4992,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
@ -93,7 +93,7 @@ Index: Makefile.in
# hpcups
#if NEW_HPCUPS
@@ -5027,7 +5021,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5043,7 +5037,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@ -102,7 +102,7 @@ Index: Makefile.in
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -5035,15 +5029,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5051,15 +5045,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
@ -121,7 +121,7 @@ Index: Makefile.in
dat2drvdir = $(hplipdir)
dat2drv_SOURCES = Common.h Dat2drv.cpp Dat2drv.h Normalize.cpp Normalize.h
@GCC_GE_47_TRUE@dat2drv_CXXFLAGS = -std=c++11
@@ -9798,19 +9792,9 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
@@ -9814,19 +9808,9 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
install-data-hook:

View File

@ -816,6 +816,10 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_p4515n.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p4515tn.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p4515x.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_p4515xm.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_4001-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_4002-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_4003-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_4004-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m118-m119-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m148-m149-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
@ -831,6 +835,10 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m501dn-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m501n-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m701-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_m706-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_4101-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_4102-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_4103-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_4104-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m125a.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m125nr.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m125nw.ppd.gz