Fix build with gtk2-2.20.

6 files changed, 45 insertions, 9 deletions

diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index fa2a27e848f..aa6fac0f004 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/12/16 17:08:56 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2010/06/11 08:50:04 wiz Exp $
 #
 
 DISTNAME=	gucharmap-2.28.2
@@ -25,6 +25,12 @@ GTK2_IMMODULES=		yes
 
 GCONF_SCHEMAS+=	gucharmap.schemas
 
+# needed for gucharmap-2.28 and gtk2-2.20 -- remove on next update
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.3
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/ham/gpredict/Makefile b/ham/gpredict/Makefile
index 0591cbe3fee..665bb5449c9 100644
--- a/ham/gpredict/Makefile
+++ b/ham/gpredict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:53 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/11 09:57:01 wiz Exp $
 
 DISTNAME=	gpredict-0.8.0
 PKGREVISION=	2
@@ -16,6 +16,12 @@ USE_TOOLS+=	gmake msgfmt pkg-config intltool
 USE_PKGLOCALEDIR=yes
 GNU_CONFIGURE=	yes
 
+# needed for gpredict-0.8.0 and gtk2-2.20 -- remove on next update!
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 #.include "../../ham/hamlib/buildlink3.mk"
diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile
index 05f94e11900..d7baecd93c6 100644
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/02/14 02:28:16 obache Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/11 08:55:35 wiz Exp $
 #
 
 DISTNAME=	gnome-packagekit-0.4.0
@@ -21,6 +21,12 @@ GCONF_SCHEMAS+=	gnome-packagekit.schemas
 
 PY_PATCHPLIST=	yes
 
+# needed for gnome-packagekit-0.4 and gtk2-2.20 -- remove on next update
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 08c2428a575..9577272cc7e 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2009/12/16 17:15:10 drochner Exp $
+# $NetBSD: Makefile.common,v 1.32 2010/06/11 09:56:15 wiz Exp $
 #
 # used by print/evince/Makefile
 # used by print/evince-nautilus/Makefile
@@ -21,6 +21,12 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LANGUAGES=		c c++
 
+# needed for evince-2.28 and gtk2-2.20 -- remove on next update!
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+
 # XXX fake for "configure" to allow build w/o a gs installed
 # (avoid hard dependency on a specific version)
 CONFIGURE_ARGS+=	--with-gs=${LOCALBASE}/bin/gs
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 24458f3e435..e44ff3764ff 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2010/02/13 13:36:08 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/11 09:40:27 wiz Exp $
 #
 
 
@@ -20,6 +20,12 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
+# needed for kazehakase-0.5 and gtk2-2.20 -- remove on next update!
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 1beb642720a..0c0e70b6176 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/05/07 08:34:23 ahoka Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/11 09:42:21 wiz Exp $
 #
 
 DISTNAME=	netsurf-1.2-src
@@ -11,6 +11,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.netsurf-browser.org/
 COMMENT=	Web browser for RISC OS and UNIX-like platforms
 
+BUILD_DEPENDS+=	lemon>=1.0:../../devel/lemon
+BUILD_DEPENDS+=	re2c>=0.12.*:../../devel/re2c
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # current codebase needs strndup
@@ -20,11 +23,14 @@ WRKSRC=		${WRKDIR}/netsurf
 
 USE_TOOLS+=	gmake perl:build pax pkg-config
 
-BUILD_DEPENDS+=	lemon>=1.0:../../devel/lemon
-BUILD_DEPENDS+=	re2c>=0.12.*:../../devel/re2c
-
 INSTALLATION_DIRS+=	share/netsurf bin
 
+# needed for netsurf-1.2 and gtk2-2.20 -- remove on next update!
+BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+
 post-extract:
 	find ${WRKSRC}/!NetSurf -type f | xargs chmod a-x