cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to dconf-0.12.0.

Browse Source 
This starts the update to GNOME 3.4.
This commit is contained in:
ajacoutot 2012-03-29 06:26:38 +00:00
parent 75dfe73ca4
commit d584cfab6c
11 changed files with 90 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devel/dconf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2012/02/26 15:06:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.36 2012/03/29 06:26:38 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,14 +6,11 @@ COMMENT-main= configuration backend system
COMMENT-editor= editor for the dconf configuration storage system
GNOME_PROJECT= dconf
GNOME_VERSION= 0.10.0
GNOME_VERSION= 0.12.0
PKGNAME-main= ${DISTNAME}
PKGNAME-editor= dconf-editor-${GNOME_VERSION}
REVISION-main=0
REVISION-editor=1
SHARED_LIBS+= dconf 0.0 # 0.0.0
SHARED_LIBS+= dconf-dbus-1 0.0 # 0.0.0
@ -30,17 +27,15 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += pthread
WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 pthread
WANTLIB-main += ${WANTLIB} dbus-1
WANTLIB-editor += ${WANTLIB} ${MODGETTEXT_WANTLIB}
WANTLIB-editor += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB-editor += Xi Xinerama Xrandr Xrender atk-1.0 cairo cairo-gobject
WANTLIB-editor += expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB-editor += GL X11 Xrender atk-1.0 cairo cairo-gobject dconf expat
WANTLIB-editor += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gmodule-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 dconf
WANTLIB-editor += png pthread-stubs xcb xcb-render xcb-shm xml2 z
MULTI_PACKAGES= -main -editor

10
devel/dconf/distinfo
View File

@ -1,5 +1,5 @@
MD5 (dconf-0.10.0.tar.xz) = cYlOum1Vn7c2pDAykp+5ig==
RMD160 (dconf-0.10.0.tar.xz) = lOm1UYpVw1I7JJd7DeLVzUFQFXY=
SHA1 (dconf-0.10.0.tar.xz) = ifTtk9fpqHY/lXk4MpmaOk8Ve20=
SHA256 (dconf-0.10.0.tar.xz) = n3RMz7PaIBY6S7J5Fslg9r9WBIs+wREoYshUFPwGTuI=
SIZE (dconf-0.10.0.tar.xz) = 172752
MD5 (dconf-0.12.0.tar.xz) = auydN/yhYUzWcrxbIhXJ8w==
RMD160 (dconf-0.12.0.tar.xz) = aQ3AUhhcy0RQio2Cci7uKsoG0dQ=
SHA1 (dconf-0.12.0.tar.xz) = VnOaIGCE060ZU5IkegPlX6P0/y0=
SHA256 (dconf-0.12.0.tar.xz) = nAIOL/CtsZ/5vD1zzhU4j7QsUrEu11G9tZzlOmYEYa8=
SIZE (dconf-0.12.0.tar.xz) = 201540

