[arch-commits] Commit in hplip/trunk (PKGBUILD python.patch)

2019-01-29 Thread Andreas Radke via arch-commits 
Date: Wednesday, January 30, 2019 @ 06:53:09
  Author: andyrtr
Revision: 344934

upgpkg: hplip 1:3.19.1-1

upstream update 3.19.1

Modified:
  hplip/trunk/PKGBUILD
Deleted:
  hplip/trunk/python.patch

--+
 PKGBUILD |   14 +-
 python.patch |   11 ---
 2 files changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-29 21:43:33 UTC (rev 344933)
+++ PKGBUILD2019-01-30 06:53:09 UTC (rev 344934)
@@ -4,8 +4,8 @@
 # Contributor: Morgan LEFIEUX 
 
 pkgname=hplip
-pkgver=3.18.12
-pkgrel=2
+pkgver=3.19.1
+pkgrel=1
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
 arch=('x86_64')
@@ -28,15 +28,13 @@
 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
-python.patch)
-sha512sums=('7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635'
+0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch)
+sha512sums=('b1d663a3538a19ab2c195bc627c765b9dded047b0431f6fc2096a8a31b4efb5cf52c88ad9665a2d78893ba66c1c47ccf79c161965f308a27eeeb11b156b446c8'
 'SKIP'
 
'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c68f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
 
'22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
 
'763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
-
'8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
-
'ebcc40cac00b9fb63d378d42ac258eeaf6e0967f34fd1e204c690f34457a0a2b634ef65f1deb79a0740d8c6047f718c10fa205ee2f239b667f7e06c065590528')
+
'8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
 
 prepare() {
@@ -51,8 +49,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 python issue - FS#59548
- patch -Np1 -i ${srcdir}/python.patch
 
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install

Deleted: python.patch
===
--- python.patch2019-01-29 21:43:33 UTC (rev 344933)
+++ python.patch2019-01-30 06:53:09 UTC (rev 344934)
@@ -1,11 +0,0 @@
 hplip-3.18.7/base/utils.py 2018-07-15 22:08:37.0 +0200
-+++ hplip-3.18.7/base/utils.py.new 2018-08-08 21:46:48.721947940 +0200
-@@ -265,7 +265,7 @@
- try:
- names = os.listdir(root)
- except os.error:
--raise StopIteration
-+return
- 
- pattern = pattern or '*'
- pat_list = pattern.split(';')

[arch-commits] Commit in hplip/trunk (PKGBUILD python.patch)

2018-11-04 Thread Andreas Radke via arch-commits 
Date: Sunday, November 4, 2018 @ 18:15:16
  Author: andyrtr
Revision: 337841

upgpkg: hplip 1:3.18.10-2

readd python 3.7 patch

Added:
  hplip/trunk/python.patch
Modified:
  hplip/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 python.patch |   11 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-04 18:06:24 UTC (rev 337840)
+++ PKGBUILD2018-11-04 18:15:16 UTC (rev 337841)
@@ -5,7 +5,7 @@
 
 pkgname=hplip
 pkgver=3.18.10
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
 arch=('x86_64')
@@ -29,13 +29,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
+python.patch)
 
sha512sums=('8e744608f1da0e24afbeea814973363d95bbff15a7430c8471d5a53c4a9e772b141e5cd7e69ea03826d1b2e4544e9aabaedc148f2b6577339ef9b2a6d4431c96'
 'SKIP'
 
'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c68f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
 
'22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
 
'763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
-
'8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b')
+
'8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
+
'ebcc40cac00b9fb63d378d42ac258eeaf6e0967f34fd1e204c690f34457a0a2b634ef65f1deb79a0740d8c6047f718c10fa205ee2f239b667f7e06c065590528')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
 
 prepare() {
@@ -50,6 +52,8 @@
  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 python issue - FS#59548
+ patch -Np1 -i ${srcdir}/python.patch
 
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install

Added: python.patch
===
--- python.patch(rev 0)
+++ python.patch2018-11-04 18:15:16 UTC (rev 337841)
@@ -0,0 +1,11 @@
+--- hplip-3.18.7/base/utils.py 2018-07-15 22:08:37.0 +0200
 hplip-3.18.7/base/utils.py.new 2018-08-08 21:46:48.721947940 +0200
+@@ -265,7 +265,7 @@
+ try:
+ names = os.listdir(root)
+ except os.error:
+-raise StopIteration
++return
+ 
+ pattern = pattern or '*'
+ pat_list = pattern.split(';')

[arch-commits] Commit in hplip/trunk (PKGBUILD python.patch)

2018-08-08 Thread Andreas Radke via arch-commits 
Date: Wednesday, August 8, 2018 @ 19:58:47
  Author: andyrtr
Revision: 331262

upgpkg: hplip 3.18.7-3

fix python error - FS#59548; add custom license file to cover all various 
licenses

Added:
  hplip/trunk/python.patch
Modified:
  hplip/trunk/PKGBUILD

--+
 PKGBUILD |   15 +++
 python.patch |   11 +++
 2 files changed, 22 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-08 19:38:50 UTC (rev 331261)
+++ PKGBUILD2018-08-08 19:58:47 UTC (rev 331262)
@@ -6,11 +6,11 @@
 
 pkgname=hplip
 pkgver=3.18.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
 arch=('x86_64')
 url="http://hplipopensource.com;
-license=('GPL')
+license=('GPL2' 'custom')
 depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
 makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
 optdepends=('cups: for printing support'
@@ -29,13 +29,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
-fix_install.patch)
+fix_install.patch
+python.patch)
 sha1sums=('bb40807ac77fb9b1f6d80a53d5409a22f5d2d197'
   'SKIP'
   '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
   '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5'
   '0e36f31b98faf2f14137431bc8f82b74de22705b'
-  '759de18bfef699ac2f605962dafee1431e7b5e3b')
+  '759de18bfef699ac2f605962dafee1431e7b5e3b'
+  '72db2c60f63c9be2a98a46ec4bcccd3a8a5b935b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux 
Imaging and Printing) 
 
 prepare() {
@@ -50,6 +52,8 @@
  patch -Np1 -i 
${srcdir}/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
  # fix installation of missing library - FS#59548
  patch -Np1 -i ${srcdir}/fix_install.patch
+ # fix python issue - FS#59548
+ patch -Np1 -i ${srcdir}/python.patch
 
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
@@ -80,4 +84,7 @@
  
  # remove rc script
  rm -vrf "$pkgdir"/etc/init.d
+
+ # add mixed license file
+ install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 COPYING
 }

Added: python.patch
===
--- python.patch(rev 0)
+++ python.patch2018-08-08 19:58:47 UTC (rev 331262)
@@ -0,0 +1,11 @@
+--- hplip-3.18.7/base/utils.py 2018-07-15 22:08:37.0 +0200
 hplip-3.18.7/base/utils.py.new 2018-08-08 21:46:48.721947940 +0200
+@@ -265,7 +265,7 @@
+ try:
+ names = os.listdir(root)
+ except os.error:
+-raise StopIteration
++return
+ 
+ pattern = pattern or '*'
+ pat_list = pattern.split(';')