Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages / hplip
Commits: 694b4720 by Christian Heusel at 2024-04-28T22:25:08+02:00 upgpkg: 1:3.23.12-5 fixes https://gitlab.archlinux.org/archlinux/packaging/packages/hplip/-/issues/3 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + hplip-1_3_23_12-4-python3_12-fix.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = hplip pkgdesc = Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet pkgver = 3.23.12 - pkgrel = 4 + pkgrel = 5 epoch = 1 url = https://hplipopensource.com arch = x86_64 @@ -57,6 +57,7 @@ pkgbase = hplip source = hplip-configure-python.patch source = python3.diff source = reproducible-gzip.patch + source = hplip-1_3_23_12-4-python3_12-fix.patch validpgpkeys = 4ABA2F66DBD5A95894910E0673D770CDA59047B9 sha512sums = 7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956fd221f7e1561635508103ae944f19e04d6052d3f8928f2c9685fdcdcf515df sha512sums = SKIP @@ -68,5 +69,6 @@ pkgbase = hplip sha512sums = 089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8 sha512sums = b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14 sha512sums = 379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f + sha512sums = d8c9918a5559fb4cc968607aae9c2b67814240f4d81f703a15e1a23cca0bedd21b3c79c29363bd361f8b4bed169336d2a9e152eb8ca6309bd725dc2aa6a24509 pkgname = hplip ===================================== PKGBUILD ===================================== @@ -5,7 +5,7 @@ pkgname=hplip pkgver=3.23.12 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('x86_64') @@ -44,7 +44,8 @@ source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.a # use the one from Fedora hplip-configure-python.patch python3.diff - reproducible-gzip.patch) + reproducible-gzip.patch + hplip-1_3_23_12-4-python3_12-fix.patch) sha512sums=('7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956fd221f7e1561635508103ae944f19e04d6052d3f8928f2c9685fdcdcf515df' 'SKIP' 'a12aaeece5285ffb86bdbc24871bf512fbc1f29da44ae51ded314378032662074a42b8aca23bebb378bf78ed15bb7f99da59bfb4cd456f3458e7a5ef42a900f8' @@ -54,7 +55,8 @@ sha512sums=('7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956f '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff' '089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8' 'b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14' - '379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f') + '379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f' + 'd8c9918a5559fb4cc968607aae9c2b67814240f4d81f703a15e1a23cca0bedd21b3c79c29363bd361f8b4bed169336d2a9e152eb8ca6309bd725dc2aa6a24509') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hp...@hp.com> prepare() { @@ -80,6 +82,9 @@ prepare() { # make gzip creation reproducible by removing the timestamp patch -Np1 -i ../reproducible-gzip.patch + # https://gitlab.archlinux.org/archlinux/packaging/packages/hplip/-/issues/3 + patch -Np1 -i ../hplip-1_3_23_12-4-python3_12-fix.patch + export AUTOMAKE='automake --foreign' autoreconf --force --install } ===================================== hplip-1_3_23_12-4-python3_12-fix.patch ===================================== @@ -0,0 +1,35 @@ +From eb5e88152538a36e74ea8d7085a54baf48e06103 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal <zdoh...@redhat.com> +Date: Jul 17 2023 16:43:31 +0000 +Subject: 2221311 - [python3.12] hplip tools/binaries crash due depending on removed configparser.readfp() + + +--- + +diff --git a/base/g.py b/base/g.py +index 0aa0e2e..96b3131 100644 +--- a/base/g.py ++++ b/base/g.py +@@ -128,7 +128,7 @@ class ConfigBase(object): + try: + fp = open(self.filename, "r") + try: +- self.conf.readfp(fp) ++ self.conf.read_file(fp, self.filename) + except configparser.MissingSectionHeaderError: + print("") + log.error("Found No Section in %s. Please set the http proxy for root and try again." % self.filename) +diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py +index 3110a0f..3761f89 100644 +--- a/ui5/devmgr5.py ++++ b/ui5/devmgr5.py +@@ -1072,7 +1072,7 @@ class DevMgr5(Ui_MainWindow_Derived, Ui_MainWindow, QMainWindow): + + hplip_conf = configparser.ConfigParser() + fp = open("/etc/hp/hplip.conf", "r") +- hplip_conf.readfp(fp) ++ hplip_conf.read_file(fp, "/etc/hp/hplip.conf") + fp.close() + + try: + try: View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/hplip/-/commit/694b4720d7802f6c679e810551de39d242b0b1b6 -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/hplip/-/commit/694b4720d7802f6c679e810551de39d242b0b1b6 You're receiving this email because of your account on gitlab.archlinux.org.
