diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-23 06:40:00 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-23 06:40:00 +0000 |
| commit | 9fcb51b719f74d06ec9019bc989ae0f2ce7d8f44 (patch) | |
| tree | f7dd1a70bd197cc14a2a77f30f8ea9bcd8f54720 /gnome-extra | |
| parent | Disable problematic thread4 test, like was already done in glib-2.34.x ebuild... (diff) | |
| download | gentoo-2-9fcb51b719f74d06ec9019bc989ae0f2ce7d8f44.tar.gz gentoo-2-9fcb51b719f74d06ec9019bc989ae0f2ce7d8f44.tar.bz2 gentoo-2-9fcb51b719f74d06ec9019bc989ae0f2ce7d8f44.zip | |
Fix build failure with glib-2.32 (bug #439194, thanks to CC). Use python_clean_py-compile_files.
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/deskbar-applet/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild | 8 | ||||
| -rw-r--r-- | gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch | 21 |
3 files changed, 31 insertions, 5 deletions
diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog index 07a017e60fb1..148388a03c39 100644 --- a/gnome-extra/deskbar-applet/ChangeLog +++ b/gnome-extra/deskbar-applet/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/deskbar-applet # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.154 2012/05/05 06:25:17 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.155 2012/10/23 06:40:00 tetromino Exp $ + + 23 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + deskbar-applet-2.32.0.ebuild, +files/deskbar-applet-2.32.0-glib-2.32.patch: + Fix build failure with glib-2.32 (bug #439194, thanks to CC). Use + python_clean_py-compile_files. 05 May 2012; Jeff Horelick <jdhore@gentoo.org> deskbar-applet-2.32.0.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild index c972b1e5320d..a1a8c7535fe0 100644 --- a/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild +++ b/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild,v 1.12 2012/05/05 06:25:17 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild,v 1.13 2012/10/23 06:40:00 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -52,11 +52,11 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}/${P}-glib-2.32.patch" #439194 + gnome2_src_prepare - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile + python_clean_py-compile_files python_convert_shebangs -r 2 . } diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch new file mode 100644 index 000000000000..756782c7c5af --- /dev/null +++ b/gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch @@ -0,0 +1,21 @@ +In >=glib-2.32, only <glib.h> can be included directly. + +--- a/deskbar/handlers/evolution/evolution.c ++++ b/deskbar/handlers/evolution/evolution.c +@@ -1,5 +1,4 @@ + #include <glib.h> +-#include <glib/gstring.h> + #include <libebook/e-book.h> + #include <pango/pango.h> + #include <string.h> +--- a/deskbar/handlers/evolution/evolution.h ++++ b/deskbar/handlers/evolution/evolution.h +@@ -2,7 +2,7 @@ + #ifndef __DESKBAR_EVOLUTION_H__ + #define __DESKBAR_EVOLUTION_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + + G_BEGIN_DECLS |