[epiphany] Move gvdb to lib
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Move gvdb to lib
- Date: Fri, 28 Apr 2017 01:12:23 +0000 (UTC)
commit 3114251b1466640e69ce312e376c7e14de895809
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Thu Apr 27 13:11:56 2017 -0500
Move gvdb to lib
embed/meson.build | 3 ++-
lib/{egg => contrib}/eggtreemultidnd.c | 0
lib/{egg => contrib}/eggtreemultidnd.h | 0
lib/contrib/gvdb/README.epiphany | 4 ++++
{subprojects => lib/contrib}/gvdb/gvdb-builder.c | 0
{subprojects => lib/contrib}/gvdb/gvdb-builder.h | 7 -------
{subprojects => lib/contrib}/gvdb/gvdb-format.h | 0
{subprojects => lib/contrib}/gvdb/gvdb-reader.c | 0
{subprojects => lib/contrib}/gvdb/gvdb-reader.h | 10 ----------
lib/meson.build | 7 +++++--
lib/widgets/meson.build | 2 +-
meson.build | 3 ---
src/meson.build | 1 -
subprojects/gvdb/README.epiphany | 3 ---
subprojects/gvdb/meson.build | 22 ----------------------
15 files changed, 12 insertions(+), 50 deletions(-)
---
diff --git a/embed/meson.build b/embed/meson.build
index 8f662e2..99812c5 100644
--- a/embed/meson.build
+++ b/embed/meson.build
@@ -51,7 +51,8 @@ libephyembed_includes = include_directories(
'.',
'..',
'../lib',
- '../lib/egg',
+ '../lib/contrib',
+ '../lib/contrib/gvdb',
'../lib/history',
'../lib/widgets',
'../lib/widgets/contrib'
diff --git a/lib/egg/eggtreemultidnd.c b/lib/contrib/eggtreemultidnd.c
similarity index 100%
rename from lib/egg/eggtreemultidnd.c
rename to lib/contrib/eggtreemultidnd.c
diff --git a/lib/egg/eggtreemultidnd.h b/lib/contrib/eggtreemultidnd.h
similarity index 100%
rename from lib/egg/eggtreemultidnd.h
rename to lib/contrib/eggtreemultidnd.h
diff --git a/lib/contrib/gvdb/README.epiphany b/lib/contrib/gvdb/README.epiphany
new file mode 100644
index 0000000..ac43561
--- /dev/null
+++ b/lib/contrib/gvdb/README.epiphany
@@ -0,0 +1,4 @@
+GVariant Database
+
+ * Copied from https://git.gnome.org/browse/gvdb
+ * Removed G_GNUC_INTERNAL
diff --git a/subprojects/gvdb/gvdb-builder.c b/lib/contrib/gvdb/gvdb-builder.c
similarity index 100%
rename from subprojects/gvdb/gvdb-builder.c
rename to lib/contrib/gvdb/gvdb-builder.c
diff --git a/subprojects/gvdb/gvdb-builder.h b/lib/contrib/gvdb/gvdb-builder.h
similarity index 95%
rename from subprojects/gvdb/gvdb-builder.h
rename to lib/contrib/gvdb/gvdb-builder.h
index 797626e..8e32e14 100644
--- a/subprojects/gvdb/gvdb-builder.h
+++ b/lib/contrib/gvdb/gvdb-builder.h
@@ -26,29 +26,22 @@
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,
diff --git a/subprojects/gvdb/gvdb-format.h b/lib/contrib/gvdb/gvdb-format.h
similarity index 100%
rename from subprojects/gvdb/gvdb-format.h
rename to lib/contrib/gvdb/gvdb-format.h
diff --git a/subprojects/gvdb/gvdb-reader.c b/lib/contrib/gvdb/gvdb-reader.c
similarity index 100%
rename from subprojects/gvdb/gvdb-reader.c
rename to lib/contrib/gvdb/gvdb-reader.c
diff --git a/subprojects/gvdb/gvdb-reader.h b/lib/contrib/gvdb/gvdb-reader.h
similarity index 94%
rename from subprojects/gvdb/gvdb-reader.h
rename to lib/contrib/gvdb/gvdb-reader.h
index 5980925..689721c 100644
--- a/subprojects/gvdb/gvdb-reader.h
+++ b/lib/contrib/gvdb/gvdb-reader.h
@@ -28,36 +28,26 @@ typedef struct _GvdbTable GvdbTable;
G_BEGIN_DECLS
-G_GNUC_INTERNAL
GvdbTable * gvdb_table_new_from_bytes (GBytes *bytes,
gboolean trusted,
GError **error);
-G_GNUC_INTERNAL
GvdbTable * gvdb_table_new (const gchar *filename,
gboolean trusted,
GError **error);
-G_GNUC_INTERNAL
void gvdb_table_free (GvdbTable *table);
-G_GNUC_INTERNAL
gchar ** gvdb_table_get_names (GvdbTable *table,
gint *length);
-G_GNUC_INTERNAL
gchar ** gvdb_table_list (GvdbTable *table,
const gchar *key);
-G_GNUC_INTERNAL
GvdbTable * gvdb_table_get_table (GvdbTable *table,
const gchar *key);
-G_GNUC_INTERNAL
GVariant * gvdb_table_get_raw_value (GvdbTable *table,
const gchar *key);
-G_GNUC_INTERNAL
GVariant * gvdb_table_get_value (GvdbTable *table,
const gchar *key);
-G_GNUC_INTERNAL
gboolean gvdb_table_has_value (GvdbTable *table,
const gchar *key);
-G_GNUC_INTERNAL
gboolean gvdb_table_is_valid (GvdbTable *table);
G_END_DECLS
diff --git a/lib/meson.build b/lib/meson.build
index 1bac6d6..2967ee9 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -11,7 +11,9 @@ enums = gnome.mkenums('ephy-lib',
)
libephymisc_sources = [
- 'egg/eggtreemultidnd.c',
+ 'contrib/eggtreemultidnd.c',
+ 'contrib/gvdb/gvdb-builder.c',
+ 'contrib/gvdb/gvdb-reader.c',
'ephy-dbus-util.c',
'ephy-debug.c',
'ephy-dnd.c',
@@ -65,7 +67,8 @@ libephymisc_deps = [
libephymisc_includes = include_directories(
'.',
'..',
- 'egg',
+ 'contrib',
+ 'contrib/gvdb',
'history'
)
diff --git a/lib/widgets/meson.build b/lib/widgets/meson.build
index 8a31918..76ff48b 100644
--- a/lib/widgets/meson.build
+++ b/lib/widgets/meson.build
@@ -39,7 +39,7 @@ libephywidgets_deps = [
libephywidgets_includes = include_directories(
'.',
'..',
- '../egg',
+ '../contrib',
'../history',
'../..',
'../../embed',
diff --git a/meson.build b/meson.build
index fd9fde0..e8b85cc 100644
--- a/meson.build
+++ b/meson.build
@@ -42,9 +42,6 @@ configure_file(
configuration: conf
)
-gvdb = subproject('gvdb')
-gvdb_dep = gvdb.get_variable('gvdb_dep')
-
glib_requirement = '>= 2.46.0'
gtk_requirement = '>= 3.22.0'
webkitgtk_requirement = '>= 2.16.0'
diff --git a/src/meson.build b/src/meson.build
index 41d4df0..208bd46 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -48,7 +48,6 @@ libephymain_deps = [
ephyembed_dep,
ephymisc_dep,
ephywidgets_dep,
- gvdb_dep,
json_glib_dep,
libnotify_dep
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
