diff options
| author | wiz <wiz@pkgsrc.org> | 2010-06-11 08:33:00 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-06-11 08:33:00 +0000 |
| commit | 896fc34aeeeebe2e092c9c25d823b65fc202486b (patch) | |
| tree | 6c3adc4ca1611d6a522fdc61b8584e3651fb9c58 | |
| parent | 61948d5495426f36d868ad12a4f7d765338ef8e8 (diff) | |
| download | pkgsrc-896fc34aeeeebe2e092c9c25d823b65fc202486b.tar.gz | |
Fix build with gtk2-2.20.
| -rw-r--r-- | editors/gconf-editor/Makefile | 13 | ||||
| -rw-r--r-- | sysutils/nautilus/Makefile | 8 | ||||
| -rw-r--r-- | www/epiphany/Makefile | 7 |
3 files changed, 22 insertions, 6 deletions
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index 34bb59a9c0c..1e1a4c8e581 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -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 @@ CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF_CONFIG_SOURCE:S/gconf.xml GCONF_SCHEMAS= gconf-editor.schemas -BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 -BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0 +# 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 .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" @@ -33,6 +37,7 @@ BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0 .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 --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index ca12f12a2e8..ce7271eacb3 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -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 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 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 --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 505fd2f541e..88e5678b20e 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -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 @@ USE_LANGUAGES= c c++ 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 |