diff options
| author |   Michael Weber <xmw@gentoo.org> | 2014-01-19 22:01:35 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2014-01-19 22:01:35 +0000 |
| commit | e8a4346833789735cb7c89426033ceecc4189c81 (patch) | |
| tree | 940c629bf4a9d9422e96e9a8c824db3cd2cb840a /x11-wm/xpra | |
| parent | Add missing patch - bug #498582 (diff) | |
| download | gentoo-2-e8a4346833789735cb7c89426033ceecc4189c81.tar.gz gentoo-2-e8a4346833789735cb7c89426033ceecc4189c81.tar.bz2 gentoo-2-e8a4346833789735cb7c89426033ceecc4189c81.zip | |
Fix launcher (bug 498278, thanks Torsten Kaiser).
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'x11-wm/xpra')
| -rw-r--r-- | x11-wm/xpra/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-wm/xpra/files/xpra-0.10.12-launcher.patch | 10 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.10.12-r1.ebuild (renamed from x11-wm/xpra/xpra-0.10.12.ebuild) | 7 |
3 files changed, 23 insertions, 3 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index 37973e377a12..fed2117e91ea 100644 --- a/x11-wm/xpra/ChangeLog +++ b/x11-wm/xpra/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/xpra # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.88 2014/01/14 15:46:45 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.89 2014/01/19 22:01:35 xmw Exp $ + +*xpra-0.10.12-r1 (19 Jan 2014) + + 19 Jan 2014; Michael Weber <xmw@gentoo.org> + +files/xpra-0.10.12-launcher.patch, +xpra-0.10.12-r1.ebuild, + -xpra-0.10.12.ebuild: + Fix launcher (bug 498278, thanks Torsten Kaiser). *xpra-0.10.12 (14 Jan 2014) diff --git a/x11-wm/xpra/files/xpra-0.10.12-launcher.patch b/x11-wm/xpra/files/xpra-0.10.12-launcher.patch new file mode 100644 index 000000000000..edd42a8e837b --- /dev/null +++ b/x11-wm/xpra/files/xpra-0.10.12-launcher.patch @@ -0,0 +1,10 @@ +--- src/xpra/client/gtk_base/client_launcher.py
++++ src/xpra/client/gtk_base/client_launcher.py
+@@ -18,5 +18,6 @@
+ import pygtk
+ pygtk.require('2.0')
+-import gtk.gdk
++import gtk
++from gtk import gdk
+ import gobject
+ gobject.threads_init()
diff --git a/x11-wm/xpra/xpra-0.10.12.ebuild b/x11-wm/xpra/xpra-0.10.12-r1.ebuild index e35ffd257c80..ee1b052f9d02 100644 --- a/x11-wm/xpra/xpra-0.10.12.ebuild +++ b/x11-wm/xpra/xpra-0.10.12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.12.ebuild,v 1.1 2014/01/14 15:46:45 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.12-r1.ebuild,v 1.1 2014/01/19 22:01:35 xmw Exp $ EAPI=5 @@ -63,7 +63,8 @@ DEPEND="${COMMON_DEPEND} python_prepare_all() { epatch \ "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \ - "${FILESDIR}"/${PN}-0.10.1-prefix.patch + "${FILESDIR}"/${PN}-0.10.1-prefix.patch \ + "${FILESDIR}"/${PN}-0.10.12-launcher.patch #assuming ffmpeg and libav mutual exclusive installs if has_version "media-video/libav" ; then @@ -71,6 +72,8 @@ python_prepare_all() { epatch patches/old-libav.patch fi fi + + distutils-r1_python_prepare_all } python_configure_all() { |