summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2011-11-27 11:26:21 +0000
committerobache <obache@pkgsrc.org>2011-11-27 11:26:21 +0000
commitab45f278aece5c2b4c2bf0cf1d739c17a5e3b664 (patch)
treee4b8d33f9995b2705c6035717e4370ac9515955c
parentcd396456ce391818979f0995191b21d5059d3958 (diff)
downloadpkgsrc-ab45f278aece5c2b4c2bf0cf1d739c17a5e3b664.tar.gz
Fixes PR pkg/45552
* installing GSettings schemas, so prepare it with framework in glib2. * fixes immodule cache path. Bump PKGREVISION.
-rw-r--r--x11/gtk3/Makefile6
-rw-r--r--x11/gtk3/modules.mk4
2 files changed, 6 insertions, 4 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index f4b754ffafb..af574320c75 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/11/01 06:02:53 sbd Exp $
+# $NetBSD: Makefile,v 1.11 2011/11/27 11:26:21 obache Exp $
DISTNAME= gtk+-3.0.12
PKGNAME= ${DISTNAME:S/gtk/gtk3/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/3.0/ \
${MASTER_SITE_GNOME:=sources/gtk+/3.0/}
@@ -78,6 +78,8 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.28.0
.include "options.mk"
+.include "../../devel/glib2/schemas.mk"
+
BUILDLINK_API_DEPENDS.pango+= pango>=1.24.0
.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/x11/gtk3/modules.mk b/x11/gtk3/modules.mk
index 15fbc558199..504791746ac 100644
--- a/x11/gtk3/modules.mk
+++ b/x11/gtk3/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.2 2011/06/05 12:13:47 obache Exp $
+# $NetBSD: modules.mk,v 1.3 2011/11/27 11:26:21 obache Exp $
#
# This Makefile fragment is intended to be included by packages that install
# GTK3 modules. It takes care of rebuilding the corresponding databases at
@@ -21,7 +21,7 @@ GTK3_IMMODULES= YES
.if defined(GTK3_IMMODULES) && !empty(GTK3_IMMODULES:M[Yy][Ee][Ss])
FILES_SUBST+= GTK3_IMMODULES_DB=${GTK3_IMMODULES_DB:Q}
FILES_SUBST+= GTK3_QUERY_IMMODULES=${GTK3_QUERY_IMMODULES:Q}
-GTK3_IMMODULES_DB= ${BUILDLINK_PREFIX.gtk3}/libdata/gtk-3.0/gtk.immodules
+GTK3_IMMODULES_DB= ${BUILDLINK_PREFIX.gtk3}/lib/gtk-3.0/3.0.0/immodules.cache
INSTALL_TEMPLATES+= ../../x11/gtk3/files/immodules.tmpl
DEINSTALL_TEMPLATES+= ../../x11/gtk3/files/immodules.tmpl
.endif