cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to hplip-3.22.2.

Browse Source
This commit is contained in:
ajacoutot 2022-02-28 09:49:55 +00:00
parent cd102b7b93
commit 277a94a1c0
8 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
print/hplip/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.197 2021/12/18 09:52:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.198 2022/02/28 09:49:55 ajacoutot Exp $
PORTROACH= skipv:${V}_py2.5
@ -9,7 +9,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.21.12
V= 3.22.2
DISTNAME= hplip-${V}
SUBST_VARS= V

4
print/hplip/distinfo
View File

@ -1,6 +1,6 @@
SHA256 (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = r1AFXMXXdB126in1K8leeXVFYiAyI2bu1XXb05gulrc=
SHA256 (hplip-3.21.12.tar.gz) = fvRSPvgbztcVFeHIhA72xoxgJjjBWebdmpJpHO7GT5w=
SHA256 (hplip-3.22.2.tar.gz) = E8KQIL46sJbuffvmz1abm5akq29yXZwNXQ6MKyrCiVg=
SHA256 (hplip-fab-import.patch) = wCkzPVzyzyzUsnFeXRuzsDns91UQ988f4wFOPosAHYk=
SIZE (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = 21964
SIZE (hplip-3.21.12.tar.gz) = 27314194
SIZE (hplip-3.22.2.tar.gz) = 27341972
SIZE (hplip-fab-import.patch) = 610

20
print/hplip/patches/patch-Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_in,v 1.66 2021/12/18 09:52:25 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.67 2022/02/28 09:49:55 ajacoutot Exp $
https://sources.debian.org/src/hplip/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch/
@ -41,7 +41,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 \
@@ -4613,7 +4609,7 @@ dist_unrel_DATA =
@@ -4629,7 +4625,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
@ -50,7 +50,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 \
@@ -4621,7 +4617,6 @@ dist_unrel_DATA =
@@ -4637,7 +4633,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 \
@ -58,7 +58,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) \
@@ -4643,7 +4638,6 @@ dist_unrel_DATA =
@@ -4659,7 +4654,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 \
@ -66,7 +66,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)
@@ -4697,7 +4691,7 @@ dist_unrel_DATA =
@@ -4713,7 +4707,7 @@ dist_unrel_DATA =
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@ -75,7 +75,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)
@@ -4897,7 +4891,7 @@ dist_unrel_DATA =
@@ -4913,7 +4907,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)
@ -84,7 +84,7 @@ Index: Makefile.in
# hplip.desktop
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4966,8 +4960,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4982,8 +4976,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)
@ -95,7 +95,7 @@ Index: Makefile.in
# hpcups
#if NEW_HPCUPS
@@ -5011,7 +5005,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5027,7 +5021,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)
@ -104,7 +104,7 @@ Index: Makefile.in
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -5019,15 +5013,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -5035,15 +5029,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
@ -123,7 +123,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
@@ -9782,19 +9776,9 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
@@ -9798,19 +9792,9 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
install-data-hook:

8
print/hplip/patches/patch-base_password_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-base_password_py,v 1.12 2021/12/18 09:52:25 ajacoutot Exp $
$OpenBSD: patch-base_password_py,v 1.13 2022/02/28 09:49:55 ajacoutot Exp $
Index: base/password.py
--- base/password.py.orig
@ -11,7 +11,7 @@ Index: base/password.py
}
@@ -101,10 +102,13 @@ def get_distro_name():
@@ -104,10 +105,13 @@ def get_distro_name():
name.close()
if not os_name:
@ -26,7 +26,7 @@ Index: base/password.py
os_name = os_name.lower()
if 'MX' in distro_release_name:
os_name = "mxlinux"
@@ -345,7 +349,11 @@ class Password(object):
@@ -348,7 +352,11 @@ class Password(object):
def __get_password_utils(self):
if self.__authType == "su":
@ -39,7 +39,7 @@ Index: base/password.py
else:
AuthType, AuthCmd = 'sudo', 'sudo %s'
@@ -356,7 +364,11 @@ class Password(object):
@@ -359,7 +367,11 @@ class Password(object):
if self.__authType == "sudo":
AuthType, AuthCmd = 'sudo', 'sudo %s'
else:

