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

Avoid KeyError in ui4/wifisetupdialog.py (bug ).

Browse Source 
Corrected IEEE 1284 Device IDs:
LaserJet 1300 (bug )
LaserJet 3390 (bug )
LaserJet P1505 (bug )
This commit is contained in:
Jiri Popelka 2011-03-01 18:33:31 +01:00
parent c737dc0422
commit 6fc5b7a991
4 changed files with 212 additions and 135 deletions

277
hplip-deviceIDs-drv.patch
View File

File diff suppressed because it is too large Load Diff

44
hplip-deviceIDs-ppd.patch
View File

@ -63,6 +63,39 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd
--- hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd 2011-03-01 16:24:24.000000000 +0100
+++ hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd 2011-03-01 18:23:13.000000000 +0100
@@ -60,6 +60,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1300n)"
*Product: "(HP LaserJet 1300n)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd
--- hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd 2011-03-01 16:24:24.000000000 +0100
+++ hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd 2011-03-01 18:23:30.000000000 +0100
@@ -60,6 +60,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1300n)"
*Product: "(HP LaserJet 1300n)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd
--- hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd 2011-03-01 16:24:24.000000000 +0100
+++ hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd 2011-03-01 18:23:44.000000000 +0100
@@ -60,6 +60,7 @@
*Product: "(Hewlett-Packard hp LaserJet 1300n)"
*Product: "(HP LaserJet 1300n)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd
--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000
@ -184,6 +217,17 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hpl
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
*PSVersion: "(3010.107) 0"
*%=================================================
diff -up hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd
--- hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd 2011-03-01 18:27:07.000000000 +0100
+++ hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd 2011-03-01 18:29:45.000000000 +0100
@@ -62,6 +62,7 @@
*Product: "(HP LaserJet 3390)"
*Product: "(Hewlett-Packard HP LaserJet 3390)"
*Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;"
*PSVersion: "(2014.116) 0"
*%=================================================
diff -up hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd
--- hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd 2010-09-13 12:42:36.000000000 +0200

12
hplip-wifisetup.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup hplip-3.11.1/ui4/wifisetupdialog.py
--- hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup 2011-01-19 06:18:20.000000000 +0100
+++ hplip-3.11.1/ui4/wifisetupdialog.py 2011-03-01 15:39:02.000000000 +0100
@@ -301,7 +301,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog
self.dev.close()
endWaitCursor()
- self.num_networks = self.networks['numberofscanentries']
+ self.num_networks = self.networks.get('numberofscanentries')
self.clearNetworksTable()
if self.num_networks:

14
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.11.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -44,6 +44,7 @@ Patch32: hplip-newline.patch
Patch33: hplip-dbus-threads.patch
Patch34: hplip-notification-exception.patch
Patch35: hplip-CVE-2010-4267.patch
Patch36: hplip-wifisetup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -154,6 +155,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Corrected several IEEE 1284 Device IDs using foomatic data.
# HP LaserJet P1007 (bug #585272).
# HP LaserJet P1505 (bug #680951).
# HP Color LaserJet CM1312nfi (bug #581005).
# HP Color LaserJet 3800 (bug #581935).
# HP Color LaserJet 2840 (bug #582215).
@ -286,6 +288,9 @@ done
# vulnerability (bug #670252).
%patch35 -p1 -b .CVE-2010-4267
# Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
%patch36 -p1 -b .wifisetup
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -513,6 +518,13 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
* Tue Mar 1 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.1-3
- Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
- Corrected IEEE 1284 Device IDs:
LaserJet 1300 (bug #670548)
LaserJet 3390 (bug #678565)
LaserJet P1505 (bug #680951)
* Fri Feb 4 2011 Tim Waugh <twaugh@redhat.com> - 3.11.1-2
- Fixed typo causing ";marker-supply-low-warning" state reason to be
reported by hpijs (bug #675151).