diff --git a/extra/hplip/.SRCINFO b/extra/hplip/.SRCINFO index 4653c875b..e2777e80e 100644 --- a/extra/hplip/.SRCINFO +++ b/extra/hplip/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = hplip pkgdesc = Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet pkgver = 3.23.12 - pkgrel = 5 + pkgrel = 6 epoch = 1 url = https://hplipopensource.com arch = x86_64 @@ -58,6 +58,7 @@ pkgbase = hplip source = python3.diff source = reproducible-gzip.patch source = hplip-1_3_23_12-4-python3_12-fix.patch + source = hplip-locale-format.patch validpgpkeys = 4ABA2F66DBD5A95894910E0673D770CDA59047B9 sha512sums = 7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956fd221f7e1561635508103ae944f19e04d6052d3f8928f2c9685fdcdcf515df sha512sums = SKIP @@ -70,5 +71,6 @@ pkgbase = hplip sha512sums = b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14 sha512sums = 379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f sha512sums = d8c9918a5559fb4cc968607aae9c2b67814240f4d81f703a15e1a23cca0bedd21b3c79c29363bd361f8b4bed169336d2a9e152eb8ca6309bd725dc2aa6a24509 + sha512sums = 321f622c070aee8d4a0a4b2ce1ae81f40ca10959f5707f57f9b2bdfdbeba953792b051470ec2477a747074e123935bb96a2d185f935670127e070466de26eb6d pkgname = hplip diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD index bf7c0294b..f4864755c 100644 --- a/extra/hplip/PKGBUILD +++ b/extra/hplip/PKGBUILD @@ -8,7 +8,7 @@ pkgname=hplip pkgver=3.23.12 -pkgrel=5 +pkgrel=6 epoch=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('x86_64') @@ -49,7 +49,8 @@ source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.a hplip-configure-python.patch python3.diff reproducible-gzip.patch - hplip-1_3_23_12-4-python3_12-fix.patch) + hplip-1_3_23_12-4-python3_12-fix.patch + hplip-locale-format.patch) sha512sums=('7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956fd221f7e1561635508103ae944f19e04d6052d3f8928f2c9685fdcdcf515df' 'SKIP' 'a12aaeece5285ffb86bdbc24871bf512fbc1f29da44ae51ded314378032662074a42b8aca23bebb378bf78ed15bb7f99da59bfb4cd456f3458e7a5ef42a900f8' @@ -61,7 +62,8 @@ sha512sums=('7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956f '089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8' 'b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14' '379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f' - 'd8c9918a5559fb4cc968607aae9c2b67814240f4d81f703a15e1a23cca0bedd21b3c79c29363bd361f8b4bed169336d2a9e152eb8ca6309bd725dc2aa6a24509') + 'd8c9918a5559fb4cc968607aae9c2b67814240f4d81f703a15e1a23cca0bedd21b3c79c29363bd361f8b4bed169336d2a9e152eb8ca6309bd725dc2aa6a24509' + '321f622c070aee8d4a0a4b2ce1ae81f40ca10959f5707f57f9b2bdfdbeba953792b051470ec2477a747074e123935bb96a2d185f935670127e070466de26eb6d') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) prepare() { @@ -85,6 +87,8 @@ prepare() { patch -Np1 -i ../hplip-configure-python.patch # allow non-jpeg scanning on all-in-one devices - FS#78135 patch -Np1 -i ../0018-Allow-non-JPEG-scanning-on-the-HP-DeskJet-3520-All-i.patch + # hp-firmware: module 'locale' not longer provides method 'format', causing traceback #4 + patch -Np1 -i ../hplip-locale-format.patch # make gzip creation reproducible by removing the timestamp patch -Np1 -i ../reproducible-gzip.patch diff --git a/extra/hplip/hplip-locale-format.patch b/extra/hplip/hplip-locale-format.patch new file mode 100644 index 000000000..32fba1e95 --- /dev/null +++ b/extra/hplip/hplip-locale-format.patch @@ -0,0 +1,13 @@ +diff --git a/base/utils.py b/base/utils.py +index e2de550..55848b8 100644 +--- a/base/utils.py ++++ b/base/utils.py +@@ -474,7 +474,7 @@ def sort_dict_by_value(d): + + + def commafy(val): +- return locale.format("%s", val, grouping=True) ++ return locale.format_string("%s", val, grouping=True) + + + def format_bytes(s, show_bytes=False):