* [gentoo-commits] gentoo-x86 commit in net-print/hplip/files: hplip-3.10.2-plugin.patch
@ 2010-05-04 17:52 Daniel Pielmeier (billie)
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier (billie) @ 2010-05-04 17:52 UTC (permalink / raw
To: gentoo-commits
billie 10/05/04 17:52:11
Modified: hplip-3.10.2-plugin.patch
Log:
Another try to fix plugin installation. This should fix bug #274538 and #316777.
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.2 net-print/hplip/files/hplip-3.10.2-plugin.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?r1=1.1&r2=1.2
Index: hplip-3.10.2-plugin.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-3.10.2-plugin.patch 20 Mar 2010 18:25:32 -0000 1.1
+++ hplip-3.10.2-plugin.patch 4 May 2010 17:52:11 -0000 1.2
@@ -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):
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/hplip/files: hplip-3.10.2-plugin.patch
@ 2010-05-27 20:25 Daniel Pielmeier (billie)
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier (billie) @ 2010-05-27 20:25 UTC (permalink / raw
To: gentoo-commits
billie 10/05/27 20:25:46
Modified: hplip-3.10.2-plugin.patch
Log:
Use upstream patch to fix bug #274538.
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.3 net-print/hplip/files/hplip-3.10.2-plugin.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?r1=1.2&r2=1.3
Index: hplip-3.10.2-plugin.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-3.10.2-plugin.patch 4 May 2010 17:52:11 -0000 1.2
+++ hplip-3.10.2-plugin.patch 27 May 2010 20:25:46 -0000 1.3
@@ -1,11 +1,17 @@
---- 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 @@
+Index: installer/core_install.py
+===================================================================
+--- installer/core_install.py (revision 13658)
++++ installer/core_install.py (working copy)
+@@ -1990,7 +1990,11 @@
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
++ if os.system("sh %s --nox11 -- -i" % plugin_file) == 0:
++ return True
++ else:
++ log.error("Python gobject/dbus may be not installed")
++ return False
def delete_plugin(self):
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/hplip/files: hplip-3.10.2-plugin.patch
@ 2010-05-30 18:58 Daniel Pielmeier (billie)
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier (billie) @ 2010-05-30 18:58 UTC (permalink / raw
To: gentoo-commits
billie 10/05/30 18:58:18
Modified: hplip-3.10.2-plugin.patch
Log:
Update plugin patch as ~arch patch does not seem to like it.
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.4 net-print/hplip/files/hplip-3.10.2-plugin.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?r1=1.3&r2=1.4
Index: hplip-3.10.2-plugin.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-3.10.2-plugin.patch 27 May 2010 20:25:46 -0000 1.3
+++ hplip-3.10.2-plugin.patch 30 May 2010 18:58:18 -0000 1.4
@@ -1,8 +1,7 @@
-Index: installer/core_install.py
-===================================================================
---- installer/core_install.py (revision 13658)
-+++ installer/core_install.py (working copy)
-@@ -1990,7 +1990,11 @@
+diff -Naur hplip-3.10.5-old/installer/core_install.py hplip-3.10.5/installer/core_install.py
+--- hplip-3.10.5-old/installer/core_install.py 2010-05-30 13:44:26.900212683 +0200
++++ hplip-3.10.5/installer/core_install.py 2010-05-30 13:45:58.236869364 +0200
+@@ -1990,7 +1990,11 @@
if mode == GUI_MODE:
return os.system("sh %s --nox11 -- -u" % plugin_file) == 0
else:
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/hplip/files: hplip-3.10.2-plugin.patch
@ 2010-08-28 15:02 Daniel Pielmeier (billie)
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier (billie) @ 2010-08-28 15:02 UTC (permalink / raw
To: gentoo-commits
billie 10/08/28 15:02:44
Removed: hplip-3.10.2-plugin.patch
Log:
Make kde-misc/skanlite available as additional sane frontend via USE="kde". Thanks to Enrico Tagliavini on IRC. Remove old version.
(Portage version: 2.1.8.3/cvs/Linux i686)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-08-28 15:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-27 20:25 [gentoo-commits] gentoo-x86 commit in net-print/hplip/files: hplip-3.10.2-plugin.patch Daniel Pielmeier (billie)
-- strict thread matches above, loose matches on Subject: below --
2010-08-28 15:02 Daniel Pielmeier (billie)
2010-05-30 18:58 Daniel Pielmeier (billie)
2010-05-04 17:52 Daniel Pielmeier (billie)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox