diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-07-21 14:19:50 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-07-21 14:19:50 +0000 |
| commit | d9e33784916388b6382fdb5ab4c4b6f9041a383b (patch) | |
| tree | e13a580b524057e521a927c89909d8adb4f64f39 /x11-misc/superswitcher | |
| parent | Clean mask entries (diff) | |
| download | gentoo-2-d9e33784916388b6382fdb5ab4c4b6f9041a383b.tar.gz gentoo-2-d9e33784916388b6382fdb5ab4c4b6f9041a383b.tar.bz2 gentoo-2-d9e33784916388b6382fdb5ab4c4b6f9041a383b.zip | |
Let it compile against glib-2.32
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/superswitcher')
| -rw-r--r-- | x11-misc/superswitcher/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch | 27 | ||||
| -rw-r--r-- | x11-misc/superswitcher/superswitcher-0.6.ebuild | 9 |
3 files changed, 37 insertions, 6 deletions
diff --git a/x11-misc/superswitcher/ChangeLog b/x11-misc/superswitcher/ChangeLog index 5e96f137410e..886a15b34867 100644 --- a/x11-misc/superswitcher/ChangeLog +++ b/x11-misc/superswitcher/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/superswitcher # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/ChangeLog,v 1.9 2012/05/05 04:53:46 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/ChangeLog,v 1.10 2012/07/21 14:19:50 pacho Exp $ + + 21 Jul 2012; Pacho Ramos <pacho@gentoo.org> + +files/superswitcher-0.6-glib-single-include.patch, superswitcher-0.6.ebuild: + Let it compile against glib-2.32 05 May 2012; Jeff Horelick <jdhore@gentoo.org> superswitcher-0.6.ebuild: dev-util/pkgconfig -> virtual/pkgconfig @@ -42,4 +46,3 @@ 07 Jul 2007; Sven Wegener <swegener@gentoo.org> +metadata.xml, +superswitcher-0.5.ebuild: Initial commit, ebuild written by me. - diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch b/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch new file mode 100644 index 000000000000..fe3249982870 --- /dev/null +++ b/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch @@ -0,0 +1,27 @@ +Index: superswitcher-0.6/src/dbus-object.h +=================================================================== +--- superswitcher-0.6.orig/src/dbus-object.h ++++ superswitcher-0.6/src/dbus-object.h +@@ -4,7 +4,7 @@ + #ifndef SUPERSWITCHER_DBUS_OBJECT_H + #define SUPERSWITCHER_DBUS_OBJECT_H + +-#include <glib/gtypes.h> ++#include <glib.h> + + #include "forward_declarations.h" + +Index: superswitcher-0.6/src/forward_declarations.h +=================================================================== +--- superswitcher-0.6.orig/src/forward_declarations.h ++++ superswitcher-0.6/src/forward_declarations.h +@@ -18,8 +18,7 @@ typedef struct _SSXineramaScreen SSXiner + #define ABNORMAL_EXIT_CODE_ANOTHER_INSTANCE_IS_RUNNING 1 + #define ABNORMAL_EXIT_CODE_UNKNOWN_COMMAND_LINE_OPTION 2 + +-#include <glib/gerror.h> +-#include <glib/gtypes.h> ++#include <glib.h> + gboolean superswitcher_hide_popup (void *, GError **); + gboolean superswitcher_show_popup (void *, GError **); + gboolean superswitcher_toggle_popup (void *, GError **); diff --git a/x11-misc/superswitcher/superswitcher-0.6.ebuild b/x11-misc/superswitcher/superswitcher-0.6.ebuild index 1e753744fb4f..17be878008d7 100644 --- a/x11-misc/superswitcher/superswitcher-0.6.ebuild +++ b/x11-misc/superswitcher/superswitcher-0.6.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/superswitcher-0.6.ebuild,v 1.7 2012/05/05 04:53:46 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/superswitcher-0.6.ebuild,v 1.8 2012/07/21 14:19:50 pacho Exp $ -EAPI=2 +EAPI=4 inherit autotools eutils DESCRIPTION="A more feature-full replacement of the Alt-Tab window switching behavior." @@ -30,11 +30,12 @@ src_prepare() { sed -i \ -e '/-DG.*_DISABLE_DEPRECATED/d' \ src/Makefile.am || die #338906 + epatch "${FILESDIR}"/${P}-wnck-workspace.patch + epatch "${FILESDIR}"/${PN}-0.6-glib-single-include.patch eautoreconf } src_install() { - emake -j1 DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog README + MAKEOPTS+="-j1" default } |