diff --git a/srcpkgs/hplip/patches/python312.patch b/srcpkgs/hplip/patches/python312.patch deleted file mode 100644 index 3c612abe56b..00000000000 --- a/srcpkgs/hplip/patches/python312.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -ur hplip-3.23.8.orig/base/g.py hplip-3.23.8/base/g.py ---- hplip-3.23.8.orig/base/g.py 2023-10-15 16:09:06.390645895 -0400 -+++ hplip-3.23.8/base/g.py 2023-10-15 16:10:55.225170318 -0400 -@@ -128,7 +128,7 @@ - try: - fp = open(self.filename, "r") - try: -- self.conf.readfp(fp) -+ self.conf.read_file(fp) - except configparser.MissingSectionHeaderError: - print("") - log.error("Found No Section in %s. Please set the http proxy for root and try again." % self.filename) -diff -ur hplip-3.23.8.orig/ui/devmgr4.py hplip-3.23.8/ui/devmgr4.py ---- hplip-3.23.8.orig/ui/devmgr4.py 2023-10-15 16:09:06.460646229 -0400 -+++ hplip-3.23.8/ui/devmgr4.py 2023-10-15 16:10:31.857056822 -0400 -@@ -1226,9 +1226,8 @@ - opt_plugin = d.plugin == PLUGIN_OPTIONAL - - hplip_conf = ConfigParser.ConfigParser() -- fp = open("/etc/hp/hplip.conf", "r") -- hplip_conf.readfp(fp) -- fp.close() -+ with open("/etc/hp/hplip.conf", "r") as fp: -+ hplip_conf.read_file(fp) - - try: - plugin_installed = utils.to_bool(hplip_conf.get("hplip", "plugin")) -diff -ur hplip-3.23.8.orig/ui4/devmgr5.py hplip-3.23.8/ui4/devmgr5.py ---- hplip-3.23.8.orig/ui4/devmgr5.py 2023-10-15 16:09:06.475646300 -0400 -+++ hplip-3.23.8/ui4/devmgr5.py 2023-10-15 16:10:13.125965849 -0400 -@@ -1023,9 +1023,8 @@ - return - - hplip_conf = configparser.ConfigParser() -- fp = open("/etc/hp/hplip.conf", "r") -- hplip_conf.readfp(fp) -- fp.close() -+ with open("/etc/hp/hplip.conf", "r") as fp: -+ hplip_conf.read_file(fp) - - try: - plugin_installed = utils.to_bool(hplip_conf.get("hplip", "plugin")) -diff -ur hplip-3.23.8.orig/ui5/devmgr5.py hplip-3.23.8/ui5/devmgr5.py ---- hplip-3.23.8.orig/ui5/devmgr5.py 2023-10-15 16:09:06.467646262 -0400 -+++ hplip-3.23.8/ui5/devmgr5.py 2023-10-15 16:11:12.961256459 -0400 -@@ -1073,9 +1073,8 @@ - return - - hplip_conf = configparser.ConfigParser() -- fp = open("/etc/hp/hplip.conf", "r") -- hplip_conf.readfp(fp) -- fp.close() -+ with open("/etc/hp/hplip.conf", "r") as fp: -+ hplip_conf.read_file(fp) - - try: - plugin_installed = utils.to_bool(hplip_conf.get("hplip", "plugin")) diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index decd7b98171..6e27e4d4659 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,7 +1,7 @@ # Template file for 'hplip' # When possible, keep this package in sync with hplip-plugin pkgname=hplip -version=3.23.12 +version=3.24.4 revision=1 build_style=gnu-configure pycompile_dirs="usr/share/hplip" @@ -34,7 +34,7 @@ license="GPL-2.0-only, BSD-3-Clause, MIT" homepage="https://developers.hp.com/hp-linux-imaging-and-printing" changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes" distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz" -checksum=a76c2ac8deb31ddb5f0da31398d25ac57440928a0692dcb060a48daa718e69ed +checksum=5d7643831893a5e2addf9d42d581a5dbfe5aaf023626886b8762c5645da0f1fb CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"