Revision bump. Add systray segfault patch from upstream reported by netfab in bug...

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index a2c1389ef71473f2629fd87460e9a3d0415a3d2d..bbf7a2a247d84a1314b5ea665673197bf02b4baa 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.152 2010/03/30 17:32:44 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.153 2010/03/31 18:50:24 billie Exp $
+
+*hplip-3.10.2-r3 (31 Mar 2010)
+
+  31 Mar 2010; Daniel Pielmeier <billie@gentoo.org> -files/70-hpmud.rules,
+  -hplip-3.10.2-r2.ebuild, +hplip-3.10.2-r3.ebuild,
+  +files/hplip-3.10.2-systray-segfault.patch:
+  Revision bump. Add systray segfault patch from upstream reported by netfab
+  in bug #312301. Remove needless rules file.
 
 *hplip-3.10.2-r2 (30 Mar 2010)
 

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 407e524c3a0d7adb4b858538bcf8128a49546a2a..6f33c799f8d78cd7c54c80a8f65befb7f8116916 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,5 +1,5 @@
-AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
 AUX hplip-3.10.2-plugin.patch 358 RMD160 a76e1bee114cc26a9af0d031414aed7f7c453712 SHA1 957a10944194c52fbd1346e201bbad9f06bd97bf SHA256 5f85766990d74a1c26685abfe95b46dc87d7ebc52c9b595f994a81af89284494
+AUX hplip-3.10.2-systray-segfault.patch 469 RMD160 df64dea9bcec386a6fe4263377e8f85daa06898f SHA1 3d3d88e1f7b7a2af194e3c33164ce41e6f1f6f05 SHA256 a92efb69afa908875775a501d7b723e3e0d315c81fa52cea25f32b994046598f
 AUX hplip-3.10.2-udev-attrs.patch 13229 RMD160 66993f5103689e136e2d13d28d95f6e4fb1617d3 SHA1 917aa0e1f1569d8235a1b6aed91cad2ff2974f00 SHA256 89ab7c0816b9cd49dd4dd64f2d335e71c1370d96fc2a3c77dadd4702b168934a
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.10-desktop.patch 492 RMD160 52a8bcf1544d0073920e00a383aeb22a9caf5487 SHA1 9394a73448b7b1b3ab1a014ab63b9edc731def66 SHA256 04bb5ef5ee4145eadc5f9e6498ca8a2d3d2277569b179263cb86f0f56231e462
@@ -8,8 +8,8 @@ AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.10.2.tar.gz 21446275 RMD160 4483bd497bbc272812c31db574b75f6e5c03b391 SHA1 7cdbb879cc122152aa9e3d5dc2d7dd3baf3b0604 SHA256 bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
-EBUILD hplip-3.10.2-r2.ebuild 7809 RMD160 ecbd77f48b889ed4d1f72761ad7fa8290e5dc214 SHA1 cc35e40963d6b46718a7fd6730dee7d1a817d494 SHA256 d82ce422d8361b1268eae4b5bff67d43da45a3dda58e3c0a707c0c78366098d9
+EBUILD hplip-3.10.2-r3.ebuild 7806 RMD160 d78ae87c8a817868c8e07d3911481a6a8344f19e SHA1 c4a39b387755fbe696725a794571a6ee17140a37 SHA256 834ab992fa5af86be86464afa73bb7ee1bbaa47e6a2dc9ac4f0208a144d2f43f
 EBUILD hplip-3.10.2.ebuild 7568 RMD160 cdbbc568a56dca290cedbb8f93a6249fe19e9aa4 SHA1 4833099366e43895c4580c84117b1ec87d10b590 SHA256 2e820ee692618aaa5a2a4e61350f8d178cbcad39fca7139fc6ce6b72162f304f
 EBUILD hplip-3.9.12-r1.ebuild 8273 RMD160 8574eb70cddf9e2674eafa502eb7b789fb5b0f7c SHA1 d388576e5511bef896d1fb124aa956b8ab1eefec SHA256 4674b6fa5e1d53e2bac0af0f935cb67adf55d337127f4858dcb6f8f3adb2dc5a
