pool/hplip
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 764104 from home:mwilck:branches:Printing

Browse Source 
- Revert changes from 3.18.5 that break hp-setup for fax devices
  (bsc#110771, lp#1773320)
  * Added patch: Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch

OBS-URL: https://build.opensuse.org/request/show/764104
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=187
This commit is contained in:
Martin Wilck 2020-01-13 17:43:38 +00:00 committed by Git OBS Bridge
parent fb37b543c7
commit 41f0dd5484
3 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch Normal file
View File

@ -0,0 +1,60 @@
From af8ddd502a88f8dc0910c2c9a91471be8434af61 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Mon, 13 Jan 2020 18:20:22 +0100
Subject: [PATCH] Revert changes from 3.18.5 that break hp-setup for fax
devices
See bsc#1107711, lp#1773320
https://launchpadlibrarian.net/371794274/hplip-use-binary-str.patch
Credits: Eric Schirra <ecsos@schirra.net>
---
base/utils.py | 5 +----
fax/pmlfax.py | 8 ++++----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/base/utils.py b/base/utils.py
index f268cf8..cc77820 100644
--- a/base/utils.py
+++ b/base/utils.py
@@ -954,10 +954,7 @@ else:
def printable(s):
- if s:
- return s.translate(identity, unprintable)
- else:
- return ""
+ return s.translate(identity, unprintable)
def any(S,f=lambda x:x):
diff --git a/fax/pmlfax.py b/fax/pmlfax.py
index adcc1cb..b68ff6a 100644
--- a/fax/pmlfax.py
+++ b/fax/pmlfax.py
@@ -143,8 +143,8 @@ class PMLFaxDevice(FaxDevice):
def getPhoneNum(self):
if PY3:
- data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
- return data
+ data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1].encode('utf-8'))
+ return data.decode('utf-8')
else:
return utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
phone_num = property(getPhoneNum, setPhoneNum, doc="OID_FAX_LOCAL_PHONE_NUM")
@@ -155,8 +155,8 @@ class PMLFaxDevice(FaxDevice):
def getStationName(self):
if PY3:
- data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1])
- return data
+ data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1].encode('utf-8'))
+ return data.decode('utf-8')
else:
return utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1])
--
2.24.1

7
hplip.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 13 17:27:20 UTC 2020 - Martin Wilck <mwilck@suse.com>
- Revert changes from 3.18.5 that break hp-setup for fax devices
(bsc#110771, lp#1773320)
* Added patch: Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch
-------------------------------------------------------------------
Fri Jan 10 13:52:53 UTC 2020 - Martin Wilck <mwilck@suse.com>

3
hplip.spec
View File

@ -81,6 +81,8 @@ Patch401: hplip-orblite-return-null.diff
# Use a pgp server (pool.sks-keyservers.net) which doesn't throw proxy errors
# or run into timeouts most of the time
Patch402: hplip-change-pgp-server.patch
# boo#1107711
Patch403: Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch
BuildRequires: %{pymod devel}
BuildRequires: %{pymod qt5-devel}
BuildRequires: %{pymod xml}
@ -314,6 +316,7 @@ This sub-package is only required by developers.
%patch400 -p1
%patch401 -p1
%patch402 -p1
%patch403 -p1
# replace "env" shebang and "/usr/bin/python" with real executable
find . -name '*.py' -o -name pstotiff | \