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

Updte to hplip-3.22.10.

This commit is contained in:
ajacoutot 2022-11-02 08:29:31 +00:00
parent 16999d06fe
commit a0ea0806d9
5 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print/hplip/Makefile
View File

@ -7,7 +7,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-hpijs= HP ghostscript driver (spooler independent)
COMMENT-gui= HPLIP graphical tools
V= 3.22.6
V= 3.22.10
DISTNAME= hplip-${V}
SUBST_VARS= V
@ -15,8 +15,6 @@ SUBST_VARS= V
MASTER_SITES0= https://src.fedoraproject.org/rpms/hplip/raw/rawhide/f/
PATCHFILES= 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch:0
PATCH_DIST_STRIP= -p1
MASTER_SITES1= https://src.fedoraproject.org/rpms/hplip/raw/b2f875a7674e3bb5e14291d1abe9f6484cc256ec/f/
PATCHFILES += hplip-fab-import.patch:1
PKGNAME-main= ${DISTNAME}
PKGNAME-common= hplip-common-${V}
@ -25,8 +23,6 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-main= 0
SHARED_LIBS += hpdiscovery 0.0 # 0.1
SHARED_LIBS += hpmud 2.0 # 0.6
SHARED_LIBS += hpipp 0.0 # 0.1
@ -85,7 +81,7 @@ RUN_DEPENDS-main += print/cups
### -common
WANTLIB-common += ${cWANTLIB} netsnmp usb-1.0 avahi-client
WANTLIB-common += avahi-common avahi-core dbus-1 iconv intl
WANTLIB-common += execinfo
WANTLIB-common += execinfo ssl
LIB_DEPENDS-common= devel/libusb1 \
net/avahi,-libs \
@ -120,7 +116,7 @@ RUN_DEPENDS-hpcups= # empty
### -hpijs
WANTLIB-hpijs += ${cWANTLIB} hpip usb-1.0 hpdiscovery avahi-core
WANTLIB-hpijs += c jpeg netsnmp ${COMPILER_LIBCXX} dbus-1 hpmud
WANTLIB-hpijs += avahi-client avahi-common iconv intl execinfo
WANTLIB-hpijs += avahi-client avahi-common iconv intl execinfo ssl
LIB_DEPENDS-hpijs= print/hplip,-common \
graphics/jpeg \

6
print/hplip/distinfo
View File

