aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAstroFloyd <AstroFloyd@gmail.com>2020-02-24 10:39:22 +0100
committerAstroFloyd <AstroFloyd@gmail.com>2020-02-24 10:39:22 +0100
commit41303b028b17ac875c3c8bf770b4fd787d1773f3 (patch)
treee4ca8abbdec4921ed446a4b08c01ec97c38d1962
parentsci-astronomy/libthesky: update Manifest to new data file size(?) (diff)
downloadAstroFloyd-41303b028b17ac875c3c8bf770b4fd787d1773f3.tar.gz
AstroFloyd-41303b028b17ac875c3c8bf770b4fd787d1773f3.tar.bz2
AstroFloyd-41303b028b17ac875c3c8bf770b4fd787d1773f3.zip
gnome-extra/libgda: revision bump to v5.2.8-r2 to add my_bool patch
Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: AstroFloyd <AstroFloyd@gmail.com>
-rw-r--r--gnome-extra/libgda/ChangeLog9
-rw-r--r--gnome-extra/libgda/Manifest9
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch55
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch28
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.4-format-security.patch29
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.4-jre18.patch14
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.8-my_bool-error.patch136
-rw-r--r--gnome-extra/libgda/libgda-5.2.8-r2.ebuild171
-rw-r--r--gnome-extra/libgda/metadata.xml16
9 files changed, 467 insertions, 0 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
new file mode 100644
index 0000000..3a5b7de
--- /dev/null
+++ b/gnome-extra/libgda/ChangeLog
@@ -0,0 +1,9 @@
+*libgda-5.2.8-r2 (24 Feb 2020)
+
+ 24 Feb 2020; AstroFloyd <AstroFloyd@gmail.com>
+ +files/libgda-4.99.1-control-center-icon-collision.patch,
+ +files/libgda-4.99.1-gda-browser-doc-collision.patch,
+ +files/libgda-5.2.4-format-security.patch, +files/libgda-5.2.4-jre18.patch,
+ +files/libgda-5.2.8-my_bool-error.patch, +libgda-5.2.8-r2.ebuild,
+ +metadata.xml:
+ gnome-extra/libgda: revision bump to v5.2.8-r2 to add my_bool patch
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
new file mode 100644
index 0000000..9a14377
--- /dev/null
+++ b/gnome-extra/libgda/Manifest
@@ -0,0 +1,9 @@
+AUX libgda-4.99.1-control-center-icon-collision.patch 2266 BLAKE2B 4005c1a3d7b71f9a264321941be67bad1c339cf90fe47d749eeb88ebe0a2ef1abf20e3b6d856a0289b359a66b7f9f140d1bbf61eb83d279407270e1ff70c2b46 SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5
+AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f74939dda29cd4157c20a50b724a7648c517d4fccd1a0d696f1eb5cebc6199a775e96d2687542e5a815bb63f01684d9c68497279b7f45adc08 SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353
+AUX libgda-5.2.4-format-security.patch 1003 BLAKE2B 7b8727e080b0a82645a4f9cdbe718a814b22fd8939d613dc6100b85ce589cf1cd8760a1d515c8ffb7221ff83ce09abbc841ab6a05520c3a804c4eeefe1588359 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f
+AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a78b516e5b8ecb90f0d3d69b6b6daff7b30c2ec24842d6726804787d06e8b5858a75beb7c4b41d6cf4304d0f0f SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94
+AUX libgda-5.2.8-my_bool-error.patch 5712 BLAKE2B db3770d098ca4480e45983d9804ad307d9b8780b81cc0245ea37f0573fea9ae6df736f7b1b2fc55859cab635b537a7a4b513953c94ea9c4167e1676cafc07a87 SHA512 e28d2e428cb75688636b241bb7a7b650536c859dc2e0d9fb27aef8ef3c82d0932a943c77249c9e328103a557a70f0fca477020004b007b44531ac3b141c9c683
+DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
+EBUILD libgda-5.2.8-r2.ebuild 5169 BLAKE2B b0a268c33f745f85e4ab49822151bac98d09aa2fa3270c21996d60e316ec08e1ee484ea950a78fb2f311d0dfeee560b578c2cfaf9ba45866927df9ead9a647b7 SHA512 36f3fa47288be7555a4dfb58e30e6ce4d4f0e15794b050dfb806e7f46cb41f3b806755fc3bd0f272fa48580faebb2b74c367e56b9aeb57b3f8d75f605d1a3dc7
+MISC ChangeLog 430 BLAKE2B cdc4c289196b1a4d7c319615092d150d7becf4704033847b09b9c002fd5b4f709b9635a200914278888e52f16dd1a1d43d40058033a7bf9ac801c413ac1505f1 SHA512 3e537ec385162b174ec5b5e0871c18f008c17c68465cc9f4dfb49d11b0cc0a653b5cd91c0971d0dea9459eb0f8a3c298c9ccf86cba93fcef280cf17a864a4e37
+MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
new file mode 100644
index 0000000..fe814a7
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
@@ -0,0 +1,55 @@
+From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sat, 4 Jun 2011 05:45:35 -0400
+Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons
+
+---
+ control-center/data/Makefile.am | 12 ++++++------
+ ... hicolor_apps_16x16_gda-control-center-5.0.png} | Bin 833 -> 833 bytes
+ ... hicolor_apps_22x22_gda-control-center-5.0.png} | Bin 1157 -> 1157 bytes
+ ... hicolor_apps_24x24_gda-control-center-5.0.png} | Bin 1144 -> 1144 bytes
+ ...icolor_apps_256x256_gda-control-center-5.0.png} | Bin 33543 -> 33543 bytes
+ ... hicolor_apps_32x32_gda-control-center-5.0.png} | Bin 1867 -> 1867 bytes
+ ... hicolor_apps_48x48_gda-control-center-5.0.png} | Bin 3144 -> 3144 bytes
+ control-center/gda-control-center-5.0.desktop.in | 2 +-
+ 8 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am
+index 03fa362..862ec88 100644
+--- a/control-center/data/Makefile.am
++++ b/control-center/data/Makefile.am
+@@ -5,12 +5,12 @@ public_icons_themes = \
+ $(NULL)
+
+ public_icons = \
+- hicolor_apps_16x16_gda-control-center.png \
+- hicolor_apps_22x22_gda-control-center.png \
+- hicolor_apps_24x24_gda-control-center.png \
+- hicolor_apps_256x256_gda-control-center.png \
+- hicolor_apps_32x32_gda-control-center.png \
+- hicolor_apps_48x48_gda-control-center.png \
++ hicolor_apps_16x16_gda-control-center-5.0.png \
++ hicolor_apps_22x22_gda-control-center-5.0.png \
++ hicolor_apps_24x24_gda-control-center-5.0.png \
++ hicolor_apps_256x256_gda-control-center-5.0.png \
++ hicolor_apps_32x32_gda-control-center-5.0.png \
++ hicolor_apps_48x48_gda-control-center-5.0.png \
+ $(NULL)
+
+ private_icons = \
+diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in
+index 6fd5b58..429787d 100644
+--- a/control-center/gda-control-center-5.0.desktop.in
++++ b/control-center/gda-control-center-5.0.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Database access control center
+ _Comment=Configure your database access environment
+-Icon=gda-control-center
++Icon=gda-control-center-5.0
+ Exec=gda-control-center-5.0
+ Terminal=false
+ Type=Application
+--
+1.7.5.3
+
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
new file mode 100644
index 0000000..2fd31ab
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
@@ -0,0 +1,28 @@
+From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sat, 4 Jun 2011 05:59:46 -0400
+Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files
+
+---
+ tools/browser/doc/Makefile.am | 2 +-
+ ...browser-docs.sgml => gda-browser-5.0-docs.sgml} | 0
+ ...r-sections.txt => gda-browser-5.0-sections.txt} | 0
+ .../{gda-browser.types => gda-browser-5.0.types} | 0
+ 4 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
+index 971fa79..cf6637a 100644
+--- a/tools/browser/doc/Makefile.am
++++ b/tools/browser/doc/Makefile.am
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+
+ # The name of the module.
+-DOC_MODULE=gda-browser
++DOC_MODULE=gda-browser-5.0
+
+ # The top-level SGML file.
+ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+--
+1.7.5.3
+
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
new file mode 100644
index 0000000..81c7804
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
@@ -0,0 +1,29 @@
+From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001
+From: Vivien Malerba <malerba@gnome-db.org>
+Date: Wed, 16 Apr 2014 14:59:50 +0200
+Subject: [PATCH] Markup message correction
+
+---
+ libgda-ui/demos/ddl_queries.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
+index a47630f..4b29377 100644
+--- a/libgda-ui/demos/ddl_queries.c
++++ b/libgda-ui/demos/ddl_queries.c
+@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data)
+ else
+ msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql);
+
+- dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window),
+- GTK_DIALOG_MODAL,
+- msg_type, GTK_BUTTONS_CLOSE, msg);
++ dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window),
++ GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL);
++ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg);
+ g_free (sql);
+ g_free (msg);
+
+--
+1.9.0
+
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
new file mode 100644
index 0000000..f66fa8f
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
@@ -0,0 +1,14 @@
+--- libgda-5.2.2/configure.orig 2014-05-17 14:58:33.206028742 +0200
++++ libgda-5.2.2/configure 2014-05-17 14:58:45.937790443 +0200
+@@ -23200,6 +23259,11 @@
+ JTYPE="Sun JRE 1.7"
+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ ;;
++ JRE1.8.*)
++ try_java=true
++ JTYPE="Sun JRE 1.8"
++ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
++ ;;
+ JREgcj-4*)
+ try_java=true
+ JTYPE="GCJ"
diff --git a/gnome-extra/libgda/files/libgda-5.2.8-my_bool-error.patch b/gnome-extra/libgda/files/libgda-5.2.8-my_bool-error.patch
new file mode 100644
index 0000000..f30dbc9
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.8-my_bool-error.patch
@@ -0,0 +1,136 @@
+diff -urNp libgda-5.2.8-orig/providers/mysql/gda-mysql-provider.c libgda-5.2.8-dwok/providers/mysql/gda-mysql-provider.c
+--- libgda-5.2.8-orig/providers/mysql/gda-mysql-provider.c 2019-08-21 12:47:26.763768166 +0200
++++ libgda-5.2.8-dwok/providers/mysql/gda-mysql-provider.c 2019-08-21 12:58:54.915575798 +0200
+@@ -1835,7 +1835,7 @@ real_prepare (GdaServerProvider *provide
+ return FALSE;
+ }
+
+- my_bool update_max_length = 1;
++ _Bool update_max_length = 1;
+ if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
+ _gda_mysql_make_error (cnc, NULL, mysql_stmt, error);
+ mysql_stmt_close (mysql_stmt);
+@@ -1941,7 +1941,7 @@ prepare_stmt_simple (MysqlConnectionData
+ return FALSE;
+ }
+
+- my_bool update_max_length = 1;
++ _Bool update_max_length = 1;
+ if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
+ _gda_mysql_make_error (cdata->cnc, NULL, mysql_stmt, error);
+ mysql_stmt_close (mysql_stmt);
+@@ -2327,7 +2327,7 @@ gda_mysql_provider_statement_execute (Gd
+ if (allow_noparam) {
+ /* bind param to NULL */
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ empty_rs = TRUE;
+ continue;
+ }
+@@ -2347,7 +2347,7 @@ gda_mysql_provider_statement_execute (Gd
+ if (allow_noparam) {
+ /* bind param to NULL */
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ empty_rs = TRUE;
+ continue;
+ }
+@@ -2399,7 +2399,7 @@ gda_mysql_provider_statement_execute (Gd
+ GdaStatement *rstmt;
+ if (! gda_rewrite_statement_for_null_parameters (stmt, params, &rstmt, error)) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else if (!rstmt)
+ return NULL;
+@@ -2459,7 +2459,7 @@ gda_mysql_provider_statement_execute (Gd
+ ts = (GdaTimestamp*) gda_value_get_timestamp (value);
+ if (!ts) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ _Bool tofree = FALSE;
+@@ -2495,7 +2495,7 @@ gda_mysql_provider_statement_execute (Gd
+ ts = (GdaTime*) gda_value_get_time (value);
+ if (!ts) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ _Bool tofree = FALSE;
+@@ -2528,7 +2528,7 @@ gda_mysql_provider_statement_execute (Gd
+ ts = (GDate*) g_value_get_boxed (value);
+ if (!ts) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ MYSQL_TIME *mtime;
+@@ -2548,7 +2548,7 @@ gda_mysql_provider_statement_execute (Gd
+ str = g_value_get_string (value);
+ if (!str) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ mysql_bind_param[i].buffer_type= MYSQL_TYPE_STRING;
+@@ -2624,7 +2624,7 @@ gda_mysql_provider_statement_execute (Gd
+ bin = ((GdaBinary*) blob);
+ if (!bin) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ gchar *str = NULL;
+@@ -2665,7 +2665,7 @@ gda_mysql_provider_statement_execute (Gd
+ bin = gda_value_get_binary (value);
+ if (!bin) {
+ mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+- mysql_bind_param[i].is_null = (my_bool*)1;
++ mysql_bind_param[i].is_null = (_Bool *) 1;
+ }
+ else {
+ mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB;
+diff -urNp libgda-5.2.8-orig/providers/mysql/gda-mysql-recordset.c libgda-5.2.8-dwok/providers/mysql/gda-mysql-recordset.c
+--- libgda-5.2.8-orig/providers/mysql/gda-mysql-recordset.c 2019-08-21 12:45:14.144430495 +0200
++++ libgda-5.2.8-dwok/providers/mysql/gda-mysql-recordset.c 2019-08-21 12:59:57.265383845 +0200
+@@ -627,7 +627,7 @@ gda_mysql_recordset_new (GdaConnection
+ /* binding results with types */
+ mysql_bind_result[i].buffer_type = field->type;
+ mysql_bind_result[i].is_unsigned = field->flags & UNSIGNED_FLAG ? TRUE : FALSE;
+- mysql_bind_result[i].is_null = g_malloc0 (sizeof (my_bool));
++ mysql_bind_result[i].is_null = g_malloc0 (sizeof (_Bool));
+
+ switch (mysql_bind_result[i].buffer_type) {
+ case MYSQL_TYPE_TINY:
+@@ -753,7 +753,7 @@ new_row_from_mysql_stmt (GdaMysqlRecords
+
+ gint col;
+ for (col = 0; col < ((GdaDataSelect *) imodel)->prep_stmt->ncols; ++col) {
+- my_bool truncated;
++ _Bool truncated;
+ mysql_bind_result[col].error = &truncated;
+ mysql_stmt_fetch_column (imodel->priv->mysql_stmt, &(mysql_bind_result[col]),
+ (unsigned int)col, 0);
+@@ -784,10 +784,10 @@ new_row_from_mysql_stmt (GdaMysqlRecords
+
+ /*g_print ("%s: #%d : TYPE=%d, GTYPE=%s\n", __func__, i, mysql_bind_result[i].buffer_type, g_type_name (type));*/
+
+- my_bool is_null = FALSE;
++ _Bool is_null = FALSE;
+ unsigned long length;
+
+- memmove (&is_null, mysql_bind_result[i].is_null, sizeof (my_bool));
++ memmove (&is_null, mysql_bind_result[i].is_null, sizeof (_Bool));
+ if (is_null) {
+ gda_value_set_null (value);
+ continue;
diff --git a/gnome-extra/libgda/libgda-5.2.8-r2.ebuild b/gnome-extra/libgda/libgda-5.2.8-r2.ebuild
new file mode 100644
index 0000000..0bd04a8
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.8-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+ reports? ( ${PYTHON_REQUIRED_USE} )
+ canvas? ( gtk )
+ graphviz? ( gtk )
+ sourceview? ( gtk )
+ vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ app-text/iso-codes
+ >=dev-libs/glib-2.32:2
+ >=dev-libs/libxml2-2
+ dev-libs/libxslt
+ sys-libs/readline:0=
+ sys-libs/ncurses:0=
+ berkdb? ( sys-libs/db:* )
+ firebird? ( dev-db/firebird )
+ gnome-keyring? ( app-crypt/libsecret )
+ gtk? (
+ >=x11-libs/gtk+-3.0.0:3
+ canvas? ( x11-libs/goocanvas:2.0= )
+ sourceview? ( x11-libs/gtksourceview:3.0 )
+ graphviz? ( media-gfx/graphviz )
+ )
+ http? ( >=net-libs/libsoup-2.24:2.4 )
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+ json? ( dev-libs/json-glib )
+ ldap? ( net-nds/openldap:= )
+ mdb? ( >app-office/mdbtools-0.5:= )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ postgres? ( dev-db/postgresql:= )
+ reports? (
+ ${PYTHON_DEPS}
+ dev-java/fop
+ dev-python/reportlab )
+ ssl? ( dev-libs/openssl:0= )
+ >=dev-db/sqlite-3.10.2:3=
+ vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build system fixes - bug 674066
+DEPEND="${RDEPEND}
+ dev-libs/libgee:0.8
+ >=app-text/gnome-doc-utils-0.9
+ app-text/yelp-tools
+ dev-util/glib-utils
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ java? ( >=virtual/jdk-1.6 )
+ vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+ test
+ firebird? ( bindist )
+"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix compilation with -Werror=format-security (from 'master')
+ eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+ use berkdb && append-cppflags "-I$(db_includedir)"
+
+ use reports ||
+ sed -e '/SUBDIRS =/ s/trml2html//' \
+ -e '/SUBDIRS =/ s/trml2pdf//' \
+ -i libgda-report/RML/Makefile.{am,in} || die
+
+ # Prevent file collisions with libgda:4
+ eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+ eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+ # Move files with mv (since epatch can't handle rename diffs) and
+ # update pre-generated gtk-doc files (for non-git versions of libgda)
+ local f
+ for f in tools/browser/doc/gda-browser* ; do
+ mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+ done
+ for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+ sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+ -i ${f} || die "sed ${f} failed"
+ mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+ done
+ for f in control-center/data/*_gda-control-center.png ; do
+ mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+ die "mv ${f} failed"
+ done
+
+ gnome2_src_prepare
+ java-pkg-opt-2_src_prepare
+ use vala && vala_src_prepare
+
+ # Support JRE 1.8 (from Fedora) - patches configure, so applied AFTER gnome2_src_prepare runs eautoreconf
+ eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+ # my_bool patch: https://bugs.gentoo.org/692672
+ eapply "${FILESDIR}"/${PN}-5.2.8-my_bool-error.patch
+}
+
+src_configure() {
+ # Upstream broken configure handling for UI library introspection and vala bindings if passing a choice with use_enable - https://gitlab.gnome.org/GNOME/libgda/issues/158
+ # But if we don't pass an explicit choice, it behaves as we need (only enable them if --enable-ui AND the appropriate --enable-introspection or --enable-vala)
+ gnome2_src_configure \
+ --with-help \
+ --disable-default-binary \
+ --disable-static \
+ --enable-system-sqlite \
+ $(use_with berkdb bdb /usr) \
+ $(use_with canvas goocanvas) \
+ $(use_enable debug) \
+ $(use_with firebird firebird /usr) \
+ $(use_with gnome-keyring libsecret) \
+ $(use_with graphviz) \
+ $(use_with gtk ui) \
+ $(use_with http libsoup) \
+ $(use_enable introspection) \
+ "$(use_with java java $JAVA_HOME)" \
+ $(use_enable json) \
+ $(use_with ldap) \
+ --with-ldap-libdir-name="$(get_libdir)" \
+ $(use_with mdb mdb /usr) \
+ $(use_with mysql mysql /usr) \
+ $(use_with oci8 oracle) \
+ $(use_with postgres postgres /usr) \
+ $(use_enable ssl crypto) \
+ $(use_with sourceview gtksourceview) \
+ $(use_enable vala)
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+ java-pkg-opt-2_pkg_preinst
+}
+
+src_install() {
+ gnome2_src_install
+ if use reports; then
+ for t in trml2{html,pdf}; do
+ python_scriptinto /usr/share/libgda-5.0/gda_${t}
+ python_doscript libgda-report/RML/${t}/${t}.py
+ done
+ fi
+}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
new file mode 100644
index 0000000..c72a409
--- /dev/null
+++ b/gnome-extra/libgda/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
+ <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+ <flag name="json">Enable support for JSON format</flag>
+ <flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></flag>
+ <flag name="reports">Install tools for generating graphical reports</flag>
+ <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
+ </use>
+</pkgmetadata>