diff --git a/hplip-fab-import.patch b/hplip-fab-import.patch new file mode 100644 index 0000000..0d2e94b --- /dev/null +++ b/hplip-fab-import.patch @@ -0,0 +1,13 @@ +diff --git a/ui5/fabwindow.py b/ui5/fabwindow.py +index 0b95c94..631727c 100644 +--- a/ui5/fabwindow.py ++++ b/ui5/fabwindow.py +@@ -518,7 +518,7 @@ class FABWindow(QMainWindow, Ui_MainWindow): + self.__tr("Import fax addresses from LDIF or vCard"), + #user_conf.workingDirectory(), + self.user_settings.working_dir, +- "vCard (*.vcf);;LDIF (*.ldif *.ldi)")) ++ "vCard (*.vcf);;LDIF (*.ldif *.ldi)")[0]) + + if result: + working_directory = to_unicode(os.path.dirname(result)) diff --git a/hplip.spec b/hplip.spec index 451cd62..8910dfd 100644 --- a/hplip.spec +++ b/hplip.spec @@ -168,6 +168,10 @@ Patch58: hplip-timeb-removed.patch # non-sudoers cannot authenticate # reported upstream https://bugs.launchpad.net/hplip/+bug/1904888 Patch59: hplip-check-userperms.patch +# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly +# getOpenFileName returns a tuple, but hp-fab expects a simple variable +# reported upstream as https://bugs.launchpad.net/hplip/+bug/1914743 +Patch60: hplip-fab-import.patch %if 0%{?fedora} || 0%{?rhel} <= 8 # mention hplip-gui if you want to have GUI @@ -456,6 +460,8 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h %patch58 -p1 -b .timed-removed # 1899410 - non-sudoers cannot authenticate because of bad username in prompt %patch59 -p1 -b .check-userperms +# 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly +%patch60 -p1 -b .fab-import %if 0%{?fedora} || 0%{?rhel} <= 8 # mention hplip-gui should be installed if you want GUI @@ -806,6 +812,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %changelog * Fri Feb 05 2021 Zdenek Dohnal - 3.20.11-5 - 1925259 - %pre scriptlet enables and starts cups.service, which is unnecessary +- 1919556 - hp-fab crashed: QFileDialog.getOpenFileName is not used correctly * Tue Feb 02 2021 Zdenek Dohnal - 3.20.11-4 - 1912147 - Enable matching for '_series' drivers in PPD search algorithm