21
devel/dconf/patches/patch-bin_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bin_Makefile_in,v 1.5 2011/09/27 06:25:10 ajacoutot Exp $
--- bin/Makefile.in.orig Mon Sep 26 23:20:35 2011
+++ bin/Makefile.in Tue Sep 27 08:14:49 2011
$OpenBSD: patch-bin_Makefile_in,v 1.6 2012/03/29 06:26:38 ajacoutot Exp $
--- bin/Makefile.in.orig Mon Mar 19 19:08:41 2012
+++ bin/Makefile.in Fri Mar 23 16:08:11 2012
@@ -51,7 +51,7 @@ am_dconf_OBJECTS = dconf.$(OBJEXT) dconf-update.$(OBJE
dconf-dump.$(OBJEXT) gvdb-builder.$(OBJEXT)
dconf_OBJECTS = $(am_dconf_OBJECTS)
@ -10,12 +10,21 @@ $OpenBSD: patch-bin_Makefile_in,v 1.5 2011/09/27 06:25:10 ajacoutot Exp $
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/aux/depcomp
am__depfiles_maybe = depfiles
@@ -223,7 +223,7 @@ top_srcdir = @top_srcdir@
AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings
@@ -121,7 +121,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Wno-error -Wno-unused-but-set-variable \
+CFLAGS = @CFLAGS@ -Wno-error \
-Wno-unused-variable
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -230,7 +230,7 @@ top_srcdir = @top_srcdir@
AM_CFLAGS = -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
-dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0
+dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.${LIBdconf_VERSION}
dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi fixes.vapi
dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi
completiondir = $(sysconfdir)/bash_completion.d
completion_DATA = dconf-bash-completion.sh

24
devel/dconf/patches/patch-bin_dconf-update_vala
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-bin_dconf-update_vala,v 1.1 2011/11/01 13:54:25 ajacoutot Exp $
From 094151937b8f4b22a9a1347d3c875c4ce8841db2 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 31 Oct 2011 23:08:41 +0000
Subject: dconf update: don't access before start of string
--- bin/dconf-update.vala.orig Thu Aug 4 00:07:20 2011
+++ bin/dconf-update.vala Tue Nov 1 14:51:23 2011
@@ -24,11 +24,13 @@ unowned Gvdb.Item get_parent (Gvdb.HashTable table, st
int end = 0;
- for (int i = 0; name[i] != '\0'; i++) {
+ for (int i = 1; name[i] != '\0'; i++) {
if (name[i - 1] == '/') {
end = i;
}
}
+
+ assert (end != 0);
var parent_name = name.substring (0, end);
parent = table.lookup (parent_name);

25
devel/dconf/patches/patch-client_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-client_Makefile_in,v 1.6 2011/09/27 06:25:10 ajacoutot Exp $
--- client/Makefile.in.orig Mon Sep 26 23:20:35 2011
+++ client/Makefile.in Tue Sep 27 08:11:51 2011
$OpenBSD: patch-client_Makefile_in,v 1.7 2012/03/29 06:26:38 ajacoutot Exp $
--- client/Makefile.in.orig Mon Mar 19 19:08:41 2012
+++ client/Makefile.in Fri Mar 23 16:09:20 2012
@@ -34,7 +34,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@ -10,7 +10,16 @@ $OpenBSD: patch-client_Makefile_in,v 1.6 2011/09/27 06:25:10 ajacoutot Exp $
subdir = client
DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \
@@ -230,13 +230,13 @@ top_srcdir = @top_srcdir@
@@ -128,7 +128,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Wno-error -Wno-unused-but-set-variable \
+CFLAGS = @CFLAGS@ -Wno-error \
-Wno-unused-variable
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -237,13 +237,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)
@ -26,18 +35,18 @@ $OpenBSD: patch-client_Makefile_in,v 1.6 2011/09/27 06:25:10 ajacoutot Exp $
libdconf_so_0_0_0_SOURCES = \
../common/dconf-shmdir.c \
../common/dconf-paths.c \
@@ -324,8 +324,8 @@ uninstall-shlibPROGRAMS:
@@ -331,8 +331,8 @@ uninstall-shlibPROGRAMS:
clean-shlibPROGRAMS:
-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES)
-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES)
- @rm -f libdconf.so.0.0.0$(EXEEXT)
+libdconf.so.${LIBdconf_VERSION}$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES)
+libdconf.so.${LIBdconf_VERSION}$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES)
+ @rm -f libdconf.so.${LIBdconf_VERSION}$(EXEEXT)
$(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS)
mostlyclean-compile:
@@ -697,17 +697,12 @@ uninstall-am: uninstall-dconfincludeHEADERS uninstall-
@@ -694,17 +694,12 @@ uninstall-am: uninstall-dconfincludeHEADERS uninstall-
uninstall-vapiDATA

