From 87bab890b5dd2b562ee46ac572433fa3b649c1c5 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 11 Nov 2010 15:11:41 +0100 Subject: [PATCH] Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834). --- hplip-emit-SIGNAL.patch | 21 +++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 hplip-emit-SIGNAL.patch diff --git a/hplip-emit-SIGNAL.patch b/hplip-emit-SIGNAL.patch new file mode 100644 index 0000000..e627fd5 --- /dev/null +++ b/hplip-emit-SIGNAL.patch @@ -0,0 +1,21 @@ +diff -up hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL hplip-3.10.9/ui4/setupdialog.py +--- hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL 2010-11-10 18:42:13.000000000 +0100 ++++ hplip-3.10.9/ui4/setupdialog.py 2010-11-11 11:59:47.000000000 +0100 +@@ -868,7 +868,7 @@ class SetupDialog(QDialog, Ui_Dialog): + self.printer_name_ok = True + + self.FaxNameLineEdit.emit(SIGNAL("textChanged(const QString &)"), +- (self.FaxNameLineEdit.text(),)) ++ self.FaxNameLineEdit.text()) + + self.setIndicators() + self.setAddPrinterButton() +@@ -900,7 +900,7 @@ class SetupDialog(QDialog, Ui_Dialog): + self.fax_name_ok = True + + self.PrinterNameLineEdit.emit(SIGNAL("textChanged(const QString&)"), +- (self.PrinterNameLineEdit.text(),)) ++ self.PrinterNameLineEdit.text()) + + self.setIndicators() + self.setAddPrinterButton() diff --git a/hplip.spec b/hplip.spec index 0b3cd75..c10a29d 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.9 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -40,6 +40,7 @@ Patch23: hplip-network-timeout.patch Patch24: hplip-addgroup.patch Patch25: hplip-raw_deviceID-traceback.patch Patch26: hplip-UnicodeDecodeError.patch +Patch27: hplip-emit-SIGNAL.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -246,6 +247,9 @@ done # Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739). %patch26 -p1 -b .UnicodeDecodeError +# Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834). +%patch27 -p1 -b .emit-SIGNAL + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -472,6 +476,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Thu Nov 1 2010 Jiri Popelka 3.10.9-5 +- Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834). + * Sun Oct 24 2010 Jiri Popelka 3.10.9-4 - Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739).