@ -1,6 +1,4 @@
SHA256 (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = r1AFXMXXdB126in1K8leeXVFYiAyI2bu1XXb05gulrc=
SHA256 (hplip-3.22.6.tar.gz) = J+0NSS/rsLR8ZWI0gg085XOyT/W2Ljv0ssR/goaNa7Q=
SHA256 (hplip-fab-import.patch) = wCkzPVzyzyzUsnFeXRuzsDns91UQ988f4wFOPosAHYk=
SHA256 (hplip-3.22.10.tar.gz) = Uzw/L2tT5BY97U/YHR8RrmFioPZFG9XmKoOC0ME2ZiQ=
SIZE (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = 21964
SIZE (hplip-3.22.6.tar.gz) = 29331408
SIZE (hplip-fab-import.patch) = 610
SIZE (hplip-3.22.10.tar.gz) = 29333247

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

@ -9,22 +9,7 @@ Index: base/password.py
}
@@ -104,10 +105,13 @@ def get_distro_name():
name.close()
if not os_name:
- name = os.popen("cat /etc/issue | awk '{print $1}' | head -n 1")
+ name = os.popen("cat /etc/issue 2>/dev/null | awk '{print $1}' | head -n 1")
os_name = name.read().strip()
name.close()
+ if not os_name:
+ os_name = platform.system()
+
os_name = os_name.lower()
if 'MX' in distro_release_name:
os_name = "mxlinux"
@@ -348,7 +352,11 @@ class Password(object):
@@ -322,7 +323,11 @@ class Password(object):
def __get_password_utils(self):
if self.__authType == "su":
@ -37,7 +22,7 @@ Index: base/password.py
else:
AuthType, AuthCmd = 'sudo', 'sudo %s'
@@ -359,7 +367,11 @@ class Password(object):
@@ -335,7 +340,11 @@ class Password(object):
if self.__authType == "sudo":
AuthType, AuthCmd = 'sudo', 'sudo %s'
else:

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

@ -46,7 +46,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
@@ -960,7 +960,7 @@ class CoreInstall(object):
@@ -884,7 +884,7 @@ class CoreInstall(object):
return check_tool('gcc --version', 0) and check_tool('g++ --version', 0)
def check_make(self):
@ -55,7 +55,7 @@ Index: installer/core_install.py
#def check_pkgconf(self):
#return check_tool('pkgconf --version', 0)
@@ -971,14 +971,14 @@ class CoreInstall(object):
@@ -895,14 +895,14 @@ class CoreInstall(object):
if not check_lib('libusb'):
return False
if self.distro_name != "rhel":
@ -72,7 +72,7 @@ Index: installer/core_install.py
else:
return True
@@ -992,10 +992,10 @@ class CoreInstall(object):
@@ -916,10 +916,10 @@ class CoreInstall(object):
return check_lib("libjpeg") and check_file("jpeglib.h")
def check_libcrypto(self):
@ -85,7 +85,7 @@ Index: installer/core_install.py
def check_libnetsnmp(self):
return check_lib("libnetsnmp") and check_file("net-snmp-config.h")
@@ -1035,7 +1035,7 @@ class CoreInstall(object):
@@ -959,7 +959,7 @@ class CoreInstall(object):
return check_lib('libsane')
def check_sane_devel(self):
@ -94,7 +94,7 @@ Index: installer/core_install.py
def check_xsane(self):
if os.getenv('DISPLAY'):
@@ -1110,7 +1110,7 @@ class CoreInstall(object):
@@ -1034,7 +1034,7 @@ class CoreInstall(object):
return False
def check_python_devel(self):
@ -103,7 +103,7 @@ Index: installer/core_install.py
Found = False
for p in dir_list:
if check_file('Python.h', dir=p):
@@ -1162,13 +1162,8 @@ class CoreInstall(object):
@@ -1086,13 +1086,8 @@ class CoreInstall(object):
return False
def check_dbus(self):
@ -119,7 +119,7 @@ Index: installer/core_install.py
def check_cups_devel(self):
return check_file('cups.h') and bool(utils.which('lpr'))
@@ -1183,11 +1178,11 @@ class CoreInstall(object):
@@ -1107,11 +1102,11 @@ class CoreInstall(object):
return True
def check_cups_image(self):
@ -133,7 +133,7 @@ Index: installer/core_install.py
def check_libtool(self):
log.debug("Checking for libtool...")
@@ -1254,7 +1249,7 @@ class CoreInstall(object):
@@ -1178,7 +1173,7 @@ class CoreInstall(object):
def check_cupsddk(self):
log.debug("Checking for cups-ddk...")
# TODO: Compute these paths some way or another...
@ -142,7 +142,7 @@ Index: installer/core_install.py
def check_libavahi_dev(self):
log.debug("Checking for libavahi-dev")
@@ -1309,7 +1304,7 @@ class CoreInstall(object):
@@ -1233,7 +1228,7 @@ class CoreInstall(object):
def check_hpaio(self):
found = False
@ -151,7 +151,7 @@ Index: installer/core_install.py
log.debug("'Checking for hpaio' in '%s'..." % path)
try:
f = open(path, 'r')
@@ -1338,13 +1333,13 @@ class CoreInstall(object):
@@ -1262,13 +1257,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'):
@ -169,7 +169,7 @@ Index: installer/core_install.py
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
else:
@@ -1357,20 +1352,20 @@ class CoreInstall(object):
@@ -1281,20 +1276,20 @@ class CoreInstall(object):
f.close()
if not found:
@ -195,7 +195,7 @@ Index: installer/core_install.py
cmd = self.passwordObj.getAuthCmd() % cmd
log.debug("cmd=%s" % cmd)
utils.run(cmd, self.passwordObj)
@@ -1836,11 +1831,14 @@ class CoreInstall(object):
@@ -1760,11 +1755,14 @@ class CoreInstall(object):
return num_opt_missing
def check_wget(self):
@ -214,7 +214,7 @@ Index: installer/core_install.py
def check_avahi_utils(self):
if utils.which("avahi-browse"):
@@ -1966,7 +1964,7 @@ class CoreInstall(object):
@@ -1890,7 +1888,7 @@ class CoreInstall(object):
cmds = []
if self.get_distro_ver_data('fix_ppd_symlink', False, distro_ver):
cmds.append(self.passwordObj.getAuthCmd() %

14
print/hplip/patches/patch-ui5_fabwindow_py Normal file
View File

@ -0,0 +1,14 @@
https://bugs.launchpad.net/hplip/+bug/1914743
Index: ui5/fabwindow.py
--- ui5/fabwindow.py.orig
+++ ui5/fabwindow.py
@@ -518,7 +518,7 @@ class FABWindow(QMainWindow, Ui_MainWindow):
self.__tr("Import fax addresses from LDIF or vCard"),
#user_conf.workingDirectory(),
self.user_settings.working_dir,
- "vCard (*.vcf);;LDIF (*.ldif *.ldi)"))
+ "vCard (*.vcf);;LDIF (*.ldif *.ldi)")[0])
result = (eval(result)[0])
if result:
working_directory = to_unicode(os.path.dirname(result))