rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

1671513 - after 'successful' plugin installation it is not installed

Browse Source
This commit is contained in:
Zdenek Dohnal 2019-02-05 13:42:50 +01:00
parent 03476c5cd1
commit ab2b2991af
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hplip-missing-links.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py
index 4d7c1b8..170cc1a 100755
--- a/installer/pluginhandler.py
+++ b/installer/pluginhandler.py
@@ -164,7 +164,16 @@ class PluginHandle(object):
for src, trg, link in copies:
if link != "":
if not utils.check_library(link):
- self.__plugin_state = PLUGIN_FILES_CORRUPTED
+ if (link != '/usr/lib/i386-linux-gnu/libjpeg.so.9' and
+ link != '/usr/lib/x86_64-linux-gnu/libjpeg.so.9' and
+ link != '/usr/lib64/x86_64-linux-gnu/libjpeg.so.9' and
+ link != '/usr/lib/i386-linux-gnu/sane/libsane-hp2000S1.so' and
+ link != '/usr/lib/i386-linux-gnu/sane/libsane-hp2000S1.so.1' and
+ link != '/usr/lib/x86_64-linux-gnu/sane/libsane-hp2000S1.so' and
+ link != '/usr/lib/x86_64-linux-gnu/sane/libsane-hp2000S1.so.1' and
+ link != '/usr/lib64/x86_64-linux-gnu/sane/libsane-hp2000S1.so' and
+ link != '/usr/lib64/x86_64-linux-gnu/sane/libsane-hp2000S1.so.1'):
+ self.__plugin_state = PLUGIN_FILES_CORRUPTED
def __getPluginInformation(self, callback=None):

16
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.18.12
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC
Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -81,6 +81,15 @@ Patch41: hplip-uiscan-help.patch
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
# reported upstream https://bugs.launchpad.net/hplip/+bug/1814272
Patch42: hplip-add-ppd-crash.patch
# external scripts, which are downloaded and run by hp-plugin, try to create links
# in non-existing dirs. These scripts ignore errors, so plugin is installed fine
# but then internal hp-plugin can check for plugin state, where links are checked too.
# It results in corrupted plugin state, which breaks printer installation by GUI hp-setup.
# Temporary workaround is to ignore these bad links and real fix should come from HP,
# because their external scripts try to create links in non-existing dirs.
# Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
# Reported upstream: https://bugs.launchpad.net/hplip/+bug/1814574
Patch43: hplip-missing-links.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow
@ -323,6 +332,8 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
%patch41 -p1 -b .uiscan-help
# part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
%patch42 -p1 -b .add-ppd-crash
# 1671513 - after 'successful' plugin installation it is not installed
%patch43 -p1 -b .missing-links
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@ -610,6 +621,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog
* Tue Feb 05 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-4
- 1671513 - after 'successful' plugin installation it is not installed
* Fri Feb 01 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-3
- m277-m281 printer support got some fixes, so try to do not use our downstream patch
- hpcups-update-ppds can freeze sometimes, add timeout for to be sure