18
devel/dconf/patches/patch-dbus-1_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-dbus-1_Makefile_in,v 1.4 2011/09/27 06:25:10 ajacoutot Exp $
--- dbus-1/Makefile.in.orig Mon Sep 26 23:20:35 2011
+++ dbus-1/Makefile.in Tue Sep 27 08:11:51 2011
$OpenBSD: patch-dbus-1_Makefile_in,v 1.5 2012/03/29 06:26:38 ajacoutot Exp $
--- dbus-1/Makefile.in.orig Mon Mar 19 19:08:42 2012
+++ dbus-1/Makefile.in Fri Mar 23 16:06:18 2012
@@ -34,7 +34,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@ -10,7 +10,7 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.4 2011/09/27 06:25:10 ajacoutot Exp $
subdir = dbus-1
DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in
@@ -232,14 +232,14 @@ pkgconfigdir = $(libdir)/pkgconfig
@@ -238,14 +238,14 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dconf-dbus-1.pc
shlibdir = $(libdir)
libdconf_dbus_1_so_0_0_0_LDADD = $(glib_LIBS) $(dbus_LIBS)
@ -27,18 +27,18 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.4 2011/09/27 06:25:10 ajacoutot Exp $
CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
all: all-am
@@ -314,8 +314,8 @@ uninstall-shlibPROGRAMS:
@@ -320,8 +320,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)
-libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_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}
+libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
+ @rm -f libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}$(EXEEXT)
$(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:
@@ -638,14 +638,6 @@ uninstall-am: uninstall-dconf_dbus_1includeHEADERS \
@@ -637,14 +637,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

17
devel/dconf/patches/patch-editor_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-editor_Makefile_in,v 1.4 2011/09/27 06:25:10 ajacoutot Exp $
--- editor/Makefile.in.orig Mon Sep 26 23:20:35 2011
+++ editor/Makefile.in Tue Sep 27 08:11:51 2011
$OpenBSD: patch-editor_Makefile_in,v 1.5 2012/03/29 06:26:38 ajacoutot Exp $
--- editor/Makefile.in.orig Mon Mar 19 19:08:42 2012
+++ editor/Makefile.in Fri Mar 23 16:07:54 2012
@@ -54,7 +54,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$(OBJEXT) dconf
dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
@ -10,7 +10,16 @@ $OpenBSD: patch-editor_Makefile_in,v 1.4 2011/09/27 06:25:10 ajacoutot Exp $
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -224,7 +224,7 @@ top_builddir = @top_builddir@
@@ -123,7 +123,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Wno-error -Wno-unused-but-set-variable \
+CFLAGS = @CFLAGS@ -Wno-error \
-Wno-unused-variable
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
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

15
devel/dconf/patches/patch-editor_dconf-editor_desktop_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-editor_dconf-editor_desktop_in,v 1.1 2011/09/27 15:01:54 ajacoutot Exp $
There is no "dconf-editor" icon yet, so use a gtk stock one.
--- editor/dconf-editor.desktop.in.orig Tue Sep 27 16:57:09 2011
+++ editor/dconf-editor.desktop.in Tue Sep 27 16:57:28 2011
@@ -4,7 +4,7 @@ Comment=Directly edit your entire configuration databa
Exec=dconf-editor
Terminal=false
Type=Application
-Icon=dconf-editor
+Icon=gtk-preferences
StartupNotify=true
Categories=GNOME;GTK;System;
X-GNOME-Bugzilla-Bugzilla=GNOME

14
devel/dconf/patches/patch-engine_dconf-engine_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-engine_dconf-engine_c,v 1.7 2011/09/27 06:25:10 ajacoutot Exp $
--- engine/dconf-engine.c.orig Sun Sep 11 21:07:26 2011
+++ engine/dconf-engine.c Tue Sep 27 08:11:51 2011
@@ -142,6 +142,11 @@ dconf_engine_refresh_user (DConfEngine *engine)
$OpenBSD: patch-engine_dconf-engine_c,v 1.8 2012/03/29 06:26:38 ajacoutot Exp $
--- engine/dconf-engine.c.orig Mon Mar 26 16:29:26 2012
+++ engine/dconf-engine.c Wed Mar 28 21:10:21 2012
@@ -144,6 +144,11 @@ dconf_engine_refresh_user (DConfEngine *engine,
{
g_assert ((engine->gvdbs[0] == NULL) >= (engine->shm == NULL));
g_assert ((engine->gvdbs[i] == NULL) >= (engine->shm[i] == NULL));
+#ifdef __OpenBSD__
+ if (engine->shm)
+ msync (engine->shm, 1, MS_INVALIDATE);
+ msync (engine->shm[i], 1, MS_INVALIDATE);
+#endif
+
/* if we failed the first time, fail forever */
if (engine->shm && *engine->shm == 1)
if (engine->shm[i] && *engine->shm[i] == 1)
{

18
devel/dconf/pkg/PLIST-editor
View File

@ -1,11 +1,27 @@
@comment $OpenBSD: PLIST-editor,v 1.4 2011/05/28 08:15:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-editor,v 1.5 2012/03/29 06:26:38 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
share/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
share/icons/
share/icons/hicolor/
share/icons/hicolor/128x128/
share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/dconf-editor.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/dconf-editor.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/dconf-editor.png
share/icons/hicolor/64x64/
share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/dconf-editor.png
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

6
devel/dconf/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2011/06/03 13:26:57 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2012/03/29 06:26:38 ajacoutot Exp $
@conflict vala-<0.10
@pkgpath devel/dconf
@extraunexec rm -rf ${SYSCONFDIR}/dconf/db/*
@ -10,8 +10,6 @@ include/dconf-dbus-1/dconf-dbus-1.h
include/dconf/dconf-client.h
include/dconf/dconf-engine.h
include/dconf/dconf-paths.h
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}
@ -20,7 +18,6 @@ lib/pkgconfig/dconf-dbus-1.pc
lib/pkgconfig/dconf.pc
@bin libexec/dconf-service
share/dbus-1/services/ca.desrt.dconf.service
share/dbus-1/system-services/ca.desrt.dconf.service
share/examples/dconf/
share/examples/dconf/bash_completion.d/
@sample ${SYSCONFDIR}/bash_completion.d/
@ -34,7 +31,6 @@ share/gtk-doc/html/dconf/annotation-glossary.html
share/gtk-doc/html/dconf/api-index-full.html
share/gtk-doc/html/dconf/ch01.html
share/gtk-doc/html/dconf/dconf-DConf-Paths.html
share/gtk-doc/html/dconf/dconf.devhelp
share/gtk-doc/html/dconf/dconf.devhelp2
share/gtk-doc/html/dconf/home.png
share/gtk-doc/html/dconf/index.html