From 3510a1f78670ba81f89d33cdbccf1050204c8025 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Fri, 6 Sep 2013 22:43:26 +0000
Subject: Update to 0.16.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18675 df743ca5-7f9a-e211-a948-0013205c9059
---
devel/dconf-editor/Makefile | 2 +-
devel/dconf-editor/pkg-plist | 12 +-
devel/dconf/Makefile | 10 +-
devel/dconf/distinfo | 4 +-
devel/dconf/files/patch-client_Makefile.in | 23 +--
devel/dconf/files/patch-dbus-1_Makefile.in | 21 +--
.../patch-editor_ca.desrt.dconf-editor.gschema.xml | 31 ----
devel/dconf/files/patch-editor_dconf-editor.vala | 157 ---------------------
devel/dconf/files/patch-editor_dconf-model.vala | 36 +----
devel/dconf/files/patch-editor_dconf-schema.vala | 129 -----------------
devel/dconf/pkg-plist | 11 +-
11 files changed, 55 insertions(+), 381 deletions(-)
delete mode 100644 devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml
delete mode 100644 devel/dconf/files/patch-editor_dconf-editor.vala
delete mode 100644 devel/dconf/files/patch-editor_dconf-schema.vala
(limited to 'devel')
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
index cb9fe3e8d..c99938642 100644
--- a/devel/dconf-editor/Makefile
+++ b/devel/dconf-editor/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= dconf
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -editor
COMMENT= configuration editor for dconf
diff --git a/devel/dconf-editor/pkg-plist b/devel/dconf-editor/pkg-plist
index 5c035237d..e95cc0d46 100644
--- a/devel/dconf-editor/pkg-plist
+++ b/devel/dconf-editor/pkg-plist
@@ -1,7 +1,17 @@
bin/dconf-editor
share/applications/dconf-editor.desktop
+share/dconf-editor/dconf-editor-menu.ui
share/dconf-editor/dconf-editor.ui
-share/icons/hicolor/128x128/apps/dconf-editor.png
+share/icons/HighContrast/16x16/apps/dconf-editor.png
+share/icons/HighContrast/22x22/apps/dconf-editor.png
+share/icons/HighContrast/24x24/apps/dconf-editor.png
+share/icons/HighContrast/256x256/apps/dconf-editor.png
+share/icons/HighContrast/32x32/apps/dconf-editor.png
+share/icons/HighContrast/48x48/apps/dconf-editor.png
+share/icons/hicolor/16x16/apps/dconf-editor.png
+share/icons/hicolor/22x22/apps/dconf-editor.png
+share/icons/hicolor/24x24/apps/dconf-editor.png
+share/icons/hicolor/256x256/apps/dconf-editor.png
share/icons/hicolor/32x32/apps/dconf-editor.png
share/icons/hicolor/48x48/apps/dconf-editor.png
share/icons/hicolor/64x64/apps/dconf-editor.png
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 261f97d0c..95021c322 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME?= dconf
-PORTVERSION= 0.14.1
+PORTVERSION= 0.16.1
PORTREVISION= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -28,7 +28,7 @@ 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
@@ -37,7 +37,7 @@ LIB_DEPENDS+= libdconf.so:${PORTSDIR}/devel/dconf
CONFIGURE_ARGS+=--disable-editor
.endif
-.if ${DCONF_SLAVE} == "no"
+.if ${DCONF_SLAVE} == no
MAN1= dconf-editor.1 dconf-service.1 dconf.1
MAN7= dconf.7
.endif
@@ -55,10 +55,6 @@ post-patch:
${WRKSRC}/client/Makefile.in \
${WRKSRC}/editor/Makefile.in
-#pre-build:
-# ${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
-# ${GMAKE} -C ${WRKSRC}/dbus-1 dconf-dbus-1.c libdconf-dbus-1.so.0
-
post-install:
-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
@${MKDIR} ${PREFIX}/etc/dconf/db
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index e1afb761d..af14d5347 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -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.16.1.tar.xz) = a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee
+SIZE (gnome3/dconf-0.16.1.tar.xz) = 373800
diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in
index c53b723b7..5d49e9e24 100644
--- a/devel/dconf/files/patch-client_Makefile.in
+++ b/devel/dconf/files/patch-client_Makefile.in
@@ -1,21 +1,22 @@
---- 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
+--- client/Makefile.in.orig 2013-09-06 20:42:04.000000000 +0200
++++ client/Makefile.in 2013-09-06 20:44:20.000000000 +0200
+@@ -83,7 +83,7 @@
+ $(srcdir)/Makefile.am $(srcdir)/dconf.pc.in \
+ $(top_srcdir)/aux/depcomp $(dconfclientinclude_HEADERS) \
+ $(dconfinclude_HEADERS)
-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 @@
-
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+@@ -476,12 +476,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)
+- @rm -f libdconf.so.1.0.0$(EXEEXT)
+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)
++ @rm -f libdconf.so.1$(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
@@ -24,7 +25,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -838,12 +838,8 @@
+@@ -899,12 +899,8 @@
# run tests in cwd as part of make check
check-local: test-nonrecursive
diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in
index 2cabd14fb..2cb4dc585 100644
--- a/devel/dconf/files/patch-dbus-1_Makefile.in
+++ b/devel/dconf/files/patch-dbus-1_Makefile.in
@@ -1,15 +1,15 @@
---- 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
+--- dbus-1/Makefile.in.orig 2013-09-06 20:44:51.000000000 +0200
++++ dbus-1/Makefile.in 2013-09-06 20:47:45.000000000 +0200
+@@ -82,7 +82,7 @@
+ DIST_COMMON = $(top_srcdir)/Makefile.gtester $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(srcdir)/dconf-dbus-1.pc.in \
+ $(top_srcdir)/aux/depcomp $(dconf_dbus_1include_HEADERS)
-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 @@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+@@ -396,7 +396,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
@@ -18,11 +18,12 @@
CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
all: all-am
-@@ -430,13 +430,12 @@
+@@ -489,14 +489,13 @@
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)
@@ -35,7 +36,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -821,12 +820,8 @@
+@@ -882,12 +881,8 @@
# run tests in cwd as part of make check
check-local: test-nonrecursive
diff --git a/devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml b/devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml
deleted file mode 100644
index bacfb9411..000000000
--- a/devel/dconf/files/patch-editor_ca.desrt.dconf-editor.gschema.xml
+++ /dev/null
@@ -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>
diff --git a/devel/dconf/files/patch-editor_dconf-editor.vala b/devel/dconf/files/patch-editor_dconf-editor.vala
deleted file mode 100644
index 3c03fa220..000000000
--- a/devel/dconf/files/patch-editor_dconf-editor.vala
+++ /dev/null
@@ -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 */
diff --git a/devel/dconf/files/patch-editor_dconf-model.vala b/devel/dconf/files/patch-editor_dconf-model.vala
index 58077d674..9556c0c01 100644
--- a/devel/dconf/files/patch-editor_dconf-model.vala
+++ b/devel/dconf/files/patch-editor_dconf-model.vala
@@ -1,5 +1,5 @@
---- 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
+--- editor/dconf-model.vala.orig 2013-09-07 00:35:35.000000000 +0200
++++ editor/dconf-model.vala 2013-09-07 00:35:37.000000000 +0200
@@ -254,7 +254,7 @@
string[] tokens = path.split("/", 2);
string name = tokens[0];
@@ -112,33 +112,7 @@
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 @@
+@@ -644,8 +661,10 @@
return (Directory)iter.user_data;
}
@@ -150,7 +124,7 @@
if (!iter_nth_child(out iter, null, path.get_indices()[0]))
return false;
-@@ -672,19 +696,23 @@
+@@ -677,19 +696,23 @@
public bool iter_next(ref Gtk.TreeIter iter)
{
@@ -177,7 +151,7 @@
return true;
}
-@@ -698,21 +726,28 @@
+@@ -703,21 +726,28 @@
return (int) get_directory(iter).children.length();
}
diff --git a/devel/dconf/files/patch-editor_dconf-schema.vala b/devel/dconf/files/patch-editor_dconf-schema.vala
deleted file mode 100644
index 2c624560c..000000000
--- a/devel/dconf/files/patch-editor_dconf-schema.vala
+++ /dev/null
@@ -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));
- }
- }
- }
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index cf6721937..24be69956 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -16,13 +16,13 @@ libexec/dconf-service
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-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
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
@@ -35,6 +35,7 @@ share/gtk-doc/html/dconf/object-tree.html
share/gtk-doc/html/dconf/right.png
share/gtk-doc/html/dconf/style.css
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
@@ -50,6 +51,7 @@ share/locale/en_GB/LC_MESSAGES/dconf.mo
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
@@ -78,7 +80,10 @@ share/locale/sr@latin/LC_MESSAGES/dconf.mo
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
@@ -86,6 +91,10 @@ share/locale/zh_HK/LC_MESSAGES/dconf.mo
share/locale/zh_TW/LC_MESSAGES/dconf.mo
share/vala/vapi/dconf.deps
share/vala/vapi/dconf.vapi
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
@dirrm share/gtk-doc/html/dconf
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
--
cgit v1.2.3