-MISC ChangeLog 26687 RMD160 e1e04fecea23e5acdf38d501ea034bf9d21b3f88 SHA1 4548b11e0e9ba266f066c45b92d6db2d8fdd34ae SHA256 1cf1b470a2d99a97ca488a3ef58bfd6911aee1f17d9aa59868db2fc2317569b6
+MISC ChangeLog 27016 RMD160 72e96e5659ea60458a2bb04817df7990fdb69274 SHA1 28e45c6f7dda3425f4d85d626bcecd5b6ee05ec2 SHA256 cee8d5dfe62c1c8b16efc7378ce5f400c05d5078ebc652695d3c2bc2689b732e
 MISC metadata.xml 2039 RMD160 bd9dc1def4196adc557ea33ce4dd808412fdbbfc SHA1 06ac684e6ba4b5ae416f5e2b06823fa52a3cb151 SHA256 6f7fe846747cf8188cb01453bfd332eeac30c5c589883e471a7af8085fab0c79

diff --git a/net-print/hplip/files/70-hpmud.rules b/net-print/hplip/files/70-hpmud.rules
deleted file mode 100644 (file)
index 1e6ab66..0000000
--- a/net-print/hplip/files/70-hpmud.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-# Udev rules file for HP printer products.
-
-ACTION!="add", GOTO="hpmud_rules_end"
-
-SUBSYSTEM!="usb|usb_device", GOTO="hpmud_rules_end"
-SUBSYSTEM=="usb", ENV{DEVTYPE}!="usb_device" ,GOTO="hpmud_rules_end"
-
-# Check for AiO products (0x03f0xx11).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", GROUP="lp"
-# Check for Photosmart products (0x03f0xx02).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??02", GROUP="lp"
-# Check for Business Inkjet products (0x03f0xx12).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", GROUP="lp"
-# Check for Deskjet products (0x03f0xx04).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", GROUP="lp"
-# Check for LaserJet products (0x03f0xx17).
-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", GROUP="lp"
-
-LABEL="hpmud_rules_end"

diff --git a/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch b/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch
new file mode 100644 (file)
index 0000000..9e42c1c
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.9.8/ui4/systemtray.py.tray-icon-crash hplip-3.9.8/ui4/systemtray.py
+--- hplip-3.9.8/ui4/systemtray.py.tray-icon-crash      2010-03-23 16:36:55.545632224 +0000
++++ hplip-3.9.8/ui4/systemtray.py      2010-03-23 16:37:51.944509885 +0000
+@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication):
+         log.debug("Exiting")
+         self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT)
+         self.quit()
++        del self.tray_icon
+ 
+ 
+     def toolboxTriggered(self):

diff --git a/net-print/hplip/hplip-3.10.2-r2.ebuild b/net-print/hplip/hplip-3.10.2-r3.ebuild
similarity index 97%
rename from net-print/hplip/hplip-3.10.2-r2.ebuild
rename to net-print/hplip/hplip-3.10.2-r3.ebuild
index 495d20099a2e9d6029742b67b7ba7db55ab45a26..762568a24e81a281023a6f385f7a3088ae86d84f 100644 (file)
--- a/net-print/hplip/hplip-3.10.2-r2.ebuild
+++ b/net-print/hplip/hplip-3.10.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2-r2.ebuild,v 1.1 2010/03/30 17:32:44 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2-r3.ebuild,v 1.1 2010/03/31 18:50:24 billie Exp $
 
 EAPI=2
 
@@ -124,6 +124,10 @@ src_prepare() {
        # Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
        epatch "${FILESDIR}"/${P}-udev-attrs.patch
 
+       # Fix crash when trying to close the systray
+       # Upstream bug: https://bugs.launchpad.net/hplip/+bug/486698
+       epatch "${FILESDIR}"/${P}-systray-segfault.patch
+
        # Force recognition of Gentoo distro by hp-check
        sed -i \
                -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
@@ -244,9 +248,6 @@ pkg_postinst() {
        elog "If your device is connected using USB, users will need to be in the lp group to"
        elog "access it."
        elog
-       elog "This release doesn't use an init script anymore, so you should probably do a"
-       elog "'rc-update del hplip' if you are updating from an old version."
-       elog
        elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
        elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
        elog "If you prefer the SLP method you have to choose this when configuring the"