Fix build issues with gtk+-2.22 by *actually* removing -D*DISABLE_DEPRECATED cflags

(Portage version: 2.1.9.10/cvs/Linux x86_64)

3 files changed, 15 insertions, 14 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index bc550f6abefd..5a71ba0b92da 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.219 2010/09/11 18:28:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.220 2010/09/26 15:14:01 nirbheek Exp $
+
+  26 Sep 2010; <nirbheek@gentoo.org> gtkhtml-3.30.2.ebuild,
+  gtkhtml-3.30.3.ebuild:
+  Fix build issues with gtk+-2.22 by *actually* removing
+  -D*DISABLE_DEPRECATED cflags
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> gtkhtml-3.30.2.ebuild:
   Marked ppc for bug #324077.
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
index b804badee79c..0b1fc58d9827 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild,v 1.6 2010/09/11 18:28:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild,v 1.7 2010/09/26 15:14:01 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -40,9 +40,7 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
-		a11y/Makefile.am a11y/Makefile.in || die "sed 2 failed"
+	# XXX: This is fixed with --disable-deprecations in >=3.31.90
+	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS/CFLAGS="$CFLAGS/' \
+		-i configure.ac configure || die "Warning flags sed failed"
 }
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild
index ded03681e7c6..fbfe9566f4da 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild,v 1.1 2010/08/16 21:16:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild,v 1.2 2010/09/26 15:14:01 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ IUSE=""
 
 # We keep bonobo until we can make sure no apps in tree uses
 # the old composer code.
-RDEPEND=">=x11-libs/gtk+-2.18
+RDEPEND=">=x11-libs/gtk+-2.20
 	>=x11-themes/gnome-icon-theme-2.22.0
 	>=gnome-base/orbit-2
 	>=app-text/enchant-1.1.7
@@ -40,9 +40,7 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
-		a11y/Makefile.am a11y/Makefile.in || die "sed 2 failed"
+	# XXX: This is fixed with --disable-deprecations in >=3.31.90
+	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS/CFLAGS="$CFLAGS/' \
+		-i configure.ac configure || die "Warning flags sed failed"
 }