28
print/hplip/patches/patch-installer_core_install_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-installer_core_install_py,v 1.34 2021/12/18 09:52:25 ajacoutot Exp $
$OpenBSD: patch-installer_core_install_py,v 1.35 2022/02/28 09:49:55 ajacoutot Exp $
Index: installer/core_install.py
--- installer/core_install.py.orig
@ -48,7 +48,7 @@ Index: installer/core_install.py
'pil': (False, ['scan'], PIL_STR, self.check_pil, DEPENDENCY_RUN_TIME, '-', 'FUNC#get_pil_version', GENERALDEP),
#'imutils': (True, ['scan'], IMUTILS_STR, self.check_imutils, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
# Optional fax packages
@@ -957,7 +957,7 @@ class CoreInstall(object):
@@ -960,7 +960,7 @@ class CoreInstall(object):
return check_tool('gcc --version', 0) and check_tool('g++ --version', 0)
def check_make(self):
@ -57,7 +57,7 @@ Index: installer/core_install.py
#def check_pkgconf(self):
#return check_tool('pkgconf --version', 0)
@@ -968,14 +968,14 @@ class CoreInstall(object):
@@ -971,14 +971,14 @@ class CoreInstall(object):
if not check_lib('libusb'):
return False
if self.distro_name != "rhel":
@ -74,7 +74,7 @@ Index: installer/core_install.py
else:
return True
@@ -989,10 +989,10 @@ class CoreInstall(object):
@@ -992,10 +992,10 @@ class CoreInstall(object):
return check_lib("libjpeg") and check_file("jpeglib.h")
def check_libcrypto(self):
@ -87,7 +87,7 @@ Index: installer/core_install.py
def check_libnetsnmp(self):
return check_lib("libnetsnmp") and check_file("net-snmp-config.h")
@@ -1032,7 +1032,7 @@ class CoreInstall(object):
@@ -1035,7 +1035,7 @@ class CoreInstall(object):
return check_lib('libsane')
def check_sane_devel(self):
@ -96,7 +96,7 @@ Index: installer/core_install.py
def check_xsane(self):
if os.getenv('DISPLAY'):
@@ -1107,7 +1107,7 @@ class CoreInstall(object):
@@ -1110,7 +1110,7 @@ class CoreInstall(object):
return False
def check_python_devel(self):
@ -105,7 +105,7 @@ Index: installer/core_install.py
Found = False
for p in dir_list:
if check_file('Python.h', dir=p):
@@ -1159,13 +1159,8 @@ class CoreInstall(object):
@@ -1162,13 +1162,8 @@ class CoreInstall(object):
return False
def check_dbus(self):
@ -121,7 +121,7 @@ Index: installer/core_install.py
def check_cups_devel(self):
return check_file('cups.h') and bool(utils.which('lpr'))
@@ -1180,11 +1175,11 @@ class CoreInstall(object):
@@ -1183,11 +1178,11 @@ class CoreInstall(object):
return True
def check_cups_image(self):
@ -135,7 +135,7 @@ Index: installer/core_install.py
def check_libtool(self):
log.debug("Checking for libtool...")
@@ -1251,7 +1246,7 @@ class CoreInstall(object):
@@ -1254,7 +1249,7 @@ class CoreInstall(object):
def check_cupsddk(self):
log.debug("Checking for cups-ddk...")
# TODO: Compute these paths some way or another...
@ -144,7 +144,7 @@ Index: installer/core_install.py
def check_libavahi_dev(self):
log.debug("Checking for libavahi-dev")
@@ -1306,7 +1301,7 @@ class CoreInstall(object):
@@ -1309,7 +1304,7 @@ class CoreInstall(object):
def check_hpaio(self):
found = False
@ -153,7 +153,7 @@ Index: installer/core_install.py
log.debug("'Checking for hpaio' in '%s'..." % path)
try:
f = open(path, 'r')
@@ -1335,13 +1330,13 @@ class CoreInstall(object):
@@ -1338,13 +1333,13 @@ class CoreInstall(object):
if pat.match(home_dir) is not None:
usrlib_dir = pat.match(home_dir).group(1) + "lib/"
if os.path.exists(usrlib_dir + 'sane/libsane-hpaio.so.1'):
@ -171,7 +171,7 @@ Index: installer/core_install.py
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
else:
@@ -1354,20 +1349,20 @@ class CoreInstall(object):
@@ -1357,20 +1352,20 @@ class CoreInstall(object):
f.close()
if not found:
@ -197,7 +197,7 @@ Index: installer/core_install.py
cmd = self.passwordObj.getAuthCmd() % cmd
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
@@ -1833,11 +1828,14 @@ class CoreInstall(object):
@@ -1836,11 +1831,14 @@ class CoreInstall(object):
return num_opt_missing
def check_wget(self):
@ -216,7 +216,7 @@ Index: installer/core_install.py
def check_avahi_utils(self):
if utils.which("avahi-browse"):
@@ -1963,7 +1961,7 @@ class CoreInstall(object):
@@ -1966,7 +1964,7 @@ class CoreInstall(object):
cmds = []
if self.get_distro_ver_data('fix_ppd_symlink', False, distro_ver):
cmds.append(self.passwordObj.getAuthCmd() %

6
print/hplip/patches/patch-ui4_wifisetupdialog_py
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-ui4_wifisetupdialog_py,v 1.1 2020/02/22 15:02:05 ajacoutot Exp $
$OpenBSD: patch-ui4_wifisetupdialog_py,v 1.2 2022/02/28 09:49:55 ajacoutot Exp $
https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
Index: ui4/wifisetupdialog.py
--- ui4/wifisetupdialog.py.orig
+++ ui4/wifisetupdialog.py
@@ -256,7 +256,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
@@ -250,7 +250,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
try:
self.dev = device.Device(self.device_uri)
except Error as e:
@ -14,7 +14,7 @@ Index: ui4/wifisetupdialog.py
if self.dev is not None:
self.dev.close()
@@ -834,7 +834,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
@@ -828,7 +828,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
def showIOError(self, e):

6
print/hplip/patches/patch-ui5_wifisetupdialog_py
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-ui5_wifisetupdialog_py,v 1.1 2020/02/22 15:02:05 ajacoutot Exp $
$OpenBSD: patch-ui5_wifisetupdialog_py,v 1.2 2022/02/28 09:49:55 ajacoutot Exp $
https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
Index: ui5/wifisetupdialog.py
--- ui5/wifisetupdialog.py.orig
+++ ui5/wifisetupdialog.py
@@ -259,7 +259,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
@@ -253,7 +253,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
try:
self.dev = device.Device(self.device_uri)
except Error as e:
@ -14,7 +14,7 @@ Index: ui5/wifisetupdialog.py
if self.dev is not None:
self.dev.close()
@@ -840,7 +840,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
@@ -834,7 +834,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
def showIOError(self, e):

8
print/hplip/pkg/PLIST-hpijs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-hpijs,v 1.70 2021/12/18 09:52:25 ajacoutot Exp $
@comment $OpenBSD: PLIST-hpijs,v 1.71 2022/02/28 09:49:55 ajacoutot Exp $
@conflict hplip-libs-<=3.9.8
@conflict hpcups-<=3.2.11
@pkgpath print/hpijs
@ -890,6 +890,12 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1607dn.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1608dn.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1609dn.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p_1102w.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_tank_1020.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_tank_150x.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_tank_250x.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_tank_mfp_1005.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_tank_mfp_160x.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_tank_mfp_260x.ppd.gz
share/foomatic/db/source/PPD/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-mopier_240-pcl3.ppd.gz