[pkgsrc/trunk]: pkgsrc Fix build with gtk2-2.20.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e703774e7099
branches:  trunk
changeset: 576427:e703774e7099
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 11 08:33:00 2010 +0000

description:
Fix build with gtk2-2.20.

diffstat:

 editors/gconf-editor/Makefile |  13 +++++++++----
 sysutils/nautilus/Makefile    |   8 +++++++-
 www/epiphany/Makefile         |   7 ++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 88732399239c -r e703774e7099 editors/gconf-editor/Makefile
--- a/editors/gconf-editor/Makefile     Fri Jun 11 06:57:16 2010 +0000
+++ b/editors/gconf-editor/Makefile     Fri Jun 11 08:33:00 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2009/10/24 13:00:04 drochner Exp $
+# $NetBSD: Makefile,v 1.67 2010/06/11 08:36:19 wiz Exp $
 #
 
 DISTNAME=              gconf-editor-2.28.0
+#PKGREVISION=          1
 CATEGORIES=            editors gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gconf-editor/2.28/}
 EXTRACT_SUFX=          .tar.bz2
@@ -22,10 +23,13 @@
 
 GCONF_SCHEMAS=         gconf-editor.schemas
 
+# needed for gconf-editor-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
+
 BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.14.0
-BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.6.0
-BUILDLINK_API_DEPENDS.libgnome+=       libgnome>=2.14.0
-
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -33,6 +37,7 @@
 .include "../../security/policykit/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.6.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 88732399239c -r e703774e7099 sysutils/nautilus/Makefile
--- a/sysutils/nautilus/Makefile        Fri Jun 11 06:57:16 2010 +0000
+++ b/sysutils/nautilus/Makefile        Fri Jun 11 08:33:00 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2010/04/11 16:38:29 tnn Exp $
+# $NetBSD: Makefile,v 1.107 2010/06/11 08:40:03 wiz Exp $
 #
 
 DISTNAME=              nautilus-2.28.4
@@ -24,6 +24,12 @@
 
 GCONF_SCHEMAS=         apps_nautilus_preferences.schemas
 
+# needed for nautilus-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
+
 post-install:
        # current default path
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/nautilus/extensions-2.0
diff -r 88732399239c -r e703774e7099 www/epiphany/Makefile
--- a/www/epiphany/Makefile     Fri Jun 11 06:57:16 2010 +0000
+++ b/www/epiphany/Makefile     Fri Jun 11 08:33:00 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2010/02/24 18:47:07 drochner Exp $
+# $NetBSD: Makefile,v 1.105 2010/06/11 08:33:00 wiz Exp $
 #
 
 DISTNAME=      epiphany-2.28.2
@@ -21,6 +21,11 @@
 
 PKGCONFIG_OVERRIDE=    data/epiphany-2.28.pc
 
+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"
 
 GCONF_SCHEMAS=         epiphany.schemas