Update to stable release dconf-0.8.0.

This commit is contained in:
ajacoutot 2011-07-26 15:13:45 +00:00
parent 02d1ade3c5
commit dcfe47334c
3 changed files with 14 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2011/07/02 18:50:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2011/07/26 15:13:45 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,13 +6,12 @@ COMMENT-main= configuration backend system
COMMENT-editor= editor for the dconf configuration storage system
GNOME_PROJECT= dconf
GNOME_VERSION= 0.7.5
GNOME_VERSION= 0.8.0
PKGNAME-main= ${DISTNAME}
PKGNAME-editor= dconf-editor-${GNOME_VERSION}
REVISION-main= 4
REVISION-editor=2
EXTRACT_SUFX= .tar.xz
SHARED_LIBS+= dconf 0.0 # 0.0.0
SHARED_LIBS+= dconf-dbus-1 0.0 # 0.0.0
@ -36,9 +35,9 @@ 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 cairo-gobject
WANTLIB-editor += drm expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
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 += 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

View File

@ -1,5 +1,5 @@
MD5 (dconf-0.7.5.tar.bz2) = 14T4r8oERz0ZSnIEdZXCjg==
RMD160 (dconf-0.7.5.tar.bz2) = qKQ1VSEPzjO85yBSHj7wXy3T3WQ=
SHA1 (dconf-0.7.5.tar.bz2) = 9A3sWNb/PLyOdT3kjy/g8BSmGW0=
SHA256 (dconf-0.7.5.tar.bz2) = 4hA+ggd0SQN5Dp+sZCf6OUu0haDH9ODQOw+0MmjDTzM=
SIZE (dconf-0.7.5.tar.bz2) = 193355
MD5 (dconf-0.8.0.tar.xz) = CUkYkllMReiVrqmA0sOr+Q==
RMD160 (dconf-0.8.0.tar.xz) = fTPRdps9wzWc3U0y58jWi3HOiAQ=
SHA1 (dconf-0.8.0.tar.xz) = yh1zSrgyQjCtmIHiN0AnRYLXVeU=
SHA256 (dconf-0.8.0.tar.xz) = BREelzw2VpZ1ndGzfj9azId+/yTdLkA210Kqxdpd2js=
SIZE (dconf-0.8.0.tar.xz) = 167500

View File

@ -1,17 +1,12 @@
$OpenBSD: patch-client_dconf-client_vala,v 1.1 2011/05/30 15:51:51 ajacoutot Exp $
From 03066011b7fe3a58d451d93a134022b0607ff1dc Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 10 May 2011 10:15:53 +0000
Subject: Don't compare VariantType by pointer value
$OpenBSD: patch-client_dconf-client_vala,v 1.2 2011/07/26 15:13:45 ajacoutot Exp $
From 70d1b330a7a09a555a1c66c17dc5111e08e77b8b Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 10 May 2011 10:16:20 +0000
Subject: Properly support watching in DConfClient
--- client/dconf-client.vala.orig Mon May 30 17:41:21 2011
+++ client/dconf-client.vala Mon May 30 17:41:09 2011
--- client/dconf-client.vala.orig Tue Jul 26 16:44:38 2011
+++ client/dconf-client.vala Tue Jul 26 17:06:04 2011
@@ -8,18 +8,48 @@ namespace DConf {
WatchFunc watch_func;
Engine engine;
@ -61,12 +56,3 @@ Subject: Properly support watching in DConfClient
}
connection = system;
}
@@ -27,7 +57,7 @@ namespace DConf {
foreach (var message in dcem.parameters) {
var reply = connection.call_sync (dcem.bus_name, dcem.object_path, dcem.interface_name, dcem.method_name,
message, dcem.reply_type, DBusCallFlags.NONE, -1, cancellable);
- if (dcem.reply_type != VariantType.UNIT) {
+ if (!dcem.reply_type.equal (VariantType.UNIT)) {
reply.get ("(s)", out tag);
}
}