openkylin
/
glib2.0
mirror of https://gitee.com/openkylin/glib2.0.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
glib2.0/debian/patches/Modify-debian-control.patch

2998 lines
102 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From: su-fang <sufang@kylinos.cn>
Date: Mon, 20 Feb 2023 17:15:32 +0800
Subject: Modify debian/control.
---
gio/gdesktopappinfo.c | 2 +
gio/glib-compile-schemas.c | 4 +
gio/tests/debugcontroller.c | 6 +
gio/tests/gdbus-server-auth.c | 7 +
gio/tests/gdbus-threading.c | 6 +
gio/tests/gmenumodel.c | 6 +
gio/tests/memory-monitor-dbus.py.in | 20 +-
gio/tests/testfilemonitor.c | 38 +-
glib/gkeyfile.c | 103 +++++
glib/tests/gvariant.c | 8 +
glib/tests/gwakeuptest.c | 17 +-
glib/tests/mainloop.c | 16 +
glib/tests/spawn-test.c | 11 +-
glib/tests/thread.c | 9 +-
glib/tests/timeout.c | 9 +
glib/tests/timer.c | 10 +-
gobject/tests/closure-refcount.c | 8 +
gobject/tests/threadtests.c | 8 +
subprojects/gvdb/COPYING | 504 ------------------------
subprojects/gvdb/README.md | 25 --
subprojects/gvdb/gvdb.doap | 57 ---
subprojects/gvdb/gvdb/gvdb-builder.c | 637 ------------------------------
subprojects/gvdb/gvdb/gvdb-builder.h | 66 ----
subprojects/gvdb/gvdb/gvdb-format.h | 85 ----
subprojects/gvdb/gvdb/gvdb-reader.c | 736 -----------------------------------
subprojects/gvdb/gvdb/gvdb-reader.h | 78 ----
subprojects/gvdb/meson.build | 15 -
27 files changed, 277 insertions(+), 2214 deletions(-)
delete mode 100644 subprojects/gvdb/COPYING
delete mode 100644 subprojects/gvdb/README.md
delete mode 100644 subprojects/gvdb/gvdb.doap
delete mode 100644 subprojects/gvdb/gvdb/gvdb-builder.c
delete mode 100644 subprojects/gvdb/gvdb/gvdb-builder.h
delete mode 100644 subprojects/gvdb/gvdb/gvdb-format.h
delete mode 100644 subprojects/gvdb/gvdb/gvdb-reader.c
delete mode 100644 subprojects/gvdb/gvdb/gvdb-reader.h
delete mode 100644 subprojects/gvdb/meson.build
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index c29c309..c244272 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2676,6 +2676,8 @@ prepend_terminal_to_vector (int *argc,
}
else
{
+ if (check == NULL)
+ check = g_find_program_in_path ("kgx");
if (check == NULL)
check = g_find_program_in_path ("tilix");
if (check == NULL)
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 326658a..d8565f2 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -1234,6 +1234,9 @@ parse_state_start_schema (ParseState *state,
return;
}
+ // Disable this warning: it confuses users and there is unlikely to be much
+ // progress towards fixing
+ /*
if (path && (g_str_has_prefix (path, "/apps/") ||
g_str_has_prefix (path, "/desktop/") ||
g_str_has_prefix (path, "/system/")))
@@ -1246,6 +1249,7 @@ parse_state_start_schema (ParseState *state,
g_printerr ("%s\n", message);
g_free (message);
}
+ */
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
diff --git a/gio/tests/debugcontroller.c b/gio/tests/debugcontroller.c
index 862e8f6..ebe90ef 100644
--- a/gio/tests/debugcontroller.c
+++ b/gio/tests/debugcontroller.c
@@ -191,6 +191,12 @@ test_dbus_properties (void)
g_test_summary ("Test getting and setting properties on a #GDebugControllerDBus.");
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2486#note_1384102");
+ return;
+ }
+
/* Set up a test session bus and connection. Set up a separate second
* connection to simulate a remote peer. */
bus = g_test_dbus_new (G_TEST_DBUS_NONE);
diff --git a/gio/tests/gdbus-server-auth.c b/gio/tests/gdbus-server-auth.c
index c683f61..8b230c3 100644
--- a/gio/tests/gdbus-server-auth.c
+++ b/gio/tests/gdbus-server-auth.c
@@ -326,6 +326,13 @@ do_test_server_auth (InteropFlags flags)
}
#endif
+ if ((flags & (INTEROP_FLAGS_TCP | INTEROP_FLAGS_SHA1)) &&
+ g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/glib/-/issues/2206");
+ goto out;
+ }
+
if (flags & INTEROP_FLAGS_ANONYMOUS)
server_flags |= G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
if (flags & INTEROP_FLAGS_REQUIRE_SAME_USER)
diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
index 8323dd2..da1f7e6 100644
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
@@ -679,6 +679,12 @@ main (int argc,
g_test_init (&argc, &argv, NULL);
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_print("ok 1 # SKIP all gdbus-threading tests skipped because they are too unreliable (glib#1515)\n");
+ return 77;
+ }
+
session_bus_up ();
/* this is safe; testserver will exit once the bus goes away */
diff --git a/gio/tests/gmenumodel.c b/gio/tests/gmenumodel.c
index 9d3e5cb..f89def1 100644
--- a/gio/tests/gmenumodel.c
+++ b/gio/tests/gmenumodel.c
@@ -1160,6 +1160,12 @@ test_dbus_peer_subscriptions (void)
#else
PeerConnection peer;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("Not reliable? #932678");
+ return;
+ }
+
peer_connection_up (&peer);
do_subscriptions (peer.server_connection, peer.client_connection);
peer_connection_down (&peer);
diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in
index bf32918..61e6f94 100755
--- a/gio/tests/memory-monitor-dbus.py.in
+++ b/gio/tests/memory-monitor-dbus.py.in
@@ -39,6 +39,8 @@ try:
klass.start_system_bus()
klass.dbus_con = klass.get_dbus(True)
+ @unittest.skipIf('DEB_ALLOW_FLAKY_TESTS' not in os.environ,
+ 'https://bugs.debian.org/995178')
def setUp(self):
try:
Gio.MemoryMonitor
@@ -72,18 +74,29 @@ try:
Timeout is in deciseconds, defaulting to 50 (5 seconds). message is
printed on failure.
'''
+ print('Waiting up to {}/10 seconds for {!r} to be true'.format(timeout, condition))
+ orig_timeout = timeout
+
while timeout >= 0:
+ print('Loop iteration')
context = GLib.MainContext.default()
while context.iteration(False):
+ print('Iterating main loop')
pass
if condition():
+ print('Condition reached')
break
timeout -= 1
time.sleep(0.1)
else:
+ print('Condition not reached in {}/10 seconds'.format(orig_timeout))
self.fail(message or 'timed out waiting for ' + str(condition))
def memory_warning_cb(self, monitor, level):
+ print('low-memory-warning: monitor {!r} reports level {}'.format(
+ monitor,
+ level,
+ ))
self.last_warning = level
self.main_context.wakeup()
@@ -93,17 +106,20 @@ try:
# Wait 2 seconds
timeout = 2
while timeout > 0:
+ print('Waiting 0.5s for stray events...')
time.sleep(0.5)
timeout -= 0.5
self.main_context.iteration(False)
+ print('Emitting mock low-memory warning, level 100: try to free memory')
self.dbusmock.EmitWarning(100)
# Wait 2 seconds or until warning
- self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 20)
+ self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 100)
+ print('Emitting mock low-memory warning, level 255: OOM imminent')
self.dbusmock.EmitWarning(255)
# Wait 2 seconds or until warning
- self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 20)
+ self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 100)
except ImportError as e:
@unittest.skip("Cannot import %s" % e.name)
diff --git a/gio/tests/testfilemonitor.c b/gio/tests/testfilemonitor.c
index 7274f79..c2ba382 100644
--- a/gio/tests/testfilemonitor.c
+++ b/gio/tests/testfilemonitor.c
@@ -32,6 +32,12 @@ setup (Fixture *fixture,
gchar *path = NULL;
GError *local_error = NULL;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/glib/issues/1634");
+ return;
+ }
+
path = g_dir_make_tmp ("gio-test-testfilemonitor_XXXXXX", &local_error);
g_assert_no_error (local_error);
@@ -48,7 +54,9 @@ teardown (Fixture *fixture,
{
GError *local_error = NULL;
- g_file_delete (fixture->tmp_dir, NULL, &local_error);
+ if (fixture->tmp_dir != NULL)
+ g_file_delete (fixture->tmp_dir, NULL, &local_error);
+
g_assert_no_error (local_error);
g_clear_object (&fixture->tmp_dir);
}
@@ -375,6 +383,10 @@ test_atomic_replace (Fixture *fixture,
if (skip_win32 ())
return;
+ /* respect g_test_skip() during setup() */
+ if (g_test_failed ())
+ return;
+
data.step = 0;
data.events = NULL;
@@ -483,6 +495,10 @@ test_file_changes (Fixture *fixture,
if (skip_win32 ())
return;
+ /* respect g_test_skip() during setup() */
+ if (g_test_failed ())
+ return;
+
data.step = 0;
data.events = NULL;
@@ -603,6 +619,10 @@ test_dir_monitor (Fixture *fixture,
if (skip_win32 ())
return;
+ /* respect g_test_skip() during setup() */
+ if (g_test_failed ())
+ return;
+
data.step = 0;
data.events = NULL;
@@ -703,6 +723,10 @@ test_dir_non_existent (Fixture *fixture,
if (skip_win32 ())
return;
+ /* respect g_test_skip() during setup() */
+ if (g_test_failed ())
+ return;
+
data.step = 0;
data.events = NULL;
@@ -815,6 +839,10 @@ test_cross_dir_moves (Fixture *fixture,
if (skip_win32 ())
return;
+ /* respect g_test_skip() during setup() */
+ if (g_test_failed ())
+ return;
+
data[0].step = 0;
data[0].events = NULL;
@@ -984,6 +1012,10 @@ test_file_hard_links (Fixture *fixture,
GError *error = NULL;
TestData data;
+ /* respect g_test_skip() during setup() */
+ if (g_test_failed ())
+ return;
+
g_test_bug ("https://bugzilla.gnome.org/show_bug.cgi?id=755721");
if (skip_win32 ())
@@ -1043,6 +1075,10 @@ test_finalize_in_callback (Fixture *fixture,
GFile *file = NULL;
guint i;
+ /* respect g_test_skip() during setup() */
+ if (g_test_failed ())
+ return;
+
g_test_summary ("Test that finalization of a GFileMonitor in one of its "
"callbacks doesn’t cause a deadlock.");
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/1941");
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 6ae738c..1b8043d 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -491,6 +491,17 @@
* Since: 2.14
*/
+/* Downstream Debian defines for calling gettext() if a .desktop file doesn’t
+ * contain translations. These are not standardised.
+ *
+ * See: https://launchpad.net/bugs/3935
+ * See:http://bugzilla.gnome.org/show_bug.cgi?id=569829
+ */
+#define G_KEY_FILE_DESKTOP_ACTION_GROUP_PREFIX "Desktop Action"
+#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain"
+#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"
+#define G_KEY_FILE_DESKTOP_KEY_KEYWORDS "Keywords"
+
typedef struct _GKeyFileGroup GKeyFileGroup;
/**
@@ -515,6 +526,7 @@ struct _GKeyFile
gboolean checked_locales; /* TRUE if @locales has been initialised */
gchar **locales; /* (nullable) */
+ gchar *gettext_domain;
gint ref_count; /* (atomic) */
};
@@ -641,6 +653,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->parse_buffer = NULL;
key_file->list_separator = ';';
key_file->flags = 0;
+ key_file->gettext_domain = NULL;
}
static void
@@ -661,6 +674,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->parse_buffer = NULL;
}
+ if (key_file->gettext_domain)
+ {
+ g_free (key_file->gettext_domain);
+ key_file->gettext_domain = NULL;
+ }
+
tmp = key_file->groups;
while (tmp != NULL)
{
@@ -881,6 +900,21 @@ g_key_file_load_from_fd (GKeyFile *key_file,
return FALSE;
}
+ key_file->gettext_domain = g_key_file_get_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
+ NULL);
+ if (!key_file->gettext_domain)
+ key_file->gettext_domain = g_key_file_get_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ "X-Ubuntu-Gettext-Domain",
+ NULL);
+ if (!key_file->gettext_domain)
+ key_file->gettext_domain = g_key_file_get_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ "X-Debian-Gettext-Domain",
+ NULL);
+
return TRUE;
}
@@ -993,6 +1027,21 @@ g_key_file_load_from_data (GKeyFile *key_file,
return FALSE;
}
+ key_file->gettext_domain = g_key_file_get_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
+ NULL);
+ if (!key_file->gettext_domain)
+ key_file->gettext_domain = g_key_file_get_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ "X-Ubuntu-Gettext-Domain",
+ NULL);
+ if (!key_file->gettext_domain)
+ key_file->gettext_domain = g_key_file_get_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ "X-Debian-Gettext-Domain",
+ NULL);
+
return TRUE;
}
@@ -2242,6 +2291,8 @@ g_key_file_get_locale_string (GKeyFile *key_file,
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
+ gboolean try_gettext = FALSE;
+ const gchar *msg_locale;
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
@@ -2263,6 +2314,25 @@ g_key_file_get_locale_string (GKeyFile *key_file,
free_languages = FALSE;
}
+ /* we're only interested in gettext translation if we don't have a
+ * translation in the .desktop file itself and if the key is one of the keys
+ * we know we want to translate: Name, GenericName, Comment, Keywords.
+ * Blindly doing this for all keys can give strange result for the icons,
+ * since the Icon is a locale string in the spec, eg. We also only get
+ * translation in the mo file if the requested locale is the LC_MESSAGES one.
+ * Ideally, we should do more and change LC_MESSAGES to use the requested
+ * locale, but there's no guarantee it's installed on the system and it might
+ * have some side-effects. Since this is a corner case, let's ignore it. */
+ msg_locale = setlocale (LC_MESSAGES, NULL);
+ try_gettext = msg_locale && key_file->gettext_domain &&
+ (strcmp (group_name, G_KEY_FILE_DESKTOP_GROUP) == 0 ||
+ g_str_has_prefix (group_name, G_KEY_FILE_DESKTOP_ACTION_GROUP_PREFIX)) &&
+ (strcmp (key, G_KEY_FILE_DESKTOP_KEY_NAME) == 0 ||
+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_FULLNAME) == 0 ||
+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME) == 0 ||
+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_KEYWORDS) == 0 ||
+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_COMMENT) == 0);
+
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
@@ -2276,6 +2346,39 @@ g_key_file_get_locale_string (GKeyFile *key_file,
break;
}
+ /* Fallback to gettext */
+ if (try_gettext && !translated_value)
+ {
+ gchar *orig_value = g_key_file_get_string (key_file, group_name, key, NULL);
+
+ if (orig_value)
+ {
+ gboolean codeset_set;
+ const gchar *translated;
+ gboolean has_gettext;
+
+ codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL;
+ translated = NULL;
+
+ translated = g_dgettext (key_file->gettext_domain,
+ orig_value);
+ has_gettext = translated != orig_value;
+
+ g_free (orig_value);
+
+ if (has_gettext)
+ {
+ if (codeset_set)
+ translated_value = g_strdup (translated);
+ else
+ translated_value = g_locale_to_utf8 (translated,
+ -1, NULL, NULL, NULL);
+ }
+ else
+ translated_value = NULL;
+ }
+ }
+
/* Fallback to untranslated key
*/
if (!translated_value)
diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
index e4a2518..33b40d5 100644
--- a/glib/tests/gvariant.c
+++ b/glib/tests/gvariant.c
@@ -2464,6 +2464,14 @@ test_fuzzes (gpointer data)
gdouble fuzziness;
int i;
+#ifdef __mips__
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("Extremely slow on some mips CPUs: #932678");
+ return;
+ }
+#endif
+
fuzziness = GPOINTER_TO_INT (data) / 100.;
for (i = 0; i < 200; i++)
diff --git a/glib/tests/gwakeuptest.c b/glib/tests/gwakeuptest.c
index b37fb43..a9bef21 100644
--- a/glib/tests/gwakeuptest.c
+++ b/glib/tests/gwakeuptest.c
@@ -89,6 +89,9 @@ struct context
#define NUM_TOKENS 5
#define TOKEN_TTL 100000
+static gint num_threads = NUM_THREADS;
+static gint token_ttl = TOKEN_TTL;
+
static struct context contexts[NUM_THREADS];
static GThread *threads[NUM_THREADS];
static GWakeup *last_token_wakeup;
@@ -158,7 +161,7 @@ dispatch_token (struct token *token)
struct context *ctx;
gint next_ctx;
- next_ctx = g_test_rand_int_range (0, NUM_THREADS);
+ next_ctx = g_test_rand_int_range (0, num_threads);
ctx = &contexts[next_ctx];
token->owner = ctx;
token->ttl--;
@@ -213,6 +216,12 @@ test_threaded (void)
{
gint i;
+ if (!g_test_slow ())
+ {
+ num_threads = NUM_THREADS / 10;
+ token_ttl = TOKEN_TTL / 10;
+ }
+
/* make sure we don't block forever */
alarm (60);
@@ -230,7 +239,7 @@ test_threaded (void)
last_token_wakeup = g_wakeup_new ();
/* create contexts, assign to threads */
- for (i = 0; i < NUM_THREADS; i++)
+ for (i = 0; i < num_threads; i++)
{
context_init (&contexts[i]);
threads[i] = g_thread_new ("test", thread_func, &contexts[i]);
@@ -238,13 +247,13 @@ test_threaded (void)
/* dispatch tokens */
for (i = 0; i < NUM_TOKENS; i++)
- dispatch_token (token_new (TOKEN_TTL));
+ dispatch_token (token_new (token_ttl));
/* wait until all tokens are gone */
wait_for_signaled (last_token_wakeup);
/* ask threads to quit, join them, cleanup */
- for (i = 0; i < NUM_THREADS; i++)
+ for (i = 0; i < num_threads; i++)
{
context_quit (&contexts[i]);
g_thread_join (threads[i]);
diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
index c18da94..2aec6ff 100644
--- a/glib/tests/mainloop.c
+++ b/glib/tests/mainloop.c
@@ -520,6 +520,14 @@ test_child_sources (void)
GMainLoop *loop;
GSource *parent, *child_b, *child_c, *end;
+#if defined(__arm__)
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("Not reliable on older ARM hardware");
+ return;
+ }
+#endif
+
ctx = g_main_context_new ();
loop = g_main_loop_new (ctx, FALSE);
@@ -598,6 +606,14 @@ test_recursive_child_sources (void)
GMainLoop *loop;
GSource *parent, *child_b, *child_c, *end;
+#if defined(__arm__)
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("Not reliable on older ARM hardware");
+ return;
+ }
+#endif
+
ctx = g_main_context_new ();
loop = g_main_loop_new (ctx, FALSE);
diff --git a/glib/tests/spawn-test.c b/glib/tests/spawn-test.c
index 4e54ab2..e4f2efc 100644
--- a/glib/tests/spawn-test.c
+++ b/glib/tests/spawn-test.c
@@ -31,6 +31,7 @@
#include <fcntl.h>
#include <io.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
+#include <WinError.h>
#endif
#ifdef G_OS_WIN32
@@ -109,8 +110,16 @@ test_spawn_basics (void)
NULL, &erroutput, NULL, &err);
g_assert_no_error (err);
g_assert_true (result);
+#ifndef G_OS_WIN32
g_assert_true (g_str_has_prefix (erroutput, "sort: "));
- g_assert_nonnull (strstr (erroutput, "No such file or directory"));
+ g_assert_nonnull (strstr (erroutput, g_strerror (ENOENT)));
+#else
+ {
+ gchar *file_not_found_message = g_win32_error_message (ERROR_FILE_NOT_FOUND);
+ g_assert_nonnull (strstr (erroutput, file_not_found_message));
+ g_free (file_not_found_message);
+ }
+#endif
g_free (erroutput);
erroutput = NULL;
diff --git a/glib/tests/thread.c b/glib/tests/thread.c
index 14f5710..3e1883f 100644
--- a/glib/tests/thread.c
+++ b/glib/tests/thread.c
@@ -145,7 +145,14 @@ test_thread4 (void)
nl.rlim_cur = 1;
if (prlimit (getpid (), RLIMIT_NPROC, &nl, &ol) != 0)
- g_error ("prlimit failed: %s", g_strerror (errno));
+ {
+ gchar *message = g_strdup_printf ("setting PRLIMIT_NPROC to {cur=%d,max=%d} failed: %s",
+ (int) nl.rlim_cur, (int) nl.rlim_max,
+ g_strerror (errno));
+ g_test_skip (message);
+ g_free (message);
+ return;
+ }
error = NULL;
thread = g_thread_try_new ("a", thread1_func, NULL, &error);
diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c
index acbb8f3..60cc5f2 100644
--- a/glib/tests/timeout.c
+++ b/glib/tests/timeout.c
@@ -177,6 +177,15 @@ test_func (gpointer data)
static void
test_rounding (void)
{
+
+#if defined(__arm__)
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("Not reliable on older ARM hardware");
+ return;
+ }
+#endif
+
loop = g_main_loop_new (NULL, FALSE);
last_time = g_get_monotonic_time ();
diff --git a/glib/tests/timer.c b/glib/tests/timer.c
index 42ed5a9..df961fa 100644
--- a/glib/tests/timer.c
+++ b/glib/tests/timer.c
@@ -30,9 +30,15 @@ static void
test_timer_basic (void)
{
GTimer *timer;
- gdouble elapsed;
+ volatile gdouble elapsed;
gulong micros;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("Not reliable due to floating-point rounding (glib#820)");
+ return;
+ }
+
timer = g_timer_new ();
g_timer_start (timer);
@@ -65,7 +71,7 @@ static void
test_timer_stop (void)
{
GTimer *timer;
- gdouble elapsed, elapsed2;
+ volatile gdouble elapsed, elapsed2;
timer = g_timer_new ();
diff --git a/gobject/tests/closure-refcount.c b/gobject/tests/closure-refcount.c
index 5a92005..73185f0 100644
--- a/gobject/tests/closure-refcount.c
+++ b/gobject/tests/closure-refcount.c
@@ -260,6 +260,14 @@ test_closure_refcount (void)
GTest *object;
guint i, n_iterations;
+#if defined(__aarch64__) || defined(__arm__)
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") != NULL)
+ {
+ g_print ("SKIP: Test is known to be flaky on arm* (#880883, #917983)\n");
+ return 0;
+ }
+#endif
+
object = g_object_new (G_TYPE_TEST, NULL);
closure = g_cclosure_new (G_CALLBACK (test_signal_handler), &test_data, destroy_data);
diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c
index 3b485eb..6ea9a48 100644
--- a/gobject/tests/threadtests.c
+++ b/gobject/tests/threadtests.c
@@ -484,6 +484,14 @@ test_threaded_toggle_notify (void)
"safely from another (the main) thread without causing the "
"notifying thread to abort");
+#if defined(__arm__)
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("Intermittently takes more than 5 minutes on 32-bit ARM (Debian#1023652)");
+ return;
+ }
+#endif
+
g_object_add_toggle_ref (object, on_toggle_notify, &data);
g_object_unref (object);
diff --git a/subprojects/gvdb/COPYING b/subprojects/gvdb/COPYING
deleted file mode 100644
index d129f48..0000000
--- a/subprojects/gvdb/COPYING
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-(This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.)
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- GVDB
- Copyright (C) 2019 GNOME
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random
- Hacker.
-
- {signature of Ty Coon}, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/subprojects/gvdb/README.md b/subprojects/gvdb/README.md
deleted file mode 100644
index 2c53d77..0000000
--- a/subprojects/gvdb/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-GVDB
-====
-
-GVDB (GVariant Database) is a simple database file format that stores a
-mapping from strings to GVariant values in a way that is extremely
-efficient for lookups.
-
-The code is intended to be pulled into projects as a submodule/subproject,
-and it is not shipped as a separately compiled library. It has no API
-guarantees.
-
-A GVDB database table is a single file. It is designed to be memory mapped
-by one or more clients, with accesses to the stored data being fast. The
-storage format has low size overheads, assuming the GVariant formats for
-values do not require much padding or alignment.
-
-Modifying a GVDB table requires writing out the whole file. This is
-relatively slow. `gvdb_table_write_contents()` does this by writing out
-the new file and atomically renaming it over the old one. This means
-that any clients who have memory mapped the old file will need to reload
-their memory mapping.
-
-This means that if multiple clients are using a GVDB table, an external
-process is needed to synchronise writes and to notify clients to reload
-the table. `dconf-service` is an example of such a process.
diff --git a/subprojects/gvdb/gvdb.doap b/subprojects/gvdb/gvdb.doap
deleted file mode 100644
index 8c5f3e8..0000000
--- a/subprojects/gvdb/gvdb.doap
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<Project xmlns='http://usefulinc.com/ns/doap#'
- xmlns:foaf='http://xmlns.com/foaf/0.1/'
- xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
- xmlns:gnome='http://api.gnome.org/doap-extensions#'>
-
- <name xml:lang='en'>gvdb</name>
- <shortdesc xml:lang='en'>GVariant Database file</shortdesc>
- <description xml:lang='en'>
- A simple database file format that stores a mapping from strings to
- GVariant values in a way that is extremely efficient for lookups.
-
- The database is written once and can not be modified.
-
- Included here is reader code and a first-pass implementation of a
- writer (that does not currently produce particularly optimised
- output).
-
- It is intended that this code be used by copy-pasting into your
- project or by making use of git-merge(1).
- </description>
-
- <maintainer>
- <foaf:Person>
- <foaf:name>Matthias Clasen</foaf:name>
- <foaf:mbox rdf:resource="mailto:mclasen@redhat.com"/>
- <gnome:userid>matthiasc</gnome:userid>
- </foaf:Person>
- </maintainer>
-
- <maintainer>
- <foaf:Person>
- <foaf:name>Allison Ryan Lortie</foaf:name>
- <foaf:mbox rdf:resource="mailto:desrt@desrt.ca"/>
- <gnome:userid>desrt</gnome:userid>
- </foaf:Person>
- </maintainer>
-
- <maintainer>
- <foaf:Person>
- <foaf:name>Philip Withnall</foaf:name>
- <foaf:mbox rdf:resource="mailto:philip@tecnocode.co.uk"/>
- <foaf:mbox rdf:resource="mailto:withnall@endlessm.com"/>
- <gnome:userid>pwithnall</gnome:userid>
- </foaf:Person>
- </maintainer>
-
- <maintainer>
- <foaf:Person>
- <foaf:name>Emmanuele Bassi</foaf:name>
- <foaf:mbox rdf:resource="mailto:ebassi@gnome.org"/>
- <gnome:userid>ebassi</gnome:userid>
- </foaf:Person>
- </maintainer>
-
-</Project>
diff --git a/subprojects/gvdb/gvdb/gvdb-builder.c b/subprojects/gvdb/gvdb/gvdb-builder.c
deleted file mode 100644
index 5dae03e..0000000
--- a/subprojects/gvdb/gvdb/gvdb-builder.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#include "gvdb-builder.h"
-#include "gvdb-format.h"
-
-#include <glib.h>
-#include <fcntl.h>
-#if !defined(G_OS_WIN32) || !defined(_MSC_VER)
-#include <unistd.h>
-#endif
-#include <string.h>
-
-
-struct _GvdbItem
-{
- gchar *key;
- guint32 hash_value;
- guint32_le assigned_index;
- GvdbItem *parent;
- GvdbItem *sibling;
- GvdbItem *next;
-
- /* one of:
- * this:
- */
- GVariant *value;
-
- /* this: */
- GHashTable *table;
-
- /* or this: */
- GvdbItem *child;
-};
-
-static void
-gvdb_item_free (gpointer data)
-{
- GvdbItem *item = data;
-
- g_free (item->key);
-
- if (item->value)
- g_variant_unref (item->value);
-
- if (item->table)
- g_hash_table_unref (item->table);
-
- g_slice_free (GvdbItem, item);
-}
-
-GHashTable *
-gvdb_hash_table_new (GHashTable *parent,
- const gchar *name_in_parent)
-{
- GHashTable *table;
-
- table = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, gvdb_item_free);
-
- if (parent)
- {
- GvdbItem *item;
-
- item = gvdb_hash_table_insert (parent, name_in_parent);
- gvdb_item_set_hash_table (item, table);
- }
-
- return table;
-}
-
-static guint32
-djb_hash (const gchar *key)
-{
- guint32 hash_value = 5381;
-
- while (*key)
- hash_value = hash_value * 33 + *(signed char *)key++;
-
- return hash_value;
-}
-
-GvdbItem *
-gvdb_hash_table_insert (GHashTable *table,
- const gchar *key)
-{
- GvdbItem *item;
-
- item = g_slice_new0 (GvdbItem);
- item->key = g_strdup (key);
- item->hash_value = djb_hash (key);
-
- g_hash_table_insert (table, g_strdup (key), item);
-
- return item;
-}
-
-void
-gvdb_hash_table_insert_string (GHashTable *table,
- const gchar *key,
- const gchar *value)
-{
- GvdbItem *item;
-
- item = gvdb_hash_table_insert (table, key);
- gvdb_item_set_value (item, g_variant_new_string (value));
-}
-
-void
-gvdb_item_set_value (GvdbItem *item,
- GVariant *value)
-{
- g_return_if_fail (!item->value && !item->table && !item->child);
-
- item->value = g_variant_ref_sink (value);
-}
-
-void
-gvdb_item_set_hash_table (GvdbItem *item,
- GHashTable *table)
-{
- g_return_if_fail (!item->value && !item->table && !item->child);
-
- item->table = g_hash_table_ref (table);
-}
-
-void
-gvdb_item_set_parent (GvdbItem *item,
- GvdbItem *parent)
-{
- GvdbItem **node;
-
- g_return_if_fail (g_str_has_prefix (item->key, parent->key));
- g_return_if_fail (!parent->value && !parent->table);
- g_return_if_fail (!item->parent && !item->sibling);
-
- for (node = &parent->child; *node; node = &(*node)->sibling)
- if (strcmp ((*node)->key, item->key) > 0)
- break;
-
- item->parent = parent;
- item->sibling = *node;
- *node = item;
-}
-
-typedef struct
-{
- GvdbItem **buckets;
- gsize n_buckets;
-} HashTable;
-
-static HashTable *
-hash_table_new (gsize n_buckets)
-{
- HashTable *table;
-
- table = g_slice_new (HashTable);
- table->buckets = g_new0 (GvdbItem *, n_buckets);
- table->n_buckets = n_buckets;
-
- return table;
-}
-
-static void
-hash_table_free (HashTable *table)
-{
- g_free (table->buckets);
-
- g_slice_free (HashTable, table);
-}
-
-static void
-hash_table_insert (gpointer key,
- gpointer value,
- gpointer data)
-{
- guint32 hash_value, bucket;
- HashTable *table = data;
- GvdbItem *item = value;
-
- hash_value = djb_hash (key);
- bucket = hash_value % table->n_buckets;
- item->next = table->buckets[bucket];
- table->buckets[bucket] = item;
-}
-
-static guint32_le
-item_to_index (GvdbItem *item)
-{
- if (item != NULL)
- return item->assigned_index;
-
- return guint32_to_le ((guint32) -1);
-}
-
-typedef struct
-{
- GQueue *chunks;
- guint64 offset;
- gboolean byteswap;
-} FileBuilder;
-
-typedef struct
-{
- gsize offset;
- gsize size;
- gpointer data;
-} FileChunk;
-
-static gpointer
-file_builder_allocate (FileBuilder *fb,
- guint alignment,
- gsize size,
- struct gvdb_pointer *pointer)
-{
- FileChunk *chunk;
-
- if (size == 0)
- return NULL;
-
- fb->offset += (guint64) (-fb->offset) & (alignment - 1);
- chunk = g_slice_new (FileChunk);
- chunk->offset = fb->offset;
- chunk->size = size;
- chunk->data = g_malloc (size);
-
- pointer->start = guint32_to_le (fb->offset);
- fb->offset += size;
- pointer->end = guint32_to_le (fb->offset);
-
- g_queue_push_tail (fb->chunks, chunk);
-
- return chunk->data;
-}
-
-static void
-file_builder_add_value (FileBuilder *fb,
- GVariant *value,
- struct gvdb_pointer *pointer)
-{
- GVariant *variant, *normal;
- gpointer data;
- gsize size;
-
- if (fb->byteswap)
- {
- value = g_variant_byteswap (value);
- variant = g_variant_new_variant (value);
- g_variant_unref (value);
- }
- else
- variant = g_variant_new_variant (value);
-
- normal = g_variant_get_normal_form (variant);
- g_variant_unref (variant);
-
- size = g_variant_get_size (normal);
- data = file_builder_allocate (fb, 8, size, pointer);
- g_variant_store (normal, data);
- g_variant_unref (normal);
-}
-
-static void
-file_builder_add_string (FileBuilder *fb,
- const gchar *string,
- guint32_le *start,
- guint16_le *size)
-{
- FileChunk *chunk;
- gsize length;
-
- length = strlen (string);
-
- chunk = g_slice_new (FileChunk);
- chunk->offset = fb->offset;
- chunk->size = length;
- chunk->data = g_malloc (length);
- if (length != 0)
- memcpy (chunk->data, string, length);
-
- *start = guint32_to_le (fb->offset);
- *size = guint16_to_le (length);
- fb->offset += length;
-
- g_queue_push_tail (fb->chunks, chunk);
-}
-
-static void
-file_builder_allocate_for_hash (FileBuilder *fb,
- gsize n_buckets,
- gsize n_items,
- guint bloom_shift,
- gsize n_bloom_words,
- guint32_le **bloom_filter,
- guint32_le **hash_buckets,
- struct gvdb_hash_item **hash_items,
- struct gvdb_pointer *pointer)
-{
- guint32_le bloom_hdr, table_hdr;
- guchar *data;
- gsize size;
-
- g_assert (n_bloom_words < (1u << 27));
-
- bloom_hdr = guint32_to_le (bloom_shift << 27 | n_bloom_words);
- table_hdr = guint32_to_le (n_buckets);
-
- size = sizeof bloom_hdr + sizeof table_hdr +
- n_bloom_words * sizeof (guint32_le) +
- n_buckets * sizeof (guint32_le) +
- n_items * sizeof (struct gvdb_hash_item);
-
- data = file_builder_allocate (fb, 4, size, pointer);
- g_assert (data);
-
-#define chunk(s) (size -= (s), data += (s), data - (s))
- memcpy (chunk (sizeof bloom_hdr), &bloom_hdr, sizeof bloom_hdr);
- memcpy (chunk (sizeof table_hdr), &table_hdr, sizeof table_hdr);
- *bloom_filter = (guint32_le *) chunk (n_bloom_words * sizeof (guint32_le));
- *hash_buckets = (guint32_le *) chunk (n_buckets * sizeof (guint32_le));
- *hash_items = (struct gvdb_hash_item *) chunk (n_items *
- sizeof (struct gvdb_hash_item));
- g_assert (size == 0);
-#undef chunk
-
- memset (*bloom_filter, 0, n_bloom_words * sizeof (guint32_le));
- memset (*hash_buckets, 0, n_buckets * sizeof (guint32_le));
- memset (*hash_items, 0, n_items * sizeof (struct gvdb_hash_item));
-
- /* NOTE - the code to actually fill in the bloom filter here is missing.
- * Patches welcome!
- *
- * http://en.wikipedia.org/wiki/Bloom_filter
- * http://0pointer.de/blog/projects/bloom.html
- */
-}
-
-static void
-file_builder_add_hash (FileBuilder *fb,
- GHashTable *table,
- struct gvdb_pointer *pointer)
-{
- guint32_le *buckets, *bloom_filter;
- struct gvdb_hash_item *items;
- HashTable *mytable;
- GvdbItem *item;
- guint32 index;
- gsize bucket;
-
- mytable = hash_table_new (g_hash_table_size (table));
- g_hash_table_foreach (table, hash_table_insert, mytable);
- index = 0;
-
- for (bucket = 0; bucket < mytable->n_buckets; bucket++)
- for (item = mytable->buckets[bucket]; item; item = item->next)
- item->assigned_index = guint32_to_le (index++);
-
- file_builder_allocate_for_hash (fb, mytable->n_buckets, index, 5, 0,
- &bloom_filter, &buckets, &items, pointer);
-
- index = 0;
- for (bucket = 0; bucket < mytable->n_buckets; bucket++)
- {
- buckets[bucket] = guint32_to_le (index);
-
- for (item = mytable->buckets[bucket]; item; item = item->next)
- {
- struct gvdb_hash_item *entry = items++;
- const gchar *basename;
-
- g_assert (index == guint32_from_le (item->assigned_index));
- entry->hash_value = guint32_to_le (item->hash_value);
- entry->parent = item_to_index (item->parent);
- entry->unused = 0;
-
- if (item->parent != NULL)
- basename = item->key + strlen (item->parent->key);
- else
- basename = item->key;
-
- file_builder_add_string (fb, basename,
- &entry->key_start,
- &entry->key_size);
-
- if (item->value != NULL)
- {
- g_assert (item->child == NULL && item->table == NULL);
-
- file_builder_add_value (fb, item->value, &entry->value.pointer);
- entry->type = 'v';
- }
-
- if (item->child != NULL)
- {
- guint32 children = 0, i = 0;
- guint32_le *offsets;
- GvdbItem *child;
-
- g_assert (item->table == NULL);
-
- for (child = item->child; child; child = child->sibling)
- children++;
-
- offsets = file_builder_allocate (fb, 4, 4 * children,
- &entry->value.pointer);
- entry->type = 'L';
-
- for (child = item->child; child; child = child->sibling)
- offsets[i++] = child->assigned_index;
-
- g_assert (children == i);
- }
-
- if (item->table != NULL)
- {
- entry->type = 'H';
- file_builder_add_hash (fb, item->table, &entry->value.pointer);
- }
-
- index++;
- }
- }
-
- hash_table_free (mytable);
-}
-
-static FileBuilder *
-file_builder_new (gboolean byteswap)
-{
- FileBuilder *builder;
-
- builder = g_slice_new (FileBuilder);
- builder->chunks = g_queue_new ();
- builder->offset = sizeof (struct gvdb_header);
- builder->byteswap = byteswap;
-
- return builder;
-}
-
-static void
-file_builder_free (FileBuilder *fb)
-{
- g_queue_free (fb->chunks);
- g_slice_free (FileBuilder, fb);
-}
-
-static GString *
-file_builder_serialise (FileBuilder *fb,
- struct gvdb_pointer root)
-{
- struct gvdb_header header;
- GString *result;
-
- memset (&header, 0, sizeof (header));
-
- if (fb->byteswap)
- {
- header.signature[0] = GVDB_SWAPPED_SIGNATURE0;
- header.signature[1] = GVDB_SWAPPED_SIGNATURE1;
- }
- else
- {
- header.signature[0] = GVDB_SIGNATURE0;
- header.signature[1] = GVDB_SIGNATURE1;
- }
-
- result = g_string_new (NULL);
-
- header.root = root;
- g_string_append_len (result, (gpointer) &header, sizeof header);
-
- while (!g_queue_is_empty (fb->chunks))
- {
- FileChunk *chunk = g_queue_pop_head (fb->chunks);
-
- if (result->len != chunk->offset)
- {
- gchar zero[8] = { 0, };
-
- g_assert (chunk->offset > result->len);
- g_assert (chunk->offset - result->len < 8);
-
- g_string_append_len (result, zero, chunk->offset - result->len);
- g_assert (result->len == chunk->offset);
- }
-
- g_string_append_len (result, chunk->data, chunk->size);
- g_free (chunk->data);
-
- g_slice_free (FileChunk, chunk);
- }
-
- return result;
-}
-
-gboolean
-gvdb_table_write_contents (GHashTable *table,
- const gchar *filename,
- gboolean byteswap,
- GError **error)
-{
- struct gvdb_pointer root;
- gboolean status;
- FileBuilder *fb;
- GString *str;
-
- g_return_val_if_fail (table != NULL, FALSE);
- g_return_val_if_fail (filename != NULL, FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
- fb = file_builder_new (byteswap);
- file_builder_add_hash (fb, table, &root);
- str = file_builder_serialise (fb, root);
- file_builder_free (fb);
-
- status = g_file_set_contents (filename, str->str, str->len, error);
- g_string_free (str, TRUE);
-
- return status;
-}
-
-typedef struct {
- GBytes *contents; /* (owned) */
- GFile *file; /* (owned) */
-} WriteContentsData;
-
-static WriteContentsData *
-write_contents_data_new (GBytes *contents,
- GFile *file)
-{
- WriteContentsData *data;
-
- data = g_slice_new (WriteContentsData);
- data->contents = g_bytes_ref (contents);
- data->file = g_object_ref (file);
-
- return data;
-}
-
-static void
-write_contents_data_free (WriteContentsData *data)
-{
- g_bytes_unref (data->contents);
- g_object_unref (data->file);
- g_slice_free (WriteContentsData, data);
-}
-
-static void
-replace_contents_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- GTask *task = user_data;
- WriteContentsData *data = g_task_get_task_data (task);
- GError *error = NULL;
-
- g_return_if_fail (g_task_get_source_tag (task) == gvdb_table_write_contents_async);
-
- if (!g_file_replace_contents_finish (data->file, result, NULL, &error))
- g_task_return_error (task, g_steal_pointer (&error));
- else
- g_task_return_boolean (task, TRUE);
-
- g_object_unref (task);
-}
-
-void
-gvdb_table_write_contents_async (GHashTable *table,
- const gchar *filename,
- gboolean byteswap,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- struct gvdb_pointer root;
- FileBuilder *fb;
- WriteContentsData *data;
- GString *str;
- GBytes *bytes;
- GFile *file;
- GTask *task;
-
- g_return_if_fail (table != NULL);
- g_return_if_fail (filename != NULL);
- g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
-
- fb = file_builder_new (byteswap);
- file_builder_add_hash (fb, table, &root);
- str = file_builder_serialise (fb, root);
- bytes = g_string_free_to_bytes (str);
- file_builder_free (fb);
-
- file = g_file_new_for_path (filename);
- data = write_contents_data_new (bytes, file);
-
- task = g_task_new (NULL, cancellable, callback, user_data);
- g_task_set_task_data (task, data, (GDestroyNotify)write_contents_data_free);
- g_task_set_source_tag (task, gvdb_table_write_contents_async);
-
- g_file_replace_contents_async (file,
- g_bytes_get_data (bytes, NULL),
- g_bytes_get_size (bytes),
- NULL, FALSE,
- G_FILE_CREATE_PRIVATE,
- cancellable, replace_contents_cb, g_steal_pointer (&task));
-
- g_bytes_unref (bytes);
- g_object_unref (file);
-}
-
-gboolean
-gvdb_table_write_contents_finish (GHashTable *table,
- GAsyncResult *result,
- GError **error)
-{
- g_return_val_if_fail (table != NULL, FALSE);
- g_return_val_if_fail (g_task_is_valid (result, NULL), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
- return g_task_propagate_boolean (G_TASK (result), error);
-}
diff --git a/subprojects/gvdb/gvdb/gvdb-builder.h b/subprojects/gvdb/gvdb/gvdb-builder.h
deleted file mode 100644
index 30757d0..0000000
--- a/subprojects/gvdb/gvdb/gvdb-builder.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __gvdb_builder_h__
-#define __gvdb_builder_h__
-
-#include <gio/gio.h>
-
-typedef struct _GvdbItem GvdbItem;
-
-G_GNUC_INTERNAL
-GHashTable * gvdb_hash_table_new (GHashTable *parent,
- const gchar *key);
-
-G_GNUC_INTERNAL
-GvdbItem * gvdb_hash_table_insert (GHashTable *table,
- const gchar *key);
-G_GNUC_INTERNAL
-void gvdb_hash_table_insert_string (GHashTable *table,
- const gchar *key,
- const gchar *value);
-
-G_GNUC_INTERNAL
-void gvdb_item_set_value (GvdbItem *item,
- GVariant *value);
-G_GNUC_INTERNAL
-void gvdb_item_set_hash_table (GvdbItem *item,
- GHashTable *table);
-G_GNUC_INTERNAL
-void gvdb_item_set_parent (GvdbItem *item,
- GvdbItem *parent);
-
-G_GNUC_INTERNAL
-gboolean gvdb_table_write_contents (GHashTable *table,
- const gchar *filename,
- gboolean byteswap,
- GError **error);
-G_GNUC_INTERNAL
-void gvdb_table_write_contents_async (GHashTable *table,
- const gchar *filename,
- gboolean byteswap,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-G_GNUC_INTERNAL
-gboolean gvdb_table_write_contents_finish (GHashTable *table,
- GAsyncResult *result,
- GError **error);
-
-#endif /* __gvdb_builder_h__ */
diff --git a/subprojects/gvdb/gvdb/gvdb-format.h b/subprojects/gvdb/gvdb/gvdb-format.h
deleted file mode 100644
index ed6adab..0000000
--- a/subprojects/gvdb/gvdb/gvdb-format.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __gvdb_format_h__
-#define __gvdb_format_h__
-
-#include <glib.h>
-
-typedef struct { guint16 value; } guint16_le;
-typedef struct { guint32 value; } guint32_le;
-
-struct gvdb_pointer {
- guint32_le start;
- guint32_le end;
-};
-
-struct gvdb_hash_header {
- guint32_le n_bloom_words;
- guint32_le n_buckets;
-};
-
-struct gvdb_hash_item {
- guint32_le hash_value;
- guint32_le parent;
-
- guint32_le key_start;
- guint16_le key_size;
- gchar type;
- gchar unused;
-
- union
- {
- struct gvdb_pointer pointer;
- gchar direct[8];
- } value;
-};
-
-struct gvdb_header {
- guint32 signature[2];
- guint32_le version;
- guint32_le options;
-
- struct gvdb_pointer root;
-};
-
-static inline guint32_le guint32_to_le (guint32 value) {
- guint32_le result = { GUINT32_TO_LE (value) };
- return result;
-}
-
-static inline guint32 guint32_from_le (guint32_le value) {
- return GUINT32_FROM_LE (value.value);
-}
-
-static inline guint16_le guint16_to_le (guint16 value) {
- guint16_le result = { GUINT16_TO_LE (value) };
- return result;
-}
-
-static inline guint16 guint16_from_le (guint16_le value) {
- return GUINT16_FROM_LE (value.value);
-}
-
-#define GVDB_SIGNATURE0 1918981703
-#define GVDB_SIGNATURE1 1953390953
-#define GVDB_SWAPPED_SIGNATURE0 GUINT32_SWAP_LE_BE (GVDB_SIGNATURE0)
-#define GVDB_SWAPPED_SIGNATURE1 GUINT32_SWAP_LE_BE (GVDB_SIGNATURE1)
-
-#endif /* __gvdb_format_h__ */
diff --git a/subprojects/gvdb/gvdb/gvdb-reader.c b/subprojects/gvdb/gvdb/gvdb-reader.c
deleted file mode 100644
index 820ce4c..0000000
--- a/subprojects/gvdb/gvdb/gvdb-reader.c
+++ /dev/null
@@ -1,736 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#include "gvdb-reader.h"
-#include "gvdb-format.h"
-
-#include <string.h>
-
-struct _GvdbTable {
- GBytes *bytes;
-
- const gchar *data;
- gsize size;
-
- gboolean byteswapped;
- gboolean trusted;
-
- const guint32_le *bloom_words;
- guint32 n_bloom_words;
- guint bloom_shift;
-
- const guint32_le *hash_buckets;
- guint32 n_buckets;
-
- struct gvdb_hash_item *hash_items;
- guint32 n_hash_items;
-};
-
-static const gchar *
-gvdb_table_item_get_key (GvdbTable *file,
- const struct gvdb_hash_item *item,
- gsize *size)
-{
- guint32 start, end;
-
- start = guint32_from_le (item->key_start);
- *size = guint16_from_le (item->key_size);
- end = start + *size;
-
- if G_UNLIKELY (start > end || end > file->size)
- return NULL;
-
- return file->data + start;
-}
-
-static gconstpointer
-gvdb_table_dereference (GvdbTable *file,
- const struct gvdb_pointer *pointer,
- gint alignment,
- gsize *size)
-{
- guint32 start, end;
-
- start = guint32_from_le (pointer->start);
- end = guint32_from_le (pointer->end);
-
- if G_UNLIKELY (start > end || end > file->size || start & (alignment - 1))
- return NULL;
-
- *size = end - start;
-
- return file->data + start;
-}
-
-static void
-gvdb_table_setup_root (GvdbTable *file,
- const struct gvdb_pointer *pointer)
-{
- const struct gvdb_hash_header *header;
- guint32 n_bloom_words;
- guint32 n_buckets;
- gsize size;
-
- header = gvdb_table_dereference (file, pointer, 4, &size);
-
- if G_UNLIKELY (header == NULL || size < sizeof *header)
- return;
-
- size -= sizeof *header;
-
- n_bloom_words = guint32_from_le (header->n_bloom_words);
- n_buckets = guint32_from_le (header->n_buckets);
- n_bloom_words &= (1u << 27) - 1;
-
- if G_UNLIKELY (n_bloom_words * sizeof (guint32_le) > size)
- return;
-
- file->bloom_words = (gpointer) (header + 1);
- size -= n_bloom_words * sizeof (guint32_le);
- file->n_bloom_words = n_bloom_words;
-
- if G_UNLIKELY (n_buckets > G_MAXUINT / sizeof (guint32_le) ||
- n_buckets * sizeof (guint32_le) > size)
- return;
-
- file->hash_buckets = file->bloom_words + file->n_bloom_words;
- size -= n_buckets * sizeof (guint32_le);
- file->n_buckets = n_buckets;
-
- if G_UNLIKELY (size % sizeof (struct gvdb_hash_item))
- return;
-
- file->hash_items = (gpointer) (file->hash_buckets + n_buckets);
- file->n_hash_items = size / sizeof (struct gvdb_hash_item);
-}
-
-/**
- * gvdb_table_new_from_bytes:
- * @bytes: the #GBytes with the data
- * @trusted: if the contents of @bytes are trusted
- * @error: %NULL, or a pointer to a %NULL #GError
- *
- * Creates a new #GvdbTable from the contents of @bytes.
- *
- * This call can fail if the header contained in @bytes is invalid or if @bytes
- * is empty; if so, %G_FILE_ERROR_INVAL will be returned.
- *
- * You should call gvdb_table_free() on the return result when you no
- * longer require it.
- *
- * Returns: a new #GvdbTable
- **/
-GvdbTable *
-gvdb_table_new_from_bytes (GBytes *bytes,
- gboolean trusted,
- GError **error)
-{
- const struct gvdb_header *header;
- GvdbTable *file;
-
- file = g_slice_new0 (GvdbTable);
- file->bytes = g_bytes_ref (bytes);
- file->data = g_bytes_get_data (bytes, &file->size);
- file->trusted = trusted;
-
- if (file->size < sizeof (struct gvdb_header))
- goto invalid;
-
- header = (gpointer) file->data;
-
- if (header->signature[0] == GVDB_SIGNATURE0 &&
- header->signature[1] == GVDB_SIGNATURE1 &&
- guint32_from_le (header->version) == 0)
- file->byteswapped = FALSE;
-
- else if (header->signature[0] == GVDB_SWAPPED_SIGNATURE0 &&
- header->signature[1] == GVDB_SWAPPED_SIGNATURE1 &&
- guint32_from_le (header->version) == 0)
- file->byteswapped = TRUE;
-
- else
- goto invalid;
-
- gvdb_table_setup_root (file, &header->root);
-
- return file;
-
-invalid:
- g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "invalid gvdb header");
-
- g_bytes_unref (file->bytes);
-
- g_slice_free (GvdbTable, file);
-
- return NULL;
-}
-
-/**
- * gvdb_table_new:
- * @filename: a filename
- * @trusted: if the contents of @bytes are trusted
- * @error: %NULL, or a pointer to a %NULL #GError
- *
- * Creates a new #GvdbTable using the #GMappedFile for @filename as the
- * #GBytes.
- *
- * This function will fail if the file cannot be opened.
- * In that case, the #GError that is returned will be an error from
- * g_mapped_file_new().
- *
- * An empty or corrupt file will result in %G_FILE_ERROR_INVAL.
- *
- * Returns: a new #GvdbTable
- **/
-GvdbTable *
-gvdb_table_new (const gchar *filename,
- gboolean trusted,
- GError **error)
-{
- GMappedFile *mapped;
- GvdbTable *table;
- GBytes *bytes;
-
- mapped = g_mapped_file_new (filename, FALSE, error);
- if (!mapped)
- return NULL;
-
- bytes = g_mapped_file_get_bytes (mapped);
- table = gvdb_table_new_from_bytes (bytes, trusted, error);
- g_mapped_file_unref (mapped);
- g_bytes_unref (bytes);
-
- g_prefix_error (error, "%s: ", filename);
-
- return table;
-}
-
-static gboolean
-gvdb_table_bloom_filter (GvdbTable *file,
- guint32 hash_value)
-{
- guint32 word, mask;
-
- if (file->n_bloom_words == 0)
- return TRUE;
-
- word = (hash_value / 32) % file->n_bloom_words;
- mask = 1 << (hash_value & 31);
- mask |= 1 << ((hash_value >> file->bloom_shift) & 31);
-
- return (guint32_from_le (file->bloom_words[word]) & mask) == mask;
-}
-
-static gboolean
-gvdb_table_check_name (GvdbTable *file,
- struct gvdb_hash_item *item,
- const gchar *key,
- guint key_length)
-{
- const gchar *this_key;
- gsize this_size;
- guint32 parent;
-
- this_key = gvdb_table_item_get_key (file, item, &this_size);
-
- if G_UNLIKELY (this_key == NULL || this_size > key_length)
- return FALSE;
-
- key_length -= this_size;
-
- if G_UNLIKELY (memcmp (this_key, key + key_length, this_size) != 0)
- return FALSE;
-
- parent = guint32_from_le (item->parent);
- if (key_length == 0 && parent == 0xffffffffu)
- return TRUE;
-
- if G_LIKELY (parent < file->n_hash_items && this_size > 0)
- return gvdb_table_check_name (file,
- &file->hash_items[parent],
- key, key_length);
-
- return FALSE;
-}
-
-static const struct gvdb_hash_item *
-gvdb_table_lookup (GvdbTable *file,
- const gchar *key,
- gchar type)
-{
- guint32 hash_value = 5381;
- guint key_length;
- guint32 bucket;
- guint32 lastno;
- guint32 itemno;
-
- if G_UNLIKELY (file->n_buckets == 0 || file->n_hash_items == 0)
- return NULL;
-
- for (key_length = 0; key[key_length]; key_length++)
- hash_value = (hash_value * 33) + ((signed char *) key)[key_length];
-
- if (!gvdb_table_bloom_filter (file, hash_value))
- return NULL;
-
- bucket = hash_value % file->n_buckets;
- itemno = guint32_from_le (file->hash_buckets[bucket]);
-
- if (bucket == file->n_buckets - 1 ||
- (lastno = guint32_from_le(file->hash_buckets[bucket + 1])) > file->n_hash_items)
- lastno = file->n_hash_items;
-
- while G_LIKELY (itemno < lastno)
- {
- struct gvdb_hash_item *item = &file->hash_items[itemno];
-
- if (hash_value == guint32_from_le (item->hash_value))
- if G_LIKELY (gvdb_table_check_name (file, item, key, key_length))
- if G_LIKELY (item->type == type)
- return item;
-
- itemno++;
- }
-
- return NULL;
-}
-
-static gboolean
-gvdb_table_list_from_item (GvdbTable *table,
- const struct gvdb_hash_item *item,
- const guint32_le **list,
- guint *length)
-{
- gsize size;
-
- *list = gvdb_table_dereference (table, &item->value.pointer, 4, &size);
-
- if G_LIKELY (*list == NULL || size % 4)
- return FALSE;
-
- *length = size / 4;
-
- return TRUE;
-}
-
-/**
- * gvdb_table_get_names:
- * @table: a #GvdbTable
- * @length: (out) (optional): the number of items returned, or %NULL
- *
- * Gets a list of all names contained in @table.
- *
- * No call to gvdb_table_get_table(), gvdb_table_list() or
- * gvdb_table_get_value() will succeed unless it is for one of the
- * names returned by this function.
- *
- * Note that some names that are returned may still fail for all of the
- * above calls in the case of the corrupted file. Note also that the
- * returned strings may not be utf8.
- *
- * Returns: (array length=length): a %NULL-terminated list of strings, of length @length
- **/
-gchar **
-gvdb_table_get_names (GvdbTable *table,
- gsize *length)
-{
- gchar **names;
- guint n_names;
- guint filled;
- guint total;
- guint i;
-
- /* We generally proceed by iterating over the list of items in the
- * hash table (in order of appearance) recording them into an array.
- *
- * Each item has a parent item (except root items). The parent item
- * forms part of the name of the item. We could go fetching the
- * parent item chain at the point that we encounter each item but then
- * we would need to implement some sort of recursion along with checks
- * for self-referential items.
- *
- * Instead, we do a number of passes. Each pass will build up one
- * level of names (starting from the root). We continue to do passes
- * until no more items are left. The first pass will only add root
- * items and each further pass will only add items whose direct parent
- * is an item added in the immediately previous pass. It's also
- * possible that items get filled if they follow their parent within a
- * particular pass.
- *
- * At most we will have a number of passes equal to the depth of the
- * tree. Self-referential items will never be filled in (since their
- * parent will have never been filled in). We continue until we have
- * a pass that fills in no additional items.
- *
- * This takes an O(n) algorithm and turns it into O(n*m) where m is
- * the depth of the tree, but typically the tree won't be very
- * deep and the constant factor of this algorithm is lower (and the
- * complexity of coding it, as well).
- */
-
- n_names = table->n_hash_items;
- names = g_new0 (gchar *, n_names + 1);
-
- /* 'names' starts out all-NULL. On each pass we record the number
- * of items changed from NULL to non-NULL in 'filled' so we know if we
- * should repeat the loop. 'total' counts the total number of items
- * filled. If 'total' ends up equal to 'n_names' then we know that
- * 'names' has been completely filled.
- */
-
- total = 0;
- do
- {
- /* Loop until we have filled no more entries */
- filled = 0;
-
- for (i = 0; i < n_names; i++)
- {
- const struct gvdb_hash_item *item = &table->hash_items[i];
- const gchar *name;
- gsize name_length;
- guint32 parent;
-
- /* already got it on a previous pass */
- if (names[i] != NULL)
- continue;
-
- parent = guint32_from_le (item->parent);
-
- if (parent == 0xffffffffu)
- {
- /* it's a root item */
- name = gvdb_table_item_get_key (table, item, &name_length);
-
- if (name != NULL)
- {
- names[i] = g_strndup (name, name_length);
- filled++;
- }
- }
-
- else if (parent < n_names && names[parent] != NULL)
- {
- /* It's a non-root item whose parent was filled in already.
- *
- * Calculate the name of this item by combining it with
- * its parent name.
- */
- name = gvdb_table_item_get_key (table, item, &name_length);
-
- if (name != NULL)
- {
- const gchar *parent_name = names[parent];
- gsize parent_length;
- gchar *fullname;
-
- parent_length = strlen (parent_name);
- fullname = g_malloc (parent_length + name_length + 1);
- memcpy (fullname, parent_name, parent_length);
- memcpy (fullname + parent_length, name, name_length);
- fullname[parent_length + name_length] = '\0';
- names[i] = fullname;
- filled++;
- }
- }
- }
-
- total += filled;
- }
- while (filled && total < n_names);
-
- /* If the table was corrupted then 'names' may have holes in it.
- * Collapse those.
- */
- if G_UNLIKELY (total != n_names)
- {
- GPtrArray *fixed_names;
-
- fixed_names = g_ptr_array_sized_new (n_names + 1 /* NULL terminator */);
- for (i = 0; i < n_names; i++)
- if (names[i] != NULL)
- g_ptr_array_add (fixed_names, names[i]);
-
- g_free (names);
- n_names = fixed_names->len;
- g_ptr_array_add (fixed_names, NULL);
- names = (gchar **) g_ptr_array_free (fixed_names, FALSE);
- }
-
- if (length)
- {
- G_STATIC_ASSERT (sizeof (*length) >= sizeof (n_names));
- *length = n_names;
- }
-
- return names;
-}
-
-/**
- * gvdb_table_list:
- * @file: a #GvdbTable
- * @key: a string
- *
- * List all of the keys that appear below @key. The nesting of keys
- * within the hash file is defined by the program that created the hash
- * file. One thing is constant: each item in the returned array can be
- * concatenated to @key to obtain the full name of that key.
- *
- * It is not possible to tell from this function if a given key is
- * itself a path, a value, or another hash table; you are expected to
- * know this for yourself.
- *
- * You should call g_strfreev() on the return result when you no longer
- * require it.
- *
- * Returns: a %NULL-terminated string array
- **/
-gchar **
-gvdb_table_list (GvdbTable *file,
- const gchar *key)
-{
- const struct gvdb_hash_item *item;
- const guint32_le *list;
- gchar **strv;
- guint length;
- guint i;
-
- if ((item = gvdb_table_lookup (file, key, 'L')) == NULL)
- return NULL;
-
- if (!gvdb_table_list_from_item (file, item, &list, &length))
- return NULL;
-
- strv = g_new (gchar *, length + 1);
- for (i = 0; i < length; i++)
- {
- guint32 itemno = guint32_from_le (list[i]);
-
- if (itemno < file->n_hash_items)
- {
- const struct gvdb_hash_item *item;
- const gchar *string;
- gsize strsize;
-
- item = file->hash_items + itemno;
-
- string = gvdb_table_item_get_key (file, item, &strsize);
-
- if (string != NULL)
- strv[i] = g_strndup (string, strsize);
- else
- strv[i] = g_malloc0 (1);
- }
- else
- strv[i] = g_malloc0 (1);
- }
-
- strv[i] = NULL;
-
- return strv;
-}
-
-/**
- * gvdb_table_has_value:
- * @file: a #GvdbTable
- * @key: a string
- *
- * Checks for a value named @key in @file.
- *
- * Note: this function does not consider non-value nodes (other hash
- * tables, for example).
- *
- * Returns: %TRUE if @key is in the table
- **/
-gboolean
-gvdb_table_has_value (GvdbTable *file,
- const gchar *key)
-{
- static const struct gvdb_hash_item *item;
- gsize size;
-
- item = gvdb_table_lookup (file, key, 'v');
-
- if (item == NULL)
- return FALSE;
-
- return gvdb_table_dereference (file, &item->value.pointer, 8, &size) != NULL;
-}
-
-static GVariant *
-gvdb_table_value_from_item (GvdbTable *table,
- const struct gvdb_hash_item *item)
-{
- GVariant *variant, *value;
- gconstpointer data;
- GBytes *bytes;
- gsize size;
-
- data = gvdb_table_dereference (table, &item->value.pointer, 8, &size);
-
- if G_UNLIKELY (data == NULL)
- return NULL;
-
- bytes = g_bytes_new_from_bytes (table->bytes, ((gchar *) data) - table->data, size);
- variant = g_variant_new_from_bytes (G_VARIANT_TYPE_VARIANT, bytes, table->trusted);
- value = g_variant_get_variant (variant);
- g_variant_unref (variant);
- g_bytes_unref (bytes);
-
- return value;
-}
-
-/**
- * gvdb_table_get_value:
- * @file: a #GvdbTable
- * @key: a string
- *
- * Looks up a value named @key in @file.
- *
- * If the value is not found then %NULL is returned. Otherwise, a new
- * #GVariant instance is returned. The #GVariant does not depend on the
- * continued existence of @file.
- *
- * You should call g_variant_unref() on the return result when you no
- * longer require it.
- *
- * Returns: a #GVariant, or %NULL
- **/
-GVariant *
-gvdb_table_get_value (GvdbTable *file,
- const gchar *key)
-{
- const struct gvdb_hash_item *item;
- GVariant *value;
-
- if ((item = gvdb_table_lookup (file, key, 'v')) == NULL)
- return NULL;
-
- value = gvdb_table_value_from_item (file, item);
-
- if (value && file->byteswapped)
- {
- GVariant *tmp;
-
- tmp = g_variant_byteswap (value);
- g_variant_unref (value);
- value = tmp;
- }
-
- return value;
-}
-
-/**
- * gvdb_table_get_raw_value:
- * @table: a #GvdbTable
- * @key: a string
- *
- * Looks up a value named @key in @file.
- *
- * This call is equivalent to gvdb_table_get_value() except that it
- * never byteswaps the value.
- *
- * Returns: a #GVariant, or %NULL
- **/
-GVariant *
-gvdb_table_get_raw_value (GvdbTable *table,
- const gchar *key)
-{
- const struct gvdb_hash_item *item;
-
- if ((item = gvdb_table_lookup (table, key, 'v')) == NULL)
- return NULL;
-
- return gvdb_table_value_from_item (table, item);
-}
-
-/**
- * gvdb_table_get_table:
- * @file: a #GvdbTable
- * @key: a string
- *
- * Looks up the hash table named @key in @file.
- *
- * The toplevel hash table in a #GvdbTable can contain reference to
- * child hash tables (and those can contain further references...).
- *
- * If @key is not found in @file then %NULL is returned. Otherwise, a
- * new #GvdbTable is returned, referring to the child hashtable as
- * contained in the file. This newly-created #GvdbTable does not depend
- * on the continued existence of @file.
- *
- * You should call gvdb_table_free() on the return result when you no
- * longer require it.
- *
- * Returns: a new #GvdbTable, or %NULL
- **/
-GvdbTable *
-gvdb_table_get_table (GvdbTable *file,
- const gchar *key)
-{
- const struct gvdb_hash_item *item;
- GvdbTable *new;
-
- item = gvdb_table_lookup (file, key, 'H');
-
- if (item == NULL)
- return NULL;
-
- new = g_slice_new0 (GvdbTable);
- new->bytes = g_bytes_ref (file->bytes);
- new->byteswapped = file->byteswapped;
- new->trusted = file->trusted;
- new->data = file->data;
- new->size = file->size;
-
- gvdb_table_setup_root (new, &item->value.pointer);
-
- return new;
-}
-
-/**
- * gvdb_table_free:
- * @file: a #GvdbTable
- *
- * Frees @file.
- **/
-void
-gvdb_table_free (GvdbTable *file)
-{
- g_bytes_unref (file->bytes);
- g_slice_free (GvdbTable, file);
-}
-
-/**
- * gvdb_table_is_valid:
- * @table: a #GvdbTable
- *
- * Checks if the table is still valid.
- *
- * An on-disk GVDB can be marked as invalid. This happens when the file
- * has been replaced. The appropriate action is typically to reopen the
- * file.
- *
- * Returns: %TRUE if @table is still valid
- **/
-gboolean
-gvdb_table_is_valid (GvdbTable *table)
-{
- return !!*table->data;
-}
diff --git a/subprojects/gvdb/gvdb/gvdb-reader.h b/subprojects/gvdb/gvdb/gvdb-reader.h
deleted file mode 100644
index 79a97d3..0000000
--- a/subprojects/gvdb/gvdb/gvdb-reader.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __gvdb_reader_h__
-#define __gvdb_reader_h__
-
-#include <glib.h>
-
-/* We cannot enable the weak attribute unconditionally here because both
- * gvdb/gvdb-reader.c and tests/dconf-mock-gvdb.c include this file. The
- * intention of using weak symbols here is to allow the latter to override
- * functions defined in the former, so functions in tests/dconf-mock-gvdb.c
- * must have strong bindings. */
-#ifdef GVDB_USE_WEAK_SYMBOLS
-# ifdef __GNUC__
-# define GVDB_GNUC_WEAK __attribute__((weak))
-# else
-# define GVDB_GNUC_WEAK
-# endif
-#else
-# define GVDB_GNUC_WEAK
-#endif
-
-typedef struct _GvdbTable GvdbTable;
-
-G_BEGIN_DECLS
-
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-GvdbTable * gvdb_table_new_from_bytes (GBytes *bytes,
- gboolean trusted,
- GError **error);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-GvdbTable * gvdb_table_new (const gchar *filename,
- gboolean trusted,
- GError **error);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-void gvdb_table_free (GvdbTable *table);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-gchar ** gvdb_table_get_names (GvdbTable *table,
- gsize *length);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-gchar ** gvdb_table_list (GvdbTable *table,
- const gchar *key);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-GvdbTable * gvdb_table_get_table (GvdbTable *table,
- const gchar *key);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-GVariant * gvdb_table_get_raw_value (GvdbTable *table,
- const gchar *key);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-GVariant * gvdb_table_get_value (GvdbTable *table,
- const gchar *key);
-
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-gboolean gvdb_table_has_value (GvdbTable *table,
- const gchar *key);
-G_GNUC_INTERNAL GVDB_GNUC_WEAK
-gboolean gvdb_table_is_valid (GvdbTable *table);
-
-G_END_DECLS
-
-#endif /* __gvdb_reader_h__ */
diff --git a/subprojects/gvdb/meson.build b/subprojects/gvdb/meson.build
deleted file mode 100644
index 01c86b4..0000000
--- a/subprojects/gvdb/meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-project('gvdb', 'c',
- version: '0.0',
- meson_version: '>=0.54.0',
-)
-
-libgvdb_sources = files(
- 'gvdb/gvdb-builder.c',
- 'gvdb/gvdb-reader.c',
-)
-
-gvdb_dep = declare_dependency(
- sources: libgvdb_sources,
- include_directories: include_directories('.'),
-)
-meson.override_dependency('gvdb', gvdb_dep)
Reference in New Issue View Git Blame Copy Permalink