From 982e968ef61a94e0de75d733e9036e5c60afca34 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Wed, 25 Aug 2021 15:29:51 +0200 Subject: print/hplip(-plugin): update to 3.22.2 - Convert post-patch to real patches because they are easier to maintain. - Fix a NULL dereference in the scanner backend when D-Bus isn't running. - Depend on sysutils/py-distro to make hp-toolbox (Device Manager) work again. - Upstream switched to Avahi for mDNS support. Rename the SNMP option to NETWORK because it's not just SNMP now. - Don't install some programs related to uninstalling and upgrading of HPLIP and the installation of firmware plugins because they circumvent the package system. - Install icons in share/icons so desktops can choose an appropriate resolution. Portions taken from a patch by Oleg Sidorkin . PR: 255586, 257034, 257512 --- print/hplip/files/patch-prnt_cups.py | 88 ++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 print/hplip/files/patch-prnt_cups.py (limited to 'print/hplip/files/patch-prnt_cups.py') diff --git a/print/hplip/files/patch-prnt_cups.py b/print/hplip/files/patch-prnt_cups.py new file mode 100644 index 000000000000..2d53567712a5 --- /dev/null +++ b/print/hplip/files/patch-prnt_cups.py @@ -0,0 +1,88 @@ +--- prnt/cups.py.orig 2022-02-23 07:41:04 UTC ++++ prnt/cups.py +@@ -224,7 +224,7 @@ def isfamilydrv(ppds): + # for m in models.FAMILY_CLASSES: + # if m in f: + # family_check=1 +- filename_config = "/etc/hp/hplip.conf" ++ filename_config = "/usr/local/etc/hp/hplip.conf" + file_conf = open(filename_config,'r') + for line in file_conf: + if 'class-driver' in line: +@@ -236,8 +236,8 @@ def isfamilydrv(ppds): + + def getPPDPath(addtional_paths=None): + """ +- Returns the CUPS ppd path (not the foomatic one under /usr/share/ppd). +- Usually this is /usr/share/cups/model. ++ Returns the CUPS ppd path (not the foomatic one under /usr/local/share/ppd). ++ Usually this is /usr/local/share/cups/model. + """ + if addtional_paths is None: + addtional_paths = [] +@@ -254,7 +254,7 @@ def getPPDPath1(addtional_paths=None): + return path for hplip ppds. + """ + +- filename_config = "/etc/hp/hplip.conf" ++ filename_config = "/usr/local/etc/hp/hplip.conf" + file_conf = open(filename_config,'r') + for line in file_conf: + if 'ppd=' in line: +@@ -267,16 +267,16 @@ def getPPDPath1(addtional_paths=None): + + def getAllowableMIMETypes(): + """ +- Scan all /etc/cups/*.convs and /usr/share/cups/mime ++ Scan all /usr/local/etc/cups/*.convs and /usr/local/share/cups/mime + files for allowable file formats. + """ + paths = [] + allowable_mime_types = [] + files = [] +- if os.path.exists("/etc/cups"): +- paths.append("/etc/cups/*.convs") +- if os.path.exists("/usr/share/cups/mime"): +- paths.append("/usr/share/cups/mime/*.convs") ++ if os.path.exists("/usr/local/etc/cups"): ++ paths.append("/usr/local/etc/cups/*.convs") ++ if os.path.exists("/usr/local/share/cups/mime"): ++ paths.append("/usr/local/share/cups/mime/*.convs") + for path in paths: + files.extend(glob.glob(path)) + for f in files: +@@ -337,11 +337,11 @@ def getSystemPPDs(): + else: # 1.2.x + log.debug("(CUPS 1.2.x) Getting list of PPDs using CUPS_GET_PPDS...") + ppd_dict = cupsext.getPPDList() +- cups_ppd_path = getPPDPath() # usually /usr/share/cups/model +- foomatic_ppd_path = sys_conf.get('dirs', 'ppdbase', '/usr/share/ppd') ++ cups_ppd_path = getPPDPath() # usually /usr/local/share/cups/model ++ foomatic_ppd_path = sys_conf.get('dirs', 'ppdbase', '/usr/local/share/ppd') + + if not foomatic_ppd_path or not os.path.exists(foomatic_ppd_path): +- foomatic_ppd_path = '/usr/share/ppd' ++ foomatic_ppd_path = '/usr/local/share/ppd' + + log.debug("CUPS PPD base path = %s" % cups_ppd_path) + log.debug("Foomatic PPD base path = %s" % foomatic_ppd_path) +@@ -360,8 +360,8 @@ def getSystemPPDs(): + 'gutenprint' in ppd): + + # PPD files returned by CUPS_GET_PPDS (and by lpinfo -m) +- # can be relative to /usr/share/ppd/ or to +- # /usr/share/cups/model/. Not sure why this is. ++ # can be relative to /usr/local/share/ppd/ or to ++ # /usr/local/share/cups/model/. Not sure why this is. + # Here we will try both and see which one it is... + + if os.path.exists(ppd): +@@ -699,7 +699,7 @@ def getFaxPPDFile(mq, model): + + + def getErrorLogLevel(): +- cups_conf = '/etc/cups/cupsd.conf' ++ cups_conf = '/usr/local/etc/cups/cupsd.conf' + try: + f = open(cups_conf, 'r') + except OSError: -- cgit v1.2.3