[arch-commits] Commit in hplip/trunk (2 files)

Andreas Radke andyrtr at archlinux.org
Tue May 1 18:12:17 UTC 2018


    Date: Tuesday, May 1, 2018 @ 18:12:17
  Author: andyrtr
Revision: 323261

upgpkg: hplip 3.18.4-2

fix UnicodeDecodeError - FS#58412

Added:
  hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
Modified:
  hplip/trunk/PKGBUILD

-----------------------------------------------------------+
 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch |   29 ++++++++++++
 PKGBUILD                                                  |    7 ++
 2 files changed, 34 insertions(+), 2 deletions(-)

Added: 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
===================================================================
--- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch	                        (rev 0)
+++ 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch	2018-05-01 18:12:17 UTC (rev 323261)
@@ -0,0 +1,29 @@
+From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001
+From: Gaurav Sood <gaurav-sood at invalid-email.launchpad.net>
+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):

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-01 17:48:15 UTC (rev 323260)
+++ PKGBUILD	2018-05-01 18:12:17 UTC (rev 323261)
@@ -6,7 +6,7 @@
 
 pkgname=hplip
 pkgver=3.18.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
 url="http://hplipopensource.com"
@@ -28,11 +28,13 @@
 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
+        0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
         hplip-colorlaserjet-mfp-m278-m281.patch)
 sha1sums=('80b7c35adaa287ff51aa6938bf52046d06a32058'
           'SKIP'
           '2348bcbca0c52dc09cceb47ed13281a4ccb9d83e'
           '2ef86972ab51c0fdcb8bfc653b9f6f69459449a5'
+          '0e36f31b98faf2f14137431bc8f82b74de22705b'
           '89e0ed0ed9acc6e50812c843ffb5f996fffb829e')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
@@ -44,7 +46,8 @@
  
  # add missing 'include <cups/ppd.h>' 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
  # add support for some missing models - FS#57683
  patch -Np1 -i ${srcdir}/hplip-colorlaserjet-mfp-m278-m281.patch
 



More information about the arch-commits mailing list