Don't set G_DISABLE_DEPRECATED; it breaks builds

(Portage version: 2.1.4.4)

3 files changed, 76 insertions, 2 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 61b5639e500b..38e0319230aa 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.148 2008/02/04 04:32:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.149 2008/03/05 00:59:56 dang Exp $
+
+  05 Mar 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gtkhtml-3.12.3-allow-deprecated.patch, gtkhtml-3.12.3.ebuild:
+  Don't set G_DISABLE_DEPRECATED; it breaks builds
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gtkhtml-3.16.3.ebuild:
   Stable for HPPA (bug #208366).
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch
new file mode 100644
index 000000000000..92d3e1d6e743
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch
@@ -0,0 +1,68 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/a11y/Makefile.am gtkhtml-3.12.3/a11y/Makefile.am
+--- gtkhtml-3.12.3.orig/a11y/Makefile.am	2007-01-29 04:51:00.000000000 -0500
++++ gtkhtml-3.12.3/a11y/Makefile.am	2008-03-04 19:56:35.000000000 -0500
+@@ -2,7 +2,7 @@ END=
+ 
+ INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
+ 
+-AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
++AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
+ 
+ noinst_LTLIBRARIES = libgtkhtml-a11y.la
+ 
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/a11y/Makefile.in gtkhtml-3.12.3/a11y/Makefile.in
+--- gtkhtml-3.12.3.orig/a11y/Makefile.in	2007-01-29 10:12:48.000000000 -0500
++++ gtkhtml-3.12.3/a11y/Makefile.in	2008-03-04 19:56:38.000000000 -0500
+@@ -251,7 +251,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ END = 
+ INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
+-AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
++AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
+ noinst_LTLIBRARIES = libgtkhtml-a11y.la
+ libgtkhtml_a11y_la_SOURCES = \
+ 	cell.h						\
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/components/html-editor/Makefile.am gtkhtml-3.12.3/components/html-editor/Makefile.am
+--- gtkhtml-3.12.3.orig/components/html-editor/Makefile.am	2007-01-29 04:50:53.000000000 -0500
++++ gtkhtml-3.12.3/components/html-editor/Makefile.am	2008-03-04 19:56:21.000000000 -0500
+@@ -23,7 +23,6 @@ AM_CFLAGS = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"\
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+ 	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1			\
+ 	-DPREFIX=\""$(prefix)"\"			\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+ 	-DDATADIR=\""$(datadir)"\"			\
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/components/html-editor/Makefile.in gtkhtml-3.12.3/components/html-editor/Makefile.in
+--- gtkhtml-3.12.3.orig/components/html-editor/Makefile.in	2007-01-29 10:12:49.000000000 -0500
++++ gtkhtml-3.12.3/components/html-editor/Makefile.in	2008-03-04 19:56:23.000000000 -0500
+@@ -325,7 +325,6 @@ AM_CFLAGS = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"\
+ 	-DGLADE_DATADIR=\"$(gladedir)\"			\
+ 	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1			\
+ 	-DPREFIX=\""$(prefix)"\"			\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+ 	-DDATADIR=\""$(datadir)"\"			\
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/src/Makefile.am gtkhtml-3.12.3/src/Makefile.am
+--- gtkhtml-3.12.3.orig/src/Makefile.am	2007-01-29 04:50:59.000000000 -0500
++++ gtkhtml-3.12.3/src/Makefile.am	2008-03-04 19:56:26.000000000 -0500
+@@ -20,7 +20,6 @@ INCLUDES = 				\
+ 
+ AM_CFLAGS = 						\
+ 	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1			\
+ 	-DGNOME_DISABLE_DEPRECATED=1			\
+ 	-DPREFIX=\""$(prefix)"\"			\
+ 	-DLIBDIR=\""$(datadir)"\"			\
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/src/Makefile.in gtkhtml-3.12.3/src/Makefile.in
+--- gtkhtml-3.12.3.orig/src/Makefile.in	2007-01-29 10:12:49.000000000 -0500
++++ gtkhtml-3.12.3/src/Makefile.in	2008-03-04 19:56:28.000000000 -0500
+@@ -379,7 +379,6 @@ INCLUDES = \
+ 
+ AM_CFLAGS = \
+ 	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1			\
+ 	-DGNOME_DISABLE_DEPRECATED=1			\
+ 	-DPREFIX=\""$(prefix)"\"			\
+ 	-DLIBDIR=\""$(datadir)"\"			\
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
index 98269a2c1851..6fc26e73db48 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild,v 1.12 2008/01/29 18:13:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild,v 1.13 2008/03/05 00:59:56 dang Exp $
 EAPI="1"
 
 inherit gnome2 eutils
@@ -41,4 +41,6 @@ src_unpack() {
 	# Fix tests. Upstream has fix in gnome 2.19 only at this time
 	echo "components/html-editor/GNOME_GtkHTML_Editor-emacs.xml" >> "${S}/po/POTFILES.skip"
 	echo "components/html-editor/GNOME_GtkHTML_Editor.xml" >> "${S}/po/POTFILES.skip"
+	# Don't set G_DISABLE_DEPRECATED; it breaks builds
+	epatch "${FILESDIR}"/${P}-allow-deprecated.patch
 }