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

Fix prep phase

Browse Source
This commit is contained in:
Zdenek Dohnal 2022-05-11 13:38:09 +02:00
parent 129beeedb9
commit eabb56cabe
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hplip-systray-qt5.patch
View File

@ -1,14 +0,0 @@
diff --git a/base/module.py b/base/module.py
index 04ac5b8..56be168 100644
--- a/base/module.py
+++ b/base/module.py
@@ -301,6 +301,9 @@ class Module(object):
if UI_TOOLKIT_QT4 in self.supported_ui_toolkits and UI_TOOLKIT_QT4 in self.installed_ui_toolkits:
long_params.extend(['qt4', 'use-qt4'])
+ if UI_TOOLKIT_QT5 in self.supported_ui_toolkits and UI_TOOLKIT_QT5 in self.installed_ui_toolkits:
+ long_params.extend(['qt5', 'use-qt5'])
+
if extra_params is not None:
params = ''.join([params, extra_params])

21
hplip.spec
View File

@ -178,20 +178,17 @@ Patch55: hplip-fab-import.patch
# it fails further down - break out earlier with a message
# reported upstream as https://bugs.launchpad.net/hplip/+bug/1916114
Patch56: hplip-hpsetup-noscanjets.patch
# 1951922 - hp-systray doesn't support a valid --qt5 option
# reported upstream https://bugs.launchpad.net/hplip/+bug/1925480
Patch57: hplip-systray-qt5.patch
# 1963114 - patch for hplip firmware load timeout fix
# reported upstream https://bugs.launchpad.net/hplip/+bug/1922404
Patch58: hplip-hpfirmware-timeout.patch
Patch57: hplip-hpfirmware-timeout.patch
# 1985251 - Incorrect permission for gpg directory
# reported upstream https://bugs.launchpad.net/hplip/+bug/1938442
Patch59: hplip-gpgdir-perms.patch
Patch58: hplip-gpgdir-perms.patch
# 1987141 - hp-plugin installs malformed udev files
# reported upstream https://bugs.launchpad.net/hplip/+bug/1847477
Patch60: hplip-plugin-udevissues.patch
Patch59: hplip-plugin-udevissues.patch
# reported upstream https://bugs.launchpad.net/hplip/+bug/1938504
Patch61: hplip-osname-mismatch.patch
Patch60: hplip-osname-mismatch.patch
%if 0%{?fedora} || 0%{?rhel} <= 8
# mention hplip-gui if you want to have GUI
@ -498,16 +495,14 @@ done
# if an user tries to install scanner via hp-setup (printer/fax utility)
# it fails further down - break out earlier with a message
%patch56 -p1 -b .hpsetup-noscanjets
# 1951922 - hp-systray doesn't support a valid --qt5 option
%patch57 -p1 -b .systray-qt5
# 1963114 - patch for hplip firmware load timeout fix
%patch58 -p1 -b .hpfirmware-timeout
%patch57 -p1 -b .hpfirmware-timeout
# 1985251 - Incorrect permission for gpg directory
%patch59 -p1 -b .gpgdir-perms
%patch58 -p1 -b .gpgdir-perms
# 1987141 - hp-plugin installs malformed udev files
%patch60 -p1 -b .hpplugin-udevperms
%patch59 -p1 -b .hpplugin-udevperms
# upstream bug https://bugs.launchpad.net/hplip/+bug/1938504
%patch61 -p1 -b .osname-mismatch
%patch60 -p1 -b .osname-mismatch
%if 0%{?fedora} || 0%{?rhel} <= 8
# mention hplip-gui should be installed if you want GUI