Update to dconf-0.7.3.
dconf-editor is now using gtk+3 (yay, our first gtk+3 app in tree!).
This commit is contained in:
ajacoutot
parent
cfb57ffb08
commit
3f2dd771ec
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2011/03/25 08:30:56 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -6,14 +6,13 @@ COMMENT-main= configuration backend system
|
||||
COMMENT-editor= editor for the dconf configuration storage system
|
||||
|
||||
GNOME_PROJECT= dconf
|
||||
GNOME_VERSION= 0.5.1
|
||||
GNOME_VERSION= 0.7.3
|
||||
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-editor= dconf-editor-${GNOME_VERSION}
|
||||
|
||||
REVISION-main= 5
|
||||
|
||||
SHARED_LIBS+= dconf 0.0 # 0.0.0
|
||||
SHARED_LIBS+= dconf 0.0 # 0.0.0
|
||||
SHARED_LIBS+= dconf-dbus-1 0.0 # 0.0.0
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
@ -31,13 +30,14 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB += pthread
|
||||
|
||||
WANTLIB-main += ${WANTLIB} dbus-1
|
||||
|
||||
WANTLIB-editor += ${WANTLIB} ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-editor += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB-editor += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm
|
||||
WANTLIB-editor += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
|
||||
WANTLIB-editor += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB-editor += pixman-1 png pthread-stubs xcb xcb-render xcb-shm xml2
|
||||
WANTLIB-editor += z
|
||||
WANTLIB-editor += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
|
||||
WANTLIB-editor += drm expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
|
||||
WANTLIB-editor += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
|
||||
WANTLIB-editor += png pthread-stubs xcb xcb-render xcb-shm xml2 z
|
||||
|
||||
MULTI_PACKAGES= -main
|
||||
|
||||
@ -47,20 +47,21 @@ FLAVOR?=
|
||||
MODULES= devel/gettext \
|
||||
x11/gnome
|
||||
|
||||
BUILD_DEPENDS= lang/vala
|
||||
BUILD_DEPENDS= lang/vala>=0.12.0
|
||||
|
||||
RUN_DEPENDS-main= # empty
|
||||
LIB_DEPENDS-main= devel/glib2
|
||||
LIB_DEPENDS-main= devel/glib2 \
|
||||
x11/dbus
|
||||
|
||||
RUN_DEPENDS-editor= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${BASE_PKGPATH},-main
|
||||
LIB_DEPENDS-editor= x11/gtk+2
|
||||
${BASE_PKGPATH},-main \
|
||||
devel/desktop-file-utils
|
||||
LIB_DEPENDS-editor= x11/gtk+3
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CONFIGURE_ARGS= --disable-gtk-doc \
|
||||
--disable-introspection
|
||||
LDFLAGS="-L${LOCALBASE}/lib -pthread"
|
||||
CONFIGURE_ARGS= --disable-gtk-doc
|
||||
|
||||
.if ${FLAVOR:L:Mno_editor}
|
||||
CONFIGURE_ARGS += --disable-editor
|
||||
@ -71,6 +72,7 @@ CONFIGURE_ARGS += --enable-editor
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/{bin,client,editor}/Makefile.in \
|
||||
${WRKSRC}/editor/dconf-model.{c,vala}
|
||||
${WRKSRC}/editor/dconf-model.{c,vala} \
|
||||
${WRKSRC}/dbus-1/Makefile.in
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (dconf-0.5.1.tar.bz2) = yQVJfQJV/iulhWT5ZVkIqw==
|
||||
RMD160 (dconf-0.5.1.tar.bz2) = 68ArAQpE14rEjcHEQmzHI0MLMBY=
|
||||
SHA1 (dconf-0.5.1.tar.bz2) = Th2rH3RKrQv/GJasbyiK1qnf7Og=
|
||||
SHA256 (dconf-0.5.1.tar.bz2) = AIPXDhteVA2NSz8E+l0X3/TFdBNmgv473ZtezBluxPY=
|
||||
SIZE (dconf-0.5.1.tar.bz2) = 251287
|
||||
MD5 (dconf-0.7.3.tar.bz2) = 9UHbcNBiPRCbGGbHMvGlHA==
|
||||
RMD160 (dconf-0.7.3.tar.bz2) = sl7wMjAGZK/piUGbmChDoHJVS1A=
|
||||
SHA1 (dconf-0.7.3.tar.bz2) = 70pfa5mHQ4h+5+bibAMkpuJmB8w=
|
||||
SHA256 (dconf-0.7.3.tar.bz2) = hO/JXLYrZjeyEx4RD/RHkIvnOcIYXWm+uzACk7Vh39k=
|
||||
SIZE (dconf-0.7.3.tar.bz2) = 184278
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-bin_Makefile_in,v 1.1.1.1 2010/10/27 10:50:04 ajacoutot Exp $
|
||||
--- bin/Makefile.in.orig Tue Oct 26 23:18:29 2010
|
||||
+++ bin/Makefile.in Tue Oct 26 23:19:16 2010
|
||||
@@ -49,7 +49,7 @@ am_dconf_OBJECTS = dconf.$(OBJEXT) dconf-update.$(OBJE
|
||||
$OpenBSD: patch-bin_Makefile_in,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
--- bin/Makefile.in.orig Tue Mar 22 17:09:56 2011
|
||||
+++ bin/Makefile.in Tue Apr 5 14:43:06 2011
|
||||
@@ -50,7 +50,7 @@ am_dconf_OBJECTS = dconf.$(OBJEXT) dconf-update.$(OBJE
|
||||
gvdb-builder.$(OBJEXT)
|
||||
dconf_OBJECTS = $(am_dconf_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
-dconf_DEPENDENCIES = $(am__DEPENDENCIES_1) ../client/libdconf.so.0
|
||||
+dconf_DEPENDENCIES = $(am__DEPENDENCIES_1) ../client/libdconf.so.${LIBdconf_VERSION}
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/aux/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@@ -196,7 +196,7 @@ top_srcdir = @top_srcdir@
|
||||
@@ -195,7 +195,7 @@ top_srcdir = @top_srcdir@
|
||||
AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings
|
||||
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/engine -I$(top_srcdir)/client -I$(top_srcdir)/gvdb $(gio_CFLAGS)
|
||||
dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-client_Makefile_in,v 1.1.1.1 2010/10/27 10:50:04 ajacoutot Exp $
|
||||
--- client/Makefile.in.orig Wed Sep 15 22:11:42 2010
|
||||
+++ client/Makefile.in Tue Oct 26 23:17:04 2010
|
||||
$OpenBSD: patch-client_Makefile_in,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
--- client/Makefile.in.orig Tue Mar 22 17:09:56 2011
|
||||
+++ client/Makefile.in Tue Apr 5 14:39:49 2011
|
||||
@@ -34,7 +34,7 @@ POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
@ -8,9 +8,9 @@ $OpenBSD: patch-client_Makefile_in,v 1.1.1.1 2010/10/27 10:50:04 ajacoutot Exp $
|
||||
-shlib_PROGRAMS = libdconf.so.0.0.0$(EXEEXT)
|
||||
+shlib_PROGRAMS = libdconf.so.${LIBdconf_VERSION}$(EXEEXT)
|
||||
subdir = client
|
||||
DIST_COMMON = $(am__dist_gir_DATA_DIST) $(dconfinclude_HEADERS) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
@@ -239,12 +239,12 @@ top_srcdir = @top_srcdir@
|
||||
DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \
|
||||
@@ -225,13 +225,13 @@ top_srcdir = @top_srcdir@
|
||||
AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -D__dconf_h__ -fPIC -DPIC
|
||||
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
|
||||
shlibdir = $(libdir)
|
||||
@ -20,12 +20,13 @@ $OpenBSD: patch-client_Makefile_in,v 1.1.1.1 2010/10/27 10:50:04 ajacoutot Exp $
|
||||
dconf-client.h \
|
||||
dconf.h
|
||||
|
||||
-libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0 $(gio_LIBS)
|
||||
+libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so $(gio_LIBS)
|
||||
libdconf_so_0_0_0_LDADD = $(gio_LIBS)
|
||||
-libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0
|
||||
+libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so
|
||||
libdconf_so_0_0_0_SOURCES = \
|
||||
../common/dconf-shmdir.c \
|
||||
../common/dconf-paths.c \
|
||||
@@ -332,8 +332,8 @@ uninstall-shlibPROGRAMS:
|
||||
@@ -319,8 +319,8 @@ uninstall-shlibPROGRAMS:
|
||||
|
||||
clean-shlibPROGRAMS:
|
||||
-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
|
||||
@ -36,9 +37,9 @@ $OpenBSD: patch-client_Makefile_in,v 1.1.1.1 2010/10/27 10:50:04 ajacoutot Exp $
|
||||
$(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
@@ -752,17 +752,12 @@ uninstall-am: uninstall-dconfincludeHEADERS uninstall-
|
||||
@@ -692,17 +692,12 @@ uninstall-am: uninstall-dconfincludeHEADERS uninstall-
|
||||
uninstall-vapiDATA
|
||||
|
||||
@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0 libdconf.so
|
||||
|
||||
-libdconf.so.0 libdconf.so: libdconf.so.0.0.0
|
||||
- $(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
|
||||
|
||||
@ -1,22 +1,16 @@
|
||||
$OpenBSD: patch-common_dconf-shmdir_c,v 1.2 2010/10/27 11:38:58 ajacoutot Exp $
|
||||
--- common/dconf-shmdir.c.orig Mon Jul 26 16:10:20 2010
|
||||
+++ common/dconf-shmdir.c Wed Oct 27 00:26:56 2010
|
||||
@@ -21,8 +21,14 @@
|
||||
$OpenBSD: patch-common_dconf-shmdir_c,v 1.3 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
--- common/dconf-shmdir.c.orig Tue Jan 18 06:48:15 2011
|
||||
+++ common/dconf-shmdir.c Tue Apr 5 14:42:47 2011
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "dconf-shmdir.h"
|
||||
|
||||
+#ifndef __OpenBSD__
|
||||
-#ifndef __FreeBSD__
|
||||
+#if !(defined __FreeBSD__ || defined __OpenBSD__)
|
||||
#include <sys/statfs.h>
|
||||
#include <sys/vfs.h>
|
||||
+#else
|
||||
+#include <string.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/mount.h>
|
||||
+#endif
|
||||
#include <errno.h>
|
||||
|
||||
#ifndef NFS_SUPER_MAGIC
|
||||
@@ -48,7 +54,11 @@ is_local (const gchar *filename)
|
||||
#endif
|
||||
@@ -53,7 +53,11 @@ is_local (const gchar *filename)
|
||||
while (s < 0 && errno == EINTR);
|
||||
}
|
||||
|
||||
|
||||
55
devel/dconf/patches/patch-dbus-1_Makefile_in
Normal file
55
devel/dconf/patches/patch-dbus-1_Makefile_in
Normal file
@ -0,0 +1,55 @@
|
||||
$OpenBSD: patch-dbus-1_Makefile_in,v 1.1 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
--- dbus-1/Makefile.in.orig Tue Mar 22 17:09:56 2011
|
||||
+++ dbus-1/Makefile.in Tue Apr 5 15:02:28 2011
|
||||
@@ -34,7 +34,7 @@ POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
|
||||
+shlib_PROGRAMS = libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}
|
||||
subdir = dbus-1
|
||||
DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in
|
||||
@@ -227,14 +227,14 @@ pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = dconf-dbus-1.pc
|
||||
shlibdir = $(libdir)
|
||||
libdconf_dbus_1_so_0_0_0_LDADD = $(glib_LIBS) $(dbus_LIBS)
|
||||
-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
|
||||
+libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so
|
||||
libdconf_dbus_1_so_0_0_0_SOURCES = \
|
||||
../engine/dconf-engine.c \
|
||||
../common/dconf-shmdir.c \
|
||||
../gvdb/gvdb-reader.c \
|
||||
dconf-dbus-1.c
|
||||
|
||||
-noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
|
||||
+noinst_DATA =
|
||||
CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
|
||||
all: all-am
|
||||
|
||||
@@ -309,8 +309,8 @@ uninstall-shlibPROGRAMS:
|
||||
|
||||
clean-shlibPROGRAMS:
|
||||
-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
|
||||
-libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
|
||||
- @rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT)
|
||||
+libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}: $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
|
||||
+ @rm -f libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}
|
||||
$(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
@@ -633,14 +633,6 @@ uninstall-am: uninstall-dconf_dbus_1includeHEADERS \
|
||||
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am uninstall-dconf_dbus_1includeHEADERS \
|
||||
uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS
|
||||
-
|
||||
-
|
||||
-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
|
||||
- $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
|
||||
-
|
||||
-install-data-hook:
|
||||
- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
|
||||
- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
|
||||
|
||||
uninstall-hook:
|
||||
rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
|
||||
@ -1,21 +1,21 @@
|
||||
$OpenBSD: patch-editor_Makefile_in,v 1.1.1.1 2010/10/27 10:50:04 ajacoutot Exp $
|
||||
--- editor/Makefile.in.orig Tue Oct 26 23:28:11 2010
|
||||
+++ editor/Makefile.in Tue Oct 26 23:28:33 2010
|
||||
@@ -50,7 +50,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$(OBJEXT) dconf
|
||||
$OpenBSD: patch-editor_Makefile_in,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
--- editor/Makefile.in.orig Tue Mar 22 17:09:56 2011
|
||||
+++ editor/Makefile.in Tue Apr 5 14:40:33 2011
|
||||
@@ -53,7 +53,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$(OBJEXT) dconf
|
||||
dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
|
||||
dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
|
||||
+dconf_editor_DEPENDENCIES = ../client/libdconf.so.${LIBdconf_VERSION} \
|
||||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||
depcomp = $(SHELL) $(top_srcdir)/aux/depcomp
|
||||
@@ -194,7 +194,7 @@ top_builddir = @top_builddir@
|
||||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_1)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
@@ -218,7 +218,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AM_CFLAGS = $(gtk_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client
|
||||
AM_VALAFLAGS = --vapidir ../client --pkg gtk+-2.0 --pkg libxml-2.0 --pkg dconf
|
||||
-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
|
||||
+dconf_editor_LDADD = ../client/libdconf.so.${LIBdconf_VERSION} $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
|
||||
dconf_editor_SOURCES = dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
|
||||
all: all-am
|
||||
|
||||
AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
|
||||
AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
|
||||
-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
|
||||
+dconf_editor_LDADD = ../client/libdconf.so.${LIBdconf_VERSION} $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
|
||||
dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
|
||||
desktopdir = $(datadir)/applications
|
||||
desktop_in_files = dconf-editor.desktop.in.in
|
||||
|
||||
@ -1,12 +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;
|
||||
}
|
||||
$OpenBSD: patch-editor_dconf-model_c,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
--- editor/dconf-model.c.orig Tue Mar 22 16:59:25 2011
|
||||
+++ editor/dconf-model.c Tue Apr 5 14:41:15 2011
|
||||
@@ -2303,7 +2303,7 @@ SettingsModel* settings_model_construct (GType object_
|
||||
_tmp2_ = schema_list_new ();
|
||||
_schema_list_unref0 (self->schemas);
|
||||
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 __catch3_g_error;
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-editor_dconf-model_vala,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
--- editor/dconf-model.vala.orig Tue Mar 22 16:35:32 2011
|
||||
+++ editor/dconf-model.vala Tue Apr 5 14:38:47 2011
|
||||
@@ -564,7 +564,7 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
|
||||
schemas = new SchemaList();
|
||||
try
|
||||
{
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-engine_dconf-engine_c,v 1.2 2010/11/21 09:31:32 ajacoutot Exp $
|
||||
--- engine/dconf-engine.c.orig Wed Aug 4 17:40:53 2010
|
||||
+++ engine/dconf-engine.c Sun Nov 21 10:26:00 2010
|
||||
@@ -144,7 +144,7 @@ dconf_engine_setup_user (DConfEngine *engine)
|
||||
|
||||
if (fd >= 0)
|
||||
{
|
||||
- if (posix_fallocate (fd, 0, 1) == 0)
|
||||
+ if (ftruncate (fd, 1) == 0)
|
||||
{
|
||||
engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0);
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-gsettings_dconfsettingsbackend_c,v 1.1 2010/11/25 15:45:30 jasper Exp $
|
||||
|
||||
Fix some meory leaks, from upstream git:
|
||||
2812c9a874bfd1a1a6df762e6aebf654f7efae7d
|
||||
|
||||
--- gsettings/dconfsettingsbackend.c.orig Wed Sep 15 15:34:58 2010
|
||||
+++ gsettings/dconfsettingsbackend.c Thu Nov 25 16:41:01 2010
|
||||
@@ -155,6 +155,7 @@ dconf_settings_backend_remove_outstanding (DConfSettin
|
||||
g_dbus_message_get_sender (message),
|
||||
g_dbus_message_get_body (message),
|
||||
anti_expose, NULL);
|
||||
+ g_slice_free (Outstanding, tmp);
|
||||
|
||||
found = TRUE;
|
||||
break;
|
||||
@@ -457,6 +458,7 @@ dconf_settings_backend_write_tree (GSettingsBackend *b
|
||||
gpointer origin_tag)
|
||||
{
|
||||
DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend;
|
||||
+ gboolean success = FALSE;
|
||||
volatile guint32 *serial;
|
||||
DConfEngineMessage dcem;
|
||||
GDBusConnection *bus;
|
||||
@@ -478,15 +480,11 @@ dconf_settings_backend_write_tree (GSettingsBackend *b
|
||||
|
||||
g_settings_backend_keys_changed (backend, prefix, keys, origin_tag);
|
||||
|
||||
- return TRUE;
|
||||
+ success = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
- g_free (prefix);
|
||||
- g_free (values);
|
||||
- g_free (keys);
|
||||
-
|
||||
- return FALSE;
|
||||
+ return success;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1,3 +1,8 @@
|
||||
@comment $OpenBSD: PLIST-editor,v 1.1 2011/03/25 08:30:56 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-editor,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
@conflict dconf-<0.5.1p5
|
||||
@bin bin/dconf-editor
|
||||
share/applications/dconf-editor.desktop
|
||||
share/dconf-editor/
|
||||
share/dconf-editor/dconf-editor.ui
|
||||
@exec %D/bin/update-desktop-database
|
||||
@unexec-delete %D/bin/update-desktop-database
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.1 2011/03/25 08:30:56 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
|
||||
@conflict vala-<0.10
|
||||
@pkgpath devel/dconf
|
||||
@bin bin/dconf
|
||||
include/dconf/
|
||||
include/dconf-dbus-1/
|
||||
include/dconf-dbus-1/dconf-dbus-1.h
|
||||
include/dconf/dconf-client.h
|
||||
include/dconf/dconf-engine.h
|
||||
include/dconf/dconf-paths.h
|
||||
@ -10,7 +12,9 @@ include/dconf/dconf-readtype.h
|
||||
include/dconf/dconf-resetlist.h
|
||||
include/dconf/dconf.h
|
||||
lib/gio/modules/libdconfsettings.so
|
||||
@lib lib/libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}
|
||||
@lib lib/libdconf.so.${LIBdconf_VERSION}
|
||||
lib/pkgconfig/dconf-dbus-1.pc
|
||||
lib/pkgconfig/dconf.pc
|
||||
@bin libexec/dconf-service
|
||||
share/dbus-1/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user