Fix path to gsettings schemas.

avsm · Mar 25, 2011 · 2694aa5 · 2694aa5
1 parent 11876ec
commit 2694aa5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/12/19 10:25:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2011/03/25 07:37:15 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,7 +7,7 @@ COMMENT=	configuration backend system
 GNOME_PROJECT=	dconf
 GNOME_VERSION=	0.5.1
 
-REVISION=	3
+REVISION=	4
 
 SHARED_LIBS+=	dconf 0.0 # 0.0.0
 
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 		--disable-introspection
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/{bin,client,editor}/Makefile.in
+	${SUBST_CMD} ${WRKSRC}/{bin,client,editor}/Makefile.in \
+		${WRKSRC}/editor/dconf-model.{c,vala}
 
 .include <bsd.port.mk>
diff --git a/devel/dconf/patches/patch-editor_dconf-model_c b/devel/dconf/patches/patch-editor_dconf-model_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-editor_dconf-model_c,v 1.1 2011/03/25 07:37:15 ajacoutot Exp $
+--- editor/dconf-model.c.orig	Fri Mar 25 08:22:26 2011
++++ editor/dconf-model.c	Fri Mar 25 08:23:01 2011
+@@ -1664,7 +1664,7 @@ SettingsModel* settings_model_construct (GType object_
+ 	self->priv->root = (_tmp1_ = directory_new (self, NULL, 0, "/", "/"), _g_object_unref0 (self->priv->root), _tmp1_);
+ 	self->schemas = (_tmp2_ = schema_list_new (), _schema_list_unref0 (self->schemas), _tmp2_);
+ 	{
+-		schema_list_load_directory (self->schemas, "/usr/share/glib-2.0/schemas", &_inner_error_);
++		schema_list_load_directory (self->schemas, "${LOCALBASE}/share/glib-2.0/schemas", &_inner_error_);
+ 		if (_inner_error_ != NULL) {
+ 			goto __catch1_g_error;
+ 		}
diff --git a/devel/dconf/patches/patch-editor_dconf-model_vala b/devel/dconf/patches/patch-editor_dconf-model_vala
@@ -0,0 +1,12 @@
+$OpenBSD: patch-editor_dconf-model_vala,v 1.1 2011/03/25 07:37:15 ajacoutot Exp $
+--- editor/dconf-model.vala.orig	Fri Mar 25 08:28:57 2011
++++ editor/dconf-model.vala	Fri Mar 25 08:29:09 2011
+@@ -469,7 +469,7 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
+         schemas = new SchemaList();
+         try
+         {
+-            schemas.load_directory("/usr/share/glib-2.0/schemas");
++            schemas.load_directory("${LOCALBASE}/share/glib-2.0/schemas");
+         } catch (Error e) {
+             warning("Failed to parse schemas: %s", e.message);
+         }