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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3bcc6ad1c48d
branches:  trunk
changeset: 576428:3bcc6ad1c48d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 11 08:50:04 2010 +0000

description:
Fix build with gtk2-2.20.

diffstat:

 fonts/gucharmap/Makefile           |   8 +++++++-
 ham/gpredict/Makefile              |   8 +++++++-
 pkgtools/gnome-packagekit/Makefile |   8 +++++++-
 print/evince/Makefile.common       |   8 +++++++-
 www/kazehakase/Makefile            |   8 +++++++-
 www/netsurf/Makefile               |  14 ++++++++++----
 6 files changed, 45 insertions(+), 9 deletions(-)

diffs (146 lines):

diff -r e703774e7099 -r 3bcc6ad1c48d fonts/gucharmap/Makefile
--- a/fonts/gucharmap/Makefile  Fri Jun 11 08:33:00 2010 +0000
+++ b/fonts/gucharmap/Makefile  Fri Jun 11 08:50:04 2010 +0000
@@ -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 @@
 
 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 -r e703774e7099 -r 3bcc6ad1c48d ham/gpredict/Makefile
--- a/ham/gpredict/Makefile     Fri Jun 11 08:33:00 2010 +0000
+++ b/ham/gpredict/Makefile     Fri Jun 11 08:50:04 2010 +0000
@@ -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_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 -r e703774e7099 -r 3bcc6ad1c48d pkgtools/gnome-packagekit/Makefile
--- a/pkgtools/gnome-packagekit/Makefile        Fri Jun 11 08:33:00 2010 +0000
+++ b/pkgtools/gnome-packagekit/Makefile        Fri Jun 11 08:50:04 2010 +0000
@@ -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 @@
 
 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 -r e703774e7099 -r 3bcc6ad1c48d print/evince/Makefile.common
--- a/print/evince/Makefile.common      Fri Jun 11 08:33:00 2010 +0000
+++ b/print/evince/Makefile.common      Fri Jun 11 08:50:04 2010 +0000
@@ -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_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 -r e703774e7099 -r 3bcc6ad1c48d www/kazehakase/Makefile
--- a/www/kazehakase/Makefile   Fri Jun 11 08:33:00 2010 +0000
+++ b/www/kazehakase/Makefile   Fri Jun 11 08:50:04 2010 +0000
@@ -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_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 -r e703774e7099 -r 3bcc6ad1c48d www/netsurf/Makefile
--- a/www/netsurf/Makefile      Fri Jun 11 08:33:00 2010 +0000
+++ b/www/netsurf/Makefile      Fri Jun 11 08:50:04 2010 +0000
@@ -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 @@
 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,10 +23,13 @@
 
 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
 
-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