From 86730d095a36076d7d785f51b0fb65d05c097d0b Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Tue, 4 Sep 2018 14:04:25 -0500 Subject: hplip-1:3.18.6-1.parabola1: updating version --- ...andling-of-unicode-filenames-in-sixext.py.patch | 29 ++++++++++++++++++++++ libre/hplip/PKGBUILD | 26 +++++++++++++++---- libre/hplip/fix_install.patch | 23 +++++++++++++++++ libre/hplip/python.patch | 11 ++++++++ 4 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 libre/hplip/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch create mode 100644 libre/hplip/fix_install.patch create mode 100644 libre/hplip/python.patch diff --git a/libre/hplip/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch b/libre/hplip/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch new file mode 100644 index 000000000..f3a8c1732 --- /dev/null +++ b/libre/hplip/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch @@ -0,0 +1,29 @@ +From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001 +From: Gaurav Sood +Date: Thu, 4 May 2017 18:32:08 +0200 +Subject: Fix handling of unicode filenames in sixext.py + +LP: #1480152 +Closes: #861731 +--- + base/sixext.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/base/sixext.py b/base/sixext.py +index 0bf4fc4f4..311bf72c6 100644 +--- a/base/sixext.py ++++ b/base/sixext.py +@@ -110,11 +110,11 @@ if PY3: + + + def to_string_utf8(s): +- return s.decode("utf-8") ++ return s.decode("utf-8", 'ignore') + + + def to_string_latin(s): +- return s.decode("latin-1") ++ return s.decode("latin-1", 'ignore') + + + def to_unicode(s, enc=None): diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD index 123cd4518..67be94d20 100644 --- a/libre/hplip/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -9,12 +9,13 @@ # Maintainer: Omar Vega Ramos pkgname=hplip -pkgver=3.17.11 +pkgver=3.18.6 pkgrel=1.parabola1 +epoch=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64' 'armv7h') url="http://hplipopensource.com" -license=('GPL') +license=('GPL' 'custom') depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine') makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb') optdepends=('cups: for printing support' @@ -32,11 +33,17 @@ conflicts=(${pkgname}-libre) backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio') source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch - 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) -sha256sums=('2f91be9489a50e4c929b2b9d3c72c09905c1195f9b360568b07fcbde4f3faa75' + 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 + python.patch) +sha256sums=('0ecf3e68b09480f602de81798ac00774cf8ffe754692e784bbbe0f9b2e337b7d' 'SKIP' 'eca366677583122f2e1048103f0d4a2b002a18c1e6d17b0bc71f4067a221fd38' - 'a5ee6546d33db8f41ecea2b377355ce261b3e98d7f9988ee1652f0daebb6d0da') + 'a5ee6546d33db8f41ecea2b377355ce261b3e98d7f9988ee1652f0daebb6d0da' + '85cd7fa2314f217cf8072a2635bff82831564f842dba245e0619e0630a8fc0f5' + '6edaedfd3f0925b099632a7052e054f18549be25381689680e8374c869687dc6' + '7116e9bb1bd9a01b6638dd705671f6e12076b143757edff3273c1cf89a1bbdd1') validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP prepare() { @@ -72,6 +79,12 @@ prepare() { # add missing 'include ' at various places patch -Np1 -i ${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch + # fix some handling unicode file names FS#58412 + 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 @@ -102,4 +115,7 @@ package() { # remove rc script rm -vrf "$pkgdir"/etc/init.d + + # add mixed license file + install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 COPYING } diff --git a/libre/hplip/fix_install.patch b/libre/hplip/fix_install.patch new file mode 100644 index 000000000..adbec2c57 --- /dev/null +++ b/libre/hplip/fix_install.patch @@ -0,0 +1,23 @@ +--- hplip-3.18.7/Makefile.am 2018-07-15 22:08:37.000000000 +0200 ++++ hplip-3.18.7/Makefile.am.new 2018-08-08 19:54:20.671794852 +0200 +@@ -680,14 +680,14 @@ + install-data-hook: + if HPLIP_BUILD + if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ +- cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ +- chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ +- ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ ++ cp prnt/hpcups/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/ ; \ ++ chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_64.so ; \ ++ ln -sf $(libdir)/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \ + fi; \ + if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ +- cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ +- chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ +- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ ++ cp prnt/hpcups/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/ ; \ ++ chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_32.so ; \ ++ ln -sf $(libdir)/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \ + fi + if !HPLIP_CLASS_DRIVER + # If scanner build, add hpaio entry to sane dll.conf. diff --git a/libre/hplip/python.patch b/libre/hplip/python.patch new file mode 100644 index 000000000..b75d1f598 --- /dev/null +++ b/libre/hplip/python.patch @@ -0,0 +1,11 @@ +--- hplip-3.18.7/base/utils.py 2018-07-15 22:08:37.000000000 +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(';') -- cgit v1.2.3