[arch-commits] Commit in hplip/trunk (PKGBUILD fix-broken-printer-naming.diff)
Date: Thursday, December 12, 2019 @ 09:48:34 Author: andyrtr Revision: 370752 upgpkg: hplip 1:3.19.12-1: upstream update 3.19.12 Modified: hplip/trunk/PKGBUILD Deleted: hplip/trunk/fix-broken-printer-naming.diff + PKGBUILD | 10 +++--- fix-broken-printer-naming.diff | 38 -- 2 files changed, 3 insertions(+), 45 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-12 09:46:31 UTC (rev 370751) +++ PKGBUILD2019-12-12 09:48:34 UTC (rev 370752) @@ -4,8 +4,8 @@ # Contributor: Morgan LEFIEUX pkgname=hplip -pkgver=3.19.11 -pkgrel=7 +pkgver=3.19.12 +pkgrel=1 epoch=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('x86_64') @@ -29,15 +29,13 @@ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch -fix-broken-printer-naming.diff python3.diff) -sha512sums=('f419de0e18937c93c2727f4d8b4f7bf1fcc24961a6b7a0d043ce8341c65d0c0332cd354c0cd907b85bc6ccc7735d23ba5f2c918dba5bf965540291cfcbe032d5' +sha512sums=('5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677' 'SKIP' 'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c68f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525' '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67' '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff' '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b' - '450e0e77954a9d919bbde0a4b9d630920a1225679121f94d6854e16ce9b2f8ed8c4de7ddf629012b9f9d24d075a407a4077d1710ad9d023742f402b4d139a111' '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f182668c7e82') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) @@ -53,8 +51,6 @@ patch -Np1 -i "${srcdir}"/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch # remove binary blob libImageProcessor and all linking - FS#59681 patch -Np1 -i "${srcdir}"/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch - # fix broken printer naming FS#64420, FS#64801 - patch -Np1 -i "${srcdir}"/fix-broken-printer-naming.diff # Workaround patch for missing Python3 transition of the old # (pre-USB-storage) photo memory card support (pcardext) - Debian patch patch -Np1 -i "${srcdir}"/python3.diff Deleted: fix-broken-printer-naming.diff === --- fix-broken-printer-naming.diff 2019-12-12 09:46:31 UTC (rev 370751) +++ fix-broken-printer-naming.diff 2019-12-12 09:48:34 UTC (rev 370752) @@ -1,38 +0,0 @@ hplip-3.19.11/data/models/models.dat 2019-11-04 11:38:24.0 +0100 -+++ hplip-3.19.11/data/models/models.dat.new 2019-12-11 07:37:22.969133967 +0100 -@@ -61795,7 +61795,7 @@ - usb-vid=3f0 - wifi-config=0 - --[hp_color_laserjet_m253-m254] -+[hp_colorlaserjet_m253-m254] - align-type=0 - clean-type=0 - color-cal-type=0 -@@ -61846,7 +61846,7 @@ - wifi-config=0 - - --[hp_color_laserjet_mfp_m178-m181] -+[hp_colorlaserjet_mfp_m178-m181] - align-type=0 - clean-type=0 - color-cal-type=0 -@@ -61896,7 +61896,7 @@ - usb-vid=3f0 - wifi-config=3 - --[hp_color_laserjet_mfp_m278-m281] -+[hp_colorlaserjet_mfp_m278-m281] - align-type=0 - clean-type=0 - color-cal-type=0 -@@ -61947,7 +61947,7 @@ - usb-vid=3f0 - wifi-config=3 - --[hp_color_laserjet_m153-m154] -+[hp_colorlaserjet_m153-m154] - align-type=0 - clean-type=0 - color-cal-type=0
[arch-commits] Commit in hplip/trunk (PKGBUILD fix-broken-printer-naming.diff)
Date: Wednesday, December 11, 2019 @ 06:46:34 Author: andyrtr Revision: 370648 upgpkg: hplip 1:3.19.11-5: fix more colorlaserjet printers not detected FS#64801 Added: hplip/trunk/fix-broken-printer-naming.diff Modified: hplip/trunk/PKGBUILD + PKGBUILD | 13 +++-- fix-broken-printer-naming.diff | 38 ++ 2 files changed, 45 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-11 06:05:34 UTC (rev 370647) +++ PKGBUILD2019-12-11 06:46:34 UTC (rev 370648) @@ -5,7 +5,7 @@ pkgname=hplip pkgver=3.19.11 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('x86_64') @@ -28,13 +28,15 @@ disable_upgrade.patch 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch -0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) +0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch +fix-broken-printer-naming.diff) sha512sums=('f419de0e18937c93c2727f4d8b4f7bf1fcc24961a6b7a0d043ce8341c65d0c0332cd354c0cd907b85bc6ccc7735d23ba5f2c918dba5bf965540291cfcbe032d5' 'SKIP' 'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c68f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525' '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67' '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff' - '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b') + '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b' + '450e0e77954a9d919bbde0a4b9d630920a1225679121f94d6854e16ce9b2f8ed8c4de7ddf629012b9f9d24d075a407a4077d1710ad9d023742f402b4d139a111') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) prepare() { @@ -49,10 +51,9 @@ patch -Np1 -i "${srcdir}"/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch # remove binary blob libImageProcessor and all linking - FS#59681 patch -Np1 -i "${srcdir}"/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch + # fix broken printer naming FS#64420, FS#64801 + patch -Np1 -i "${srcdir}"/fix-broken-printer-naming.diff - # fix broken printer naming FS#64420 - sed -i "s/\[hp_color_laserjet_mfp_m278-m281\]/\[hp_colorlaserjet_mfp_m278-m281\]/" data/models/models.dat - export AUTOMAKE='automake --foreign' autoreconf --force --install } Added: fix-broken-printer-naming.diff === --- fix-broken-printer-naming.diff (rev 0) +++ fix-broken-printer-naming.diff 2019-12-11 06:46:34 UTC (rev 370648) @@ -0,0 +1,38 @@ +--- hplip-3.19.11/data/models/models.dat 2019-11-04 11:38:24.0 +0100 hplip-3.19.11/data/models/models.dat.new 2019-12-11 07:37:22.969133967 +0100 +@@ -61795,7 +61795,7 @@ + usb-vid=3f0 + wifi-config=0 + +-[hp_color_laserjet_m253-m254] ++[hp_colorlaserjet_m253-m254] + align-type=0 + clean-type=0 + color-cal-type=0 +@@ -61846,7 +61846,7 @@ + wifi-config=0 + + +-[hp_color_laserjet_mfp_m178-m181] ++[hp_colorlaserjet_mfp_m178-m181] + align-type=0 + clean-type=0 + color-cal-type=0 +@@ -61896,7 +61896,7 @@ + usb-vid=3f0 + wifi-config=3 + +-[hp_color_laserjet_mfp_m278-m281] ++[hp_colorlaserjet_mfp_m278-m281] + align-type=0 + clean-type=0 + color-cal-type=0 +@@ -61947,7 +61947,7 @@ + usb-vid=3f0 + wifi-config=3 + +-[hp_color_laserjet_m153-m154] ++[hp_colorlaserjet_m153-m154] + align-type=0 + clean-type=0 + color-cal-type=0