diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2010-05-04 17:52:11 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2010-05-04 17:52:11 +0000 |
| commit | f79a72d326efdb223aa130951666965d0cb1a895 (patch) | |
| tree | 895aedadcb14ae1201f10b1608da4420fd2e3e94 /net-print/hplip | |
| parent | Bug #318217: Version bump. (diff) | |
| download | gentoo-2-f79a72d326efdb223aa130951666965d0cb1a895.tar.gz gentoo-2-f79a72d326efdb223aa130951666965d0cb1a895.tar.bz2 gentoo-2-f79a72d326efdb223aa130951666965d0cb1a895.zip | |
Another try to fix plugin installation. This should fix bug #274538 and #316777.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'net-print/hplip')
| -rw-r--r-- | net-print/hplip/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/hplip/files/hplip-3.10.2-plugin.patch | 22 |
2 files changed, 17 insertions, 12 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index f3dd38a69c8d..beaf29af18b6 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,11 @@ # 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.156 2010/04/17 17:41:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.157 2010/05/04 17:52:11 billie Exp $ + + 04 May 2010; Daniel Pielmeier <billie@gentoo.org> + files/hplip-3.10.2-plugin.patch: + Another try to fix plugin installation. This should fix bug #274538 and + #316777. 17 Apr 2010; Raúl Porcel <armin76@gentoo.org> hplip-3.9.12-r1.ebuild, hplip-3.10.2-r4.ebuild: diff --git a/net-print/hplip/files/hplip-3.10.2-plugin.patch b/net-print/hplip/files/hplip-3.10.2-plugin.patch index 9958cde5dcf5..c59c5a8d4b4f 100644 --- a/net-print/hplip/files/hplip-3.10.2-plugin.patch +++ b/net-print/hplip/files/hplip-3.10.2-plugin.patch @@ -1,11 +1,11 @@ ---- setup.py.old 2010-03-20 17:38:16.061877304 +0100 -+++ setup.py 2010-03-20 17:40:27.328531289 +0100 -@@ -370,7 +370,7 @@ - - if hp_plugin: - if prop.gui_build: -- os.system("hp-plugin -i") -+ os.system("hp-plugin --required") - else: - os.system("hp-plugin") - +--- installer/core_install.py.old 2010-02-25 00:07:12.000000000 +0100 ++++ installer/core_install.py 2010-05-04 19:25:42.268075063 +0200 +@@ -1990,7 +1990,7 @@ + if mode == GUI_MODE:
+ return os.system("sh %s --nox11 -- -u" % plugin_file) == 0
+ else:
+- return os.system("sh %s --nox11 -- -i" % plugin_file) == 0
++ return os.system("sh %s --nox11" % plugin_file) == 0
+
+
+ def delete_plugin(self):
|