[Midnightbsd-cvs] mports [18825] trunk/devel/dconf: dconf 0.22.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 8 22:57:50 EDT 2015
Revision: 18825
http://svnweb.midnightbsd.org/mports/?rev=18825
Author: laffer1
Date: 2015-05-08 22:57:50 -0400 (Fri, 08 May 2015)
Log Message:
-----------
dconf 0.22.0
Modified Paths:
--------------
trunk/devel/dconf/Makefile
trunk/devel/dconf/distinfo
trunk/devel/dconf/pkg-descr
trunk/devel/dconf/pkg-plist
Added Paths:
-----------
trunk/devel/dconf/files/patch-docs_Makefile.in
Removed Paths:
-------------
trunk/devel/dconf/files/patch-client_Makefile.in
trunk/devel/dconf/files/patch-dbus-1_Makefile.in
trunk/devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml
trunk/devel/dconf/files/patch-editor_dconf-editor.vala
trunk/devel/dconf/files/patch-editor_dconf-model.vala
trunk/devel/dconf/files/patch-editor_dconf-schema.vala
trunk/devel/dconf/files/patch-editors_dconf-view.vala
trunk/devel/dconf/files/patch-test_Makefile.am
trunk/devel/dconf/files/patch-test_Makefile.in
Modified: trunk/devel/dconf/Makefile
===================================================================
--- trunk/devel/dconf/Makefile 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/Makefile 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME?= dconf
-PORTVERSION= 0.14.1
-PORTREVISION?= 3
+PORTVERSION= 0.22.0
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DISTNAME= dconf-${PORTVERSION}
@@ -18,16 +18,15 @@
LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
USES= gettext gmake pathfix pkgconfig tar:xz
-USE_GNOME= glib20 gnomehier intltool
+USE_GNOME= glib20 intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-MAKE_JOBS_UNSAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
DCONF_SLAVE?= no
-.if ${DCONF_SLAVE} == "editor"
+.if ${DCONF_SLAVE} == editor
USE_GNOME+= gtk30
INSTALLS_ICONS= yes
GLIB_SCHEMAS= ca.desrt.dconf-editor.gschema.xml
@@ -51,10 +50,13 @@
${WRKSRC}/bin/Makefile.in \
${WRKSRC}/client/Makefile.in \
${WRKSRC}/editor/Makefile.in
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/docs/Makefile.in
+.if ${DCONF_SLAVE} == no
post-install:
- -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
@${MKDIR} ${PREFIX}/etc/dconf/db
@${MKDIR} ${PREFIX}/etc/dconf/profile
+.endif
.include <bsd.port.mk>
Modified: trunk/devel/dconf/distinfo
===================================================================
--- trunk/devel/dconf/distinfo 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/distinfo 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/dconf-0.14.1.tar.xz) = 59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8
-SIZE (gnome3/dconf-0.14.1.tar.xz) = 291300
+SHA256 (gnome3/dconf-0.22.0.tar.xz) = 0a277cb0c3f09e77d9413c5a9b3577fc2b5d6e941b59b44940392e024a224b8e
+SIZE (gnome3/dconf-0.22.0.tar.xz) = 393260
Deleted: trunk/devel/dconf/files/patch-client_Makefile.in
===================================================================
--- trunk/devel/dconf/files/patch-client_Makefile.in 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-client_Makefile.in 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,40 +0,0 @@
---- client/Makefile.orig.in 2013-03-26 19:40:26.085263743 +0000
-+++ client/Makefile.in 2013-03-26 19:40:33.384265230 +0000
-@@ -55,7 +55,7 @@
- DIST_COMMON = $(dconfclientinclude_HEADERS) $(dconfinclude_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/dconf.pc.in $(top_srcdir)/Makefile.gtester
--shlib_PROGRAMS = libdconf.so.1.0.0$(EXEEXT)
-+shlib_PROGRAMS = libdconf.so.1$(EXEEXT)
- subdir = client
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -416,12 +416,12 @@
-
- clean-shlibPROGRAMS:
- -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
--libdconf.so.1.0.0$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
-+libdconf.so.1$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
- @rm -f libdconf.so.1.0.0$(EXEEXT)
- $(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS)
-+ $(AM_V_GEN) ln -fs libdconf.so.1 libdconf.so
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -838,12 +838,8 @@
- # run tests in cwd as part of make check
- check-local: test-nonrecursive
-
--libdconf.so.1 libdconf.so: libdconf.so.1.0.0
-- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
--
- install-data-hook:
-- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
-- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
-+ ln -fs libdconf.so.1 $(DESTDIR)$(shlibdir)/libdconf.so
-
- uninstall-hook:
- rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
Deleted: trunk/devel/dconf/files/patch-dbus-1_Makefile.in
===================================================================
--- trunk/devel/dconf/files/patch-dbus-1_Makefile.in 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-dbus-1_Makefile.in 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,51 +0,0 @@
---- dbus-1/Makefile.orig.in 2013-03-26 19:18:48.870352031 +0000
-+++ dbus-1/Makefile.in 2013-03-26 19:18:57.583352154 +0000
-@@ -55,7 +55,7 @@
- DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in \
- $(top_srcdir)/Makefile.gtester
--shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
-+shlib_PROGRAMS = libdconf-dbus-1.so.0$(EXEEXT)
- subdir = dbus-1
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -341,7 +341,7 @@
-
- libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
- libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
--nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
-+nodist_noinst_DATA = libdconf-dbus-1.so.0
- CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
- all: all-am
-
-@@ -430,13 +430,12 @@
- cd "$(DESTDIR)$(shlibdir)" && rm -f $$files
-
- 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) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
-- @rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT)
-+libdconf-dbus-1.so.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$(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)
-+ $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0 libdconf-dbus-1.so
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -821,12 +820,8 @@
- # run tests in cwd as part of make check
- check-local: test-nonrecursive
-
--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
-+ ln -fs libdconf-dbus-1.so.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
-
- uninstall-hook:
- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
Added: trunk/devel/dconf/files/patch-docs_Makefile.in
===================================================================
--- trunk/devel/dconf/files/patch-docs_Makefile.in (rev 0)
+++ trunk/devel/dconf/files/patch-docs_Makefile.in 2015-05-09 02:57:50 UTC (rev 18825)
@@ -0,0 +1,19 @@
+--- docs/Makefile.in.bak 2014-09-05 12:17:30.648164095 +0200
++++ docs/Makefile.in 2014-09-05 12:17:30.689163669 +0200
+@@ -938,13 +938,13 @@
+ .PHONY : dist-hook-local docs
+
+ %.1: %.xml
+- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
++ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
+
+ dconf.1: dconf-tool.xml
+- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
++ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
+
+ dconf.7: dconf-overview.xml
+- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
++ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Property changes on: trunk/devel/dconf/files/patch-docs_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml
===================================================================
--- trunk/devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,31 +0,0 @@
---- editor/ca.desrt.dconf-editor.gschema.xml.orig 2013-08-29 22:55:54.000000000 +0200
-+++ editor/ca.desrt.dconf-editor.gschema.xml 2013-08-29 23:08:00.000000000 +0200
-@@ -1,20 +1,25 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <schemalist gettext-domain='dconf'>
- <schema id="ca.desrt.dconf-editor.Settings" path="/ca/desrt/dconf-editor/">
-- <key name="width" type="i">
-+ <key name="window-width" type="i">
- <default>800</default>
- <summary>The width of the window</summary>
- <description>The width of the main window in pixels.</description>
- </key>
-- <key name="height" type="i">
-+ <key name="window-height" type="i">
- <default>600</default>
- <summary>The height of the window</summary>
- <description>The height of the main window in pixels.</description>
- </key>
-- <key name="maximized" type="b">
-+ <key name="window-is-maximized" type="b">
- <default>false</default>
- <summary>A flag to enable maximized mode</summary>
- <description>A flag to enable maximized mode</description>
- </key>
-+ <key name="window-is-fullscreen" type="b">
-+ <default>false</default>
-+ <summary>A flag to enable fullscreen mode</summary>
-+ <description>A flag to enable fullscreen mode</description>
-+ </key>
- </schema>
- </schemalist>
Deleted: trunk/devel/dconf/files/patch-editor_dconf-editor.vala
===================================================================
--- trunk/devel/dconf/files/patch-editor_dconf-editor.vala 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-editor_dconf-editor.vala 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,157 +0,0 @@
---- editor/dconf-editor.vala.orig 2013-05-01 21:48:10.000000000 +0000
-+++ editor/dconf-editor.vala 2013-05-01 21:50:26.000000000 +0000
-@@ -5,6 +5,10 @@
- private Settings settings;
- private Gtk.Builder ui;
- private Gtk.ApplicationWindow window;
-+ private int window_width = 0;
-+ private int window_height = 0;
-+ private bool window_is_maximized = false;
-+ private bool window_is_fullscreen = false;
- private Gtk.TreeView dir_tree_view;
- private Gtk.TreeView key_tree_view;
- private Gtk.Grid key_info_grid;
-@@ -72,8 +76,10 @@
- }
- set_app_menu((MenuModel)menu_ui.get_object("menu"));
-
-- window.set_default_size (settings.get_int ("width"), settings.get_int ("height"));
-- if (settings.get_boolean ("maximized"))
-+ window.set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height"));
-+ if (settings.get_boolean ("window-is-fullscreen"))
-+ window.fullscreen ();
-+ else if (settings.get_boolean ("window-is-maximized"))
- window.maximize ();
-
- dir_tree_view = new DConfDirView();
-@@ -124,6 +130,15 @@
- window.present();
- }
-
-+ protected override void shutdown ()
-+ {
-+ base.shutdown();
-+ settings.set_int ("window-width", window_width);
-+ settings.set_int ("window-height", window_height);
-+ settings.set_boolean ("window-is-maximized", window_is_maximized);
-+ settings.set_boolean ("window-is-fullscreen", window_is_fullscreen);
-+ }
-+
- private void dir_selected_cb()
- {
- KeyModel? key_model = null;
-@@ -201,11 +216,16 @@
- {
- if (selected_key.schema != null)
- {
-+ var gettext_domain = selected_key.schema.gettext_domain;
- schema_name = selected_key.schema.schema.id;
- if (selected_key.schema.summary != null)
- summary = selected_key.schema.summary;
-+ if (gettext_domain != null && summary != "")
-+ summary = dgettext(gettext_domain, summary);
- if (selected_key.schema.description != null)
- description = selected_key.schema.description;
-+ if (gettext_domain != null && description != "")
-+ description = dgettext(gettext_domain, description);
- type = key_to_description(selected_key);
- default_value = selected_key.schema.default_value.print(false);
- }
-@@ -236,10 +256,10 @@
-
- private bool main_window_configure_event_cb (Gtk.Widget widget, Gdk.EventConfigure event)
- {
-- if (!settings.get_boolean ("maximized"))
-+ if (!window_is_maximized && !window_is_fullscreen)
- {
-- settings.set_int ("width", event.width);
-- settings.set_int ("height", event.height);
-+ window_width = event.width;
-+ window_height = event.height;
- }
-
- return false;
-@@ -248,10 +268,9 @@
- private bool main_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)
- {
- if ((event.changed_mask & Gdk.WindowState.MAXIMIZED) != 0)
-- {
-- var is_maximized = (event.new_window_state & Gdk.WindowState.MAXIMIZED) != 0;
-- settings.set_boolean ("maximized", is_maximized);
-- }
-+ window_is_maximized = (event.new_window_state & Gdk.WindowState.MAXIMIZED) != 0;
-+ if ((event.changed_mask & Gdk.WindowState.FULLSCREEN) != 0)
-+ window_is_fullscreen = (event.new_window_state & Gdk.WindowState.FULLSCREEN) != 0;
-
- return false;
- }
-@@ -266,6 +285,7 @@
- {
- search_label.set_text("");
-
-+ /* Get the current position in the tree */
- Gtk.TreeIter iter;
- var key_iter = Gtk.TreeIter();
- var have_key_iter = false;
-@@ -283,17 +303,31 @@
- else if (!model.get_iter_first(out iter))
- return;
-
-+ var on_first_directory = true;
- do
- {
-+ /* Select next directory that matches */
- var dir = model.get_directory(iter);
- if (!have_key_iter)
-+ {
- have_key_iter = dir.key_model.get_iter_first(out key_iter);
-+ if (!on_first_directory && dir.name.index_of(search_entry.text) >= 0)
-+ {
-+ dir_tree_view.expand_to_path(model.get_path(iter));
-+ dir_tree_view.get_selection().select_iter(iter);
-+ dir_tree_view.scroll_to_cell(model.get_path(iter), null, false, 0, 0);
-+ return;
-+ }
-+ }
-+ on_first_directory = false;
-+
-+ /* Select next key that matches */
- if (have_key_iter)
- {
- do
- {
- var key = dir.key_model.get_key(key_iter);
-- if (key.name.index_of (search_entry.text) >= 0)
-+ if (key_matches(key, search_entry.text))
- {
- dir_tree_view.expand_to_path(model.get_path(iter));
- dir_tree_view.get_selection().select_iter(iter);
-@@ -310,6 +344,28 @@
- search_label.set_text(_("Not found"));
- }
-
-+ private bool key_matches (Key key, string text)
-+ {
-+ /* Check key name */
-+ if (key.name.index_of(text) >= 0)
-+ return true;
-+
-+ /* Check key schema (description) */
-+ if (key.schema != null)
-+ {
-+ if (key.schema.summary != null && key.schema.summary.index_of(text) >= 0)
-+ return true;
-+ if (key.schema.description != null && key.schema.description.index_of(text) >= 0)
-+ return true;
-+ }
-+
-+ /* Check key value */
-+ if (key.value.is_of_type(VariantType.STRING) && key.value.get_string().index_of(text) >= 0)
-+ return true;
-+
-+ return false;
-+ }
-+
- private bool get_next_iter(ref Gtk.TreeIter iter)
- {
- /* Search children next */
Deleted: trunk/devel/dconf/files/patch-editor_dconf-model.vala
===================================================================
--- trunk/devel/dconf/files/patch-editor_dconf-model.vala 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-editor_dconf-model.vala 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,212 +0,0 @@
---- editor/dconf-model.vala.orig 2013-05-01 21:47:59.000000000 +0000
-+++ editor/dconf-model.vala 2013-05-01 21:50:26.000000000 +0000
-@@ -254,7 +254,7 @@
- string[] tokens = path.split("/", 2);
- string name = tokens[0];
-
-- Directory directory = get_child(name);
-+ var directory = get_child(name);
- directory.load_schema(schema, tokens[1]);
- }
- }
-@@ -341,8 +341,10 @@
- return (Key)iter.user_data;
- }
-
-- public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path)
-+ public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path)
- {
-+ iter = Gtk.TreeIter();
-+
- if (path.get_depth() != 1)
- return false;
-
-@@ -391,11 +393,14 @@
- return true;
- }
-
-- public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent)
-+ public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent)
- {
-+ iter = Gtk.TreeIter();
-+
- if (parent != null || directory.keys.length() == 0)
- return false;
- set_iter(ref iter, directory.keys.nth_data(0));
-+
- return true;
- }
-
-@@ -412,8 +417,10 @@
- return 0;
- }
-
-- public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n)
-+ public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n)
- {
-+ iter = Gtk.TreeIter();
-+
- if (parent != null)
- return false;
-
-@@ -423,8 +430,9 @@
- return true;
- }
-
-- public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child)
-+ public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child)
- {
-+ iter = Gtk.TreeIter();
- return false;
- }
-
-@@ -479,8 +487,10 @@
- return (SchemaValue)iter.user_data;
- }
-
-- public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path)
-+ public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path)
- {
-+ iter = Gtk.TreeIter();
-+
- if (path.get_depth() != 1)
- return false;
-
-@@ -513,11 +523,15 @@
- return true;
- }
-
-- public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent)
-+ public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent)
- {
-+ iter = Gtk.TreeIter();
-+
- if (parent != null || schema_enum.values.length() == 0)
- return false;
-+
- set_iter(ref iter, schema_enum.values.nth_data(0));
-+
- return true;
- }
-
-@@ -534,8 +548,10 @@
- return 0;
- }
-
-- public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n)
-+ public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n)
- {
-+ iter = Gtk.TreeIter();
-+
- if (parent != null)
- return false;
-
-@@ -545,8 +561,9 @@
- return true;
- }
-
-- public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child)
-+ public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child)
- {
-+ iter = Gtk.TreeIter();
- return false;
- }
-
-@@ -586,9 +603,14 @@
- schemas = new SchemaList();
- try
- {
-- foreach (var dir in GLib.Environment.get_system_data_dirs())
-+ var dirs = GLib.Environment.get_system_data_dirs();
-+
-+ /* Walk directories in reverse so the schemas in the
-+ * directory which appears first in the XDG_DATA_DIRS are
-+ * not overridden. */
-+ for (int i = dirs.length - 1; i >= 0; i--)
- {
-- var path = Path.build_filename (dir, "glib-2.0", "schemas", null);
-+ var path = Path.build_filename (dirs[i], "glib-2.0", "schemas");
- if (File.new_for_path (path).query_exists ())
- schemas.load_directory (path);
- }
-@@ -601,7 +623,7 @@
- }
-
- /* Add keys for the values in the schemas */
-- foreach (var schema in schemas.schemas)
-+ foreach (var schema in schemas.schemas.get_values())
- root.load_schema(schema, schema.path[1:schema.path.length]);
- }
-
-@@ -639,8 +661,10 @@
- return (Directory)iter.user_data;
- }
-
-- public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path)
-+ public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path)
- {
-+ iter = Gtk.TreeIter();
-+
- if (!iter_nth_child(out iter, null, path.get_indices()[0]))
- return false;
-
-@@ -672,19 +696,23 @@
-
- public bool iter_next(ref Gtk.TreeIter iter)
- {
-- Directory directory = get_directory(iter);
-+ var directory = get_directory(iter);
- if (directory.index >= directory.parent.children.length() - 1)
- return false;
- set_iter(ref iter, directory.parent.children.nth_data(directory.index+1));
-+
- return true;
- }
-
-- public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent)
-+ public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent)
- {
-- Directory directory = get_directory(parent);
-+ iter = Gtk.TreeIter();
-+
-+ var directory = get_directory(parent);
- if (directory.children.length() == 0)
- return false;
- set_iter(ref iter, directory.children.nth_data(0));
-+
- return true;
- }
-
-@@ -698,21 +726,28 @@
- return (int) get_directory(iter).children.length();
- }
-
-- public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n)
-+ public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n)
- {
-- Directory directory = get_directory(parent);
-+ iter = Gtk.TreeIter();
-+
-+ var directory = get_directory(parent);
- if (n >= directory.children.length())
- return false;
- set_iter(ref iter, directory.children.nth_data(n));
-+
- return true;
- }
-
-- public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child)
-+ public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child)
- {
-- Directory directory = get_directory(child);
-+ iter = Gtk.TreeIter();
-+
-+ var directory = get_directory(child);
- if (directory.parent == root)
- return false;
-+
- set_iter(ref iter, directory.parent);
-+
- return true;
- }
-
Deleted: trunk/devel/dconf/files/patch-editor_dconf-schema.vala
===================================================================
--- trunk/devel/dconf/files/patch-editor_dconf-schema.vala 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-editor_dconf-schema.vala 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,129 +0,0 @@
---- editor/dconf-schema.vala.orig 2013-05-01 21:48:04.000000000 +0000
-+++ editor/dconf-schema.vala 2013-05-01 21:50:26.000000000 +0000
-@@ -44,7 +44,7 @@
- {
- try
- {
-- default_value = Variant.parse(new VariantType(type), child->children->content);
-+ default_value = Variant.parse(new VariantType(type), child->get_content());
- }
- catch (VariantParseError e)
- {
-@@ -52,9 +52,9 @@
- }
- }
- else if (child->name == "summary")
-- summary = child->children == null ? "" : child->children->content;
-+ summary = child->get_content();
- else if (child->name == "description")
-- description = child->children == null ? "" : child->children->content;
-+ description = child->get_content();
- else if (child->name == "range")
- range = new SchemaValueRange.from_xml(type, child);
- else if (child->name == "choices")
-@@ -345,7 +345,7 @@
-
- public class SchemaList
- {
-- public GLib.List<Schema> schemas = new GLib.List<Schema>();
-+ public GLib.HashTable<string, Schema> schemas = new GLib.HashTable<string, Schema>(str_hash, str_equal);
- public GLib.HashTable<string, SchemaKey> keys = new GLib.HashTable<string, SchemaKey>(str_hash, str_equal);
- public GLib.HashTable<string, SchemaEnum> enums = new GLib.HashTable<string, SchemaEnum>(str_hash, str_equal);
- public GLib.HashTable<string, SchemaFlags> flags = new GLib.HashTable<string, SchemaFlags>(str_hash, str_equal);
-@@ -385,7 +385,7 @@
- string full_name = schema.path + key.name;
- keys.insert(full_name, key);
- }
-- schemas.append(schema);
-+ schemas.insert(schema.id, schema);
- }
- else if (node->name == "enum")
- {
-@@ -407,19 +407,79 @@
- delete doc;
- }
-
-+ public void parse_override(string path)
-+ {
-+ var keyfile = new KeyFile();
-+ try
-+ {
-+ keyfile.load_from_file(path, KeyFileFlags.NONE);
-+ }
-+ catch (Error e)
-+ {
-+ warning("Failed to load override file %s: %s", path, e.message);
-+ return;
-+ }
-+
-+ foreach (var group in keyfile.get_groups())
-+ {
-+ var schema = schemas.lookup(group);
-+ if (schema == null)
-+ continue;
-+
-+ string[] keys;
-+ try { keys = keyfile.get_keys(group); } catch (Error e) { continue; }
-+
-+ foreach (var key_name in keys)
-+ {
-+ string value;
-+ try { value = keyfile.get_value(group, key_name); } catch (Error e) { continue; }
-+
-+ var key = schema.keys.lookup (key_name);
-+ if (key == null)
-+ continue;
-+
-+ Variant default_value;
-+ try
-+ {
-+ default_value = Variant.parse(new VariantType(key.type), value);
-+ }
-+ catch (VariantParseError e)
-+ {
-+ // ...
-+ continue;
-+ }
-+
-+ key.default_value = default_value;
-+ }
-+ }
-+ }
-+
- public void load_directory(string dir) throws Error
- {
-- File directory = File.new_for_path(dir);
-+ var directory = File.new_for_path(dir);
-+
- var i = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0, null);
-- FileInfo info;
-- while ((info = i.next_file (null)) != null) {
-- string name = info.get_name();
-+ while (true)
-+ {
-+ var info = i.next_file (null);
-+ if (info == null)
-+ break;
-+ var name = info.get_name();
-
-- if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml"))
-- continue;
-+ if (name.has_suffix(".gschema.xml") || name.has_suffix(".enums.xml"))
-+ parse_file(Path.build_filename(dir, name, null));
-+ }
-+
-+ i = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0, null);
-+ while (true)
-+ {
-+ var info = i.next_file (null);
-+ if (info == null)
-+ break;
-+ var name = info.get_name();
-
-- string path = Path.build_filename(dir, name, null);
-- parse_file(path);
-+ if (name.has_suffix(".override"))
-+ parse_override(Path.build_filename(dir, name, null));
- }
- }
- }
Deleted: trunk/devel/dconf/files/patch-editors_dconf-view.vala
===================================================================
--- trunk/devel/dconf/files/patch-editors_dconf-view.vala 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-editors_dconf-view.vala 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,11 +0,0 @@
---- editor/dconf-view.vala.orig 2013-05-01 21:48:19.000000000 +0000
-+++ editor/dconf-view.vala 2013-05-01 21:50:26.000000000 +0000
-@@ -270,7 +270,7 @@
-
- private void spin_edited_cb(Gtk.CellRendererText renderer, string path, string text)
- {
-- Key key = get_key_from_path(path);
-+ var key = get_key_from_path(path);
- switch (key.type_string)
- {
- case "y":
Deleted: trunk/devel/dconf/files/patch-test_Makefile.am
===================================================================
--- trunk/devel/dconf/files/patch-test_Makefile.am 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-test_Makefile.am 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,21 +0,0 @@
---- tests/Makefile.orig.am 2013-03-26 21:34:03.467621533 +0100
-+++ tests/Makefile.am 2013-03-26 21:34:43.396618710 +0100
-@@ -28,8 +28,7 @@
- shm_CFLAGS = $(glib_CFLAGS)
- shm_LDADD = \
- ../shm/libdconf-shm.a \
-- $(glib_LIBS) \
-- -ldl
-+ $(glib_LIBS)
- shm_SOURCES = \
- shm.c \
- tmpdir.h \
-@@ -79,7 +78,7 @@
- ../common/libdconf-common.a \
- libdconf-mock.a \
- $(glib_LIBS) \
-- -ldl -lm
-+ -lm
- engine_SOURCES = engine.c
- EXTRA_DIST += \
- profile/broken-profile \
Deleted: trunk/devel/dconf/files/patch-test_Makefile.in
===================================================================
--- trunk/devel/dconf/files/patch-test_Makefile.in 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/files/patch-test_Makefile.in 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,21 +0,0 @@
---- tests/Makefile.orig.in 2013-03-26 21:34:10.705623412 +0100
-+++ tests/Makefile.in 2013-03-26 21:34:54.686617478 +0100
-@@ -349,8 +349,7 @@
- shm_CFLAGS = $(glib_CFLAGS)
- shm_LDADD = \
- ../shm/libdconf-shm.a \
-- $(glib_LIBS) \
-- -ldl
-+ $(glib_LIBS)
-
- shm_SOURCES = \
- shm.c \
-@@ -395,7 +394,7 @@
- ../common/libdconf-common.a \
- libdconf-mock.a \
- $(glib_LIBS) \
-- -ldl -lm
-+ -lm
-
- engine_SOURCES = engine.c
- client_CFLAGS = $(gio_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\"
Modified: trunk/devel/dconf/pkg-descr
===================================================================
--- trunk/devel/dconf/pkg-descr 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/pkg-descr 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,5 +1,18 @@
-Dconf is a low-level configuration system. Its main purpose is to
-provide a backend to GSettings on platforms that don't already have
-configuration storage systems.
+GConf extends the concept of a configuration registry. It provides
+a simple way for applications and administrators to store data;
+often GConf is used to store preferences for applications.
-WWW: https://live.gnome.org/dconf
+Some of the features of GConf are:
+GConf provides:
+
+ * Documentation for each configuration key, so that administrators
+ can better modify the value.
+
+ * Notifications to interested applications when configuration data
+ is changed. The notification service works across networks,
+ affecting all login sessions for a single user.
+
+ * Proper locking so that configuration data doesn't get corrupted
+ when accessed by multiple applications at the same time.
+
+WWW: http://live.gnome.org/dconf
Modified: trunk/devel/dconf/pkg-plist
===================================================================
--- trunk/devel/dconf/pkg-plist 2015-05-09 02:53:23 UTC (rev 18824)
+++ trunk/devel/dconf/pkg-plist 2015-05-09 02:57:50 UTC (rev 18825)
@@ -1,6 +1,7 @@
bin/dconf
include/dconf/client/dconf-client.h
include/dconf/common/dconf-changeset.h
+include/dconf/common/dconf-error.h
include/dconf-dbus-1/dconf-dbus-1.h
include/dconf/common/dconf-paths.h
include/dconf/dconf.h
@@ -7,8 +8,10 @@
lib/gio/modules/libdconfsettings.so
lib/libdconf.so
lib/libdconf.so.1
+lib/libdconf.so.1.0.0
lib/libdconf-dbus-1.so
lib/libdconf-dbus-1.so.0
+lib/libdconf-dbus-1.so.0.0.0
libdata/pkgconfig/dconf.pc
libdata/pkgconfig/dconf-dbus-1.pc
libexec/dconf-service
@@ -19,6 +22,8 @@
share/bash-completion/completions/dconf
share/dbus-1/services/ca.desrt.dconf.service
share/gtk-doc/html/dconf/dconf-DConfChangeset.html
+share/gtk-doc/html/dconf/dconf-DConfError.html
+share/gtk-doc/html/dconf/dconf-dconf-Paths.html
share/gtk-doc/html/dconf/dconf-editor.html
share/gtk-doc/html/dconf/dconf-overview.html
share/gtk-doc/html/dconf/dconf-service.html
@@ -25,7 +30,6 @@
share/gtk-doc/html/dconf/dconf-tool.html
share/gtk-doc/html/dconf/programs.html
share/gtk-doc/html/dconf/DConfClient.html
-share/gtk-doc/html/dconf/dconf-DConf-Paths.html
share/gtk-doc/html/dconf/annotation-glossary.html
share/gtk-doc/html/dconf/api-index-full.html
share/gtk-doc/html/dconf/ch01.html
@@ -33,11 +37,15 @@
share/gtk-doc/html/dconf/home.png
share/gtk-doc/html/dconf/index.html
share/gtk-doc/html/dconf/index.sgml
+share/gtk-doc/html/dconf/left-insensitive.png
share/gtk-doc/html/dconf/left.png
share/gtk-doc/html/dconf/object-tree.html
+share/gtk-doc/html/dconf/right-insensitive.png
share/gtk-doc/html/dconf/right.png
share/gtk-doc/html/dconf/style.css
+share/gtk-doc/html/dconf/up-insensitive.png
share/gtk-doc/html/dconf/up.png
+share/locale/an/LC_MESSAGES/dconf.mo
share/locale/ar/LC_MESSAGES/dconf.mo
share/locale/as/LC_MESSAGES/dconf.mo
share/locale/be/LC_MESSAGES/dconf.mo
@@ -53,9 +61,11 @@
share/locale/eo/LC_MESSAGES/dconf.mo
share/locale/es/LC_MESSAGES/dconf.mo
share/locale/et/LC_MESSAGES/dconf.mo
+share/locale/eu/LC_MESSAGES/dconf.mo
share/locale/fa/LC_MESSAGES/dconf.mo
share/locale/fi/LC_MESSAGES/dconf.mo
share/locale/fr/LC_MESSAGES/dconf.mo
+share/locale/fur/LC_MESSAGES/dconf.mo
share/locale/gl/LC_MESSAGES/dconf.mo
share/locale/he/LC_MESSAGES/dconf.mo
share/locale/hi/LC_MESSAGES/dconf.mo
@@ -69,6 +79,7 @@
share/locale/ml/LC_MESSAGES/dconf.mo
share/locale/mr/LC_MESSAGES/dconf.mo
share/locale/nb/LC_MESSAGES/dconf.mo
+share/locale/nl/LC_MESSAGES/dconf.mo
share/locale/pa/LC_MESSAGES/dconf.mo
share/locale/pl/LC_MESSAGES/dconf.mo
share/locale/pt/LC_MESSAGES/dconf.mo
@@ -81,7 +92,10 @@
share/locale/sv/LC_MESSAGES/dconf.mo
share/locale/ta/LC_MESSAGES/dconf.mo
share/locale/te/LC_MESSAGES/dconf.mo
+share/locale/tg/LC_MESSAGES/dconf.mo
share/locale/th/LC_MESSAGES/dconf.mo
+share/locale/tr/LC_MESSAGES/dconf.mo
+share/locale/ug/LC_MESSAGES/dconf.mo
share/locale/uk/LC_MESSAGES/dconf.mo
share/locale/vi/LC_MESSAGES/dconf.mo
share/locale/zh_CN/LC_MESSAGES/dconf.mo
@@ -89,12 +103,7 @@
share/locale/zh_TW/LC_MESSAGES/dconf.mo
share/vala/vapi/dconf.deps
share/vala/vapi/dconf.vapi
- at dirrm share/gtk-doc/html/dconf
- at dirrmtry share/gtk-doc/html
- at dirrmtry share/gtk-doc
- at dirrm include/dconf-dbus-1
- at dirrm include/dconf/common
- at dirrm include/dconf/client
- at dirrm include/dconf
+ at dir etc/dconf/db
+ at dir etc/dconf/profile
@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
More information about the Midnightbsd-cvs
mailing list