summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-03-20 06:08:01 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-03-20 06:08:01 +0800
commit232c9321ee0e1dba47c21f7132b787ecd33efc0c (patch)
tree28cb5bafdb0e01fa4b50ecab5ebc8c9c290a3c5d
parenteb85089da0d10de514890b8aef84db2223c6047e (diff)
downloadmarcuscom-ports-232c9321ee0e1dba47c21f7132b787ecd33efc0c.tar
marcuscom-ports-232c9321ee0e1dba47c21f7132b787ecd33efc0c.tar.gz
marcuscom-ports-232c9321ee0e1dba47c21f7132b787ecd33efc0c.tar.bz2
marcuscom-ports-232c9321ee0e1dba47c21f7132b787ecd33efc0c.tar.lz
marcuscom-ports-232c9321ee0e1dba47c21f7132b787ecd33efc0c.tar.xz
marcuscom-ports-232c9321ee0e1dba47c21f7132b787ecd33efc0c.tar.zst
marcuscom-ports-232c9321ee0e1dba47c21f7132b787ecd33efc0c.zip
Make dconf-editor work by telling it where we install our schemas.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15506 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/dconf/Makefile6
-rw-r--r--devel/dconf/files/patch-editor_dconf-model.c11
2 files changed, 15 insertions, 2 deletions
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 4c6bdf08e..030c7ba35 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/dconf/Makefile,v 1.17 2011/03/10 16:04:51 kwm Exp $
+# $MCom: ports/devel/dconf/Makefile,v 1.18 2011/03/10 16:54:25 kwm Exp $
#
PORTNAME= dconf
PORTVERSION= 0.7.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -36,6 +36,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
${WRKSRC}/engine/dconf-engine.c \
${WRKSRC}/bin/dconf-update.c
+ @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+ ${WRKSRC}/editor/dconf-model.c
pre-build:
${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
diff --git a/devel/dconf/files/patch-editor_dconf-model.c b/devel/dconf/files/patch-editor_dconf-model.c
new file mode 100644
index 000000000..17f2a4c9a
--- /dev/null
+++ b/devel/dconf/files/patch-editor_dconf-model.c
@@ -0,0 +1,11 @@
+--- editor/dconf-model.c.orig 2011-03-19 23:04:18.000000000 +0100
++++ editor/dconf-model.c 2011-03-19 23:05:20.000000000 +0100
+@@ -2170,7 +2170,7 @@ SettingsModel* settings_model_construct
+ _tmp5_ = _tmp4_;
+ _schema_list_unref0 (self->schemas);
+ self->schemas = _tmp5_;
+- schema_list_load_directory (self->schemas, "/usr/share/glib-2.0/schemas", &_inner_error_);
++ schema_list_load_directory (self->schemas, "/usr/local/share/glib-2.0/schemas", &_inner_error_);
+ if (_inner_error_ != NULL) {
+ goto __catch3_g_error;
+ }