Fix for >=dev-libs/glib-2.32 (bug 417049, thanks poncho)

(Portage version: 2.1.10.62/cvs/Linux x86_64)

4 files changed, 48 insertions, 4 deletions

diff --git a/dev-util/regexxer/ChangeLog b/dev-util/regexxer/ChangeLog
index bc29e019afa3..edfe9c63a2c7 100644
--- a/dev-util/regexxer/ChangeLog
+++ b/dev-util/regexxer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/regexxer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/ChangeLog,v 1.23 2012/05/05 02:18:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/ChangeLog,v 1.24 2012/05/22 10:13:56 xmw Exp $
+
+  22 May 2012; Michael Weber <xmw@gentoo.org> regexxer-0.9.ebuild,
+  regexxer-0.10.ebuild, +files/regexxer-0.10-glib-2.32.patch:
+  Fix for >=dev-libs/glib-2.32 (bug 417049, thanks poncho)
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> regexxer-0.9.ebuild,
   regexxer-0.10.ebuild:
diff --git a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
new file mode 100644
index 000000000000..053664a77505
--- /dev/null
+++ b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
@@ -0,0 +1,35 @@
+Downloaded from https://projects.archlinux.org/svntogit/community.git/plain/trunk/regexxer-glib2.32.patch?h=packages/regexxer
+for bug 417049
+
+--- regexxer-0.10/src/fileshared.h
++++ regexxer-0.10/src/fileshared.h
+@@ -23,6 +23,7 @@
+
+ #include "sharedptr.h"
+
++#include <glibmm/regex.h>
+ #include <gtkmm/textbuffer.h>
+ #include <functional>
+ #include <utility>
+--- regexxer-0.10/src/globalstrings.h
++++ regexxer-0.10/src/globalstrings.h
+@@ -21,7 +21,7 @@
+ #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED
+ #define REGEXXER_GLOBALSTRINGS_H_INCLUDED
+
+-#include <glib/gutils.h>  /* for G_DIR_SEPARATOR_S */
++#include <glib.h>  /* for G_DIR_SEPARATOR_S */
+
+ namespace Regexxer
+ {
+--- regexxer-0.10/src/translation.h
++++ regexxer-0.10/src/translation.h
+@@ -21,7 +21,7 @@
+ #ifndef REGEXXER_TRANSLATION_H_INCLUDED
+ #define REGEXXER_TRANSLATION_H_INCLUDED
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+
+ #ifndef gettext_noop
diff --git a/dev-util/regexxer/regexxer-0.10.ebuild b/dev-util/regexxer/regexxer-0.10.ebuild
index ab3c4c7b5995..4fb9328d183f 100644
--- a/dev-util/regexxer/regexxer-0.10.ebuild
+++ b/dev-util/regexxer/regexxer-0.10.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/dev-util/regexxer/regexxer-0.10.ebuild,v 1.3 2012/05/05 02:18:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.10.ebuild,v 1.4 2012/05/22 10:13:56 xmw Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -28,6 +28,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
 	epatch "${FILESDIR}"/${P}-sandbox.patch
 	eautoreconf
 	gnome2_src_prepare
diff --git a/dev-util/regexxer/regexxer-0.9.ebuild b/dev-util/regexxer/regexxer-0.9.ebuild
index 46a4bac35e97..95713f534660 100644
--- a/dev-util/regexxer/regexxer-0.9.ebuild
+++ b/dev-util/regexxer/regexxer-0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.9.ebuild,v 1.6 2012/05/05 02:18:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.9.ebuild,v 1.7 2012/05/22 10:13:56 xmw Exp $
 
 EAPI=3
 GCONF_DEBUG=no
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="An interactive tool for performing search and replace operations"
 HOMEPAGE="http://regexxer.sourceforge.net"
@@ -23,6 +23,10 @@ RDEPEND=">=dev-cpp/libglademm-2.4:2.4
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README