summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-11-13 12:02:10 +0000
committerPacho Ramos <pacho@gentoo.org>2014-11-13 12:02:10 +0000
commiteb47af6eb85e8f5306426dc36025ca8d81644a34 (patch)
tree48d96837e809edb35499ad3a4f5beb522c6984f4 /gnome-extra/libgda
parentDrop package due bug #508854 (diff)
downloadgentoo-2-eb47af6eb85e8f5306426dc36025ca8d81644a34.tar.gz
gentoo-2-eb47af6eb85e8f5306426dc36025ca8d81644a34.tar.bz2
gentoo-2-eb47af6eb85e8f5306426dc36025ca8d81644a34.zip
Drop package due bug #508854
Diffstat (limited to 'gnome-extra/libgda')
-rw-r--r--gnome-extra/libgda/Manifest17
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch38
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch15
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch465
-rw-r--r--gnome-extra/libgda/files/libgda-5.0.3-custom.vala6
-rw-r--r--gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch100
-rw-r--r--gnome-extra/libgda/libgda-4.2.13.ebuild114
7 files changed, 0 insertions, 755 deletions
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 88b4c90a191e..68a3b2861972 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,23 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX libgda-4.99.1-control-center-icon-collision.patch 2266 SHA256 dc52049ea4706fc8a8a91bc7c572abc275a312f7e0df15cf1b82c73ef8e4f63e SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 WHIRLPOOL f766d52e6c9591b4a7040105f0765df63412da92e7aa60aa4921cedf2f05ba60a732d72f443358ab78735c9dd44e51ce8e12ca5c3892b9e077f04b0772412650
AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 SHA256 d89d44e62a1a483cd77f13c723f0541f39a71a5f0651197d3e25d1093567d78c SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 WHIRLPOOL c4f2b570f5fb486a4f1a6d3575e0849a13c78fcc1d05d2b64d4cb15f0af83a54bb8d184ec14ce501ee7e7dcc10f4b3a6c32c1d458e312c13716bde7752ff71c6
-AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 SHA256 b9d20506fe89fd0219f3d737450bbba0a98e5b850cf152e570ca8a6a66740994 SHA512 7ece8431e4146963e2b3b0c0355e379b9060be809fa9a97e587f97d206d11ba475c94e6b2d3d4ff5d943baa3090b5ee33406d6a8949817cd151c0f2a35f4572d WHIRLPOOL f323df81c1aba82eb2390e58a85f4bae2b7906476449096da2fbc55b307d746384868554d37a21cd0003c3b5623eb18f34174c5ec645d3a7c2b5201a58ee595e
-AUX libgda-4.99.4-disable-broken-tests.patch 363 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c SHA512 748e26b7319ba07da1efba9c5350d0b7724aef0d940516252499474b479201fa8b726c9965c95812122cb3cda3937dc2bf96a203943cbc9a9fe5f3b45990c0f2 WHIRLPOOL 846cde3fc8c3db5bd9dc87e879cfb4599b7d0a99af7c2cbc5894946ee0fa09b24c979fa39ae4a7f094166b39a1fc8b7de0186a6179fefb438588dc7f9e38cd19
-AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 SHA256 81c6089b0899ef43428e5e6f182df153c85730e879f2ecefa7c769b0073c756d SHA512 773d69abaa3c13333e4dae2d5c3661053227e4e1ecfcc8a7fb27e6ba63a8f973ac0db559648c1cf89f975a82324b444dd65cb86429dc7f5255e11d605f05a85a WHIRLPOOL 64f05e45dc2a7cf96f7bae67ac60af6b6a6c19d4331b84126705eb033f7a16426936de9b6f087d225bb2e31adaebf52e223bc2869bf92507c4f309e3cd3f6da0
-AUX libgda-5.0.3-custom.vala 171 SHA256 28be89b84fdb22a38d7c0d9bb65e6d1a8ebfc3aa16eff424e26bdcfe95e2d0bf SHA512 5894e70dec948f1db4d85a03c6fad580e1f9cd411bcf6e424f536dc1b695841051b1f83782c249661cd5f1307b9cc772f58025d21b66f75637485feabe591ce2 WHIRLPOOL 3e8cbb33b45d7e57f0b611f35041e463fad7a9de56843afc515e14bbf5a7c05f1b4b743d445fb1b59a155f544790311b2223c3e05bbef0e2c23ccadd5e34c0a0
-AUX libgda-5.1.2-graphviz.patch 3346 SHA256 29de3081c8fc5a8eaef92bfcc5bb4cf662faf22b96b8ac858af4a2ebe21198e0 SHA512 fdf43692755dee496a85532f1b155c36f1bfebc0c16b860a97e85172021f1b0131d94824283f175321bf63f44b6726dcb9d672544f7a7fc716a558d5535fa8b1 WHIRLPOOL 7a8bddfcc7a2014a10f6f894b1ae3488e6dda76d5a3e571760de5ac4525d90f4fb670e26fb9de627f59917869da33a66a3ecc0148af3a274debdd60da0a065a2
-DIST libgda-4.2.13.tar.xz 11247816 SHA256 25b75951f8f38fd58a403389566a0aae2f83b39d4225bc3acf5f2d68895ab4c3 SHA512 54506b65ac7127ab67168f8169aba4d366ea1c7f9e5401c27c00a7eee7ea5ce33821faef0c7f2d397455869bd98025990b527cb7ad8cca1a88d32bd699d44f22 WHIRLPOOL c958ecb735b5ba84236bd80f20f39017dca35911452ad95c65c82e4ee40eadecc683d78f7d459f65d576d520e309f19ceddf0da3054696d83261ebd141db13b8
DIST libgda-5.2.2.tar.xz 12173216 SHA256 c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4 SHA512 b09ef364c3357a58b17508a39ee53ef462baa54bb3c8af580d23fd2771b034355092ecdb7ef29b29dd08533394a702f12b838732c712fb6b3a04b6b201cd3c74 WHIRLPOOL 463efc5825be741d55ab6741d250f537537d59c71d926c20c7202f384e5c7c9b2bcc49419a796df4bfa5e9248f59bcf12aa8331495c3aae7d56408f295c0693f
-EBUILD libgda-4.2.13.ebuild 3081 SHA256 6d12118265b8dec48b7ccdf8f65d10fdffd543b201e23ad185d0d6da212bc66a SHA512 f911d06e3f008f2d71c116757833d19059b52af6cc1a0b006e0b687c8556bbf7f8f5d5df910426c87215cf9f608b3513446347e1f941808d5a906c323280b10e WHIRLPOOL 6ddf356d15664e11537eb8e100352e4fb2693f531e086f0dcb8888ef3952728a0b6844fefc13334d76dc6bdc97e27778b13e09e917a74d24f7a26ef57c20c834
EBUILD libgda-5.2.2.ebuild 4359 SHA256 21c8018b01ceb5ba11790a3e69f5e55550056dc210d527cbe3ba2f851f1f568f SHA512 0b7ab0e053fb3d5625726b19fd83e771cee779cc972e6367b2fed0fb1c807aed2071e5e9b615756d2c1fdbedf52c85065189121ac9a8e8c73ef738027b80fc6d WHIRLPOOL 1d5beab9982c47c8bc029e02c650b5e54272e979801a73b3618711dbe2996e5cf9e01c60f79025ed01848712e7952d760347f56b244b508af72457c9dadc1cd1
MISC ChangeLog 35011 SHA256 c2fdcc4395070eff6f0f84736cfe9664f053a839e12f3fe16a6f0557988e7c87 SHA512 18ae0f820ccde3480d8a2b11541c8743036e1c0e1edce5b858adffd7c2aa19ffdb41da3c1d9e1d1f997579591dcdb0e096af77d00f543f47e49df6b47a366a85 WHIRLPOOL ff66c7c896c555b2a9f99be301bf6ad80c870e180793a59724bd387b1167b82ab23c3e040edf2c03ce75468dd7ae36396e79279d2bcb4fe037fc745fdd33086f
MISC metadata.xml 908 SHA256 950b0cbb48f8f9254e4457efc8d4e290edcc814a1b07dfb85eb0d61b077bfc4c SHA512 e9b04c54efd1d15fed1e3820e0b5ccb9c6bd8260deabc9e850278132906263e18f4156598b3bafc26ef57ae0e83a95a6560e182bf7b3c63db045611ee36549b7 WHIRLPOOL d8f28595e61688646263d534b60235072294c96a62f1c86bd42a83ce481dc584c4939ad354b55718169c64522656d135ab4f0733db2a9fa05e27a6490aff3e5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlRXeTYACgkQVxOqA9G7/aDG+QEAk+J9E+iHXHkhp/AfQXtRWtGH
-govbwGctvKU8IEKDnFcA/iRd7w8/uxFjZLNJ+Y4afYdPwtQnLUH5OhxpHpt4o8mH
-=RN0e
------END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch
deleted file mode 100644
index 46e728234da4..000000000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 01b13e22b215647c2343ec5f633b51d3c2b37824 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 01:59:14 -0400
-Subject: [PATCH] Prevent file collision with gda-browser-4.0's help files
-
----
- tools/browser/help/Makefile.am | 2 +-
- tools/browser/support.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/browser/help/Makefile.am b/tools/browser/help/Makefile.am
-index 93acaf8..48fcdc4 100644
---- a/tools/browser/help/Makefile.am
-+++ b/tools/browser/help/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/gnome-doc-utils.make
-
--DOC_ID = gda-browser
-+DOC_ID = gda-browser-5.0
-
- DOC_INCLUDES = legal.xml
- DOC_FIGURES = \
-diff --git a/tools/browser/support.c b/tools/browser/support.c
-index 5b1b4e6..f462efc 100644
---- a/tools/browser/support.c
-+++ b/tools/browser/support.c
-@@ -223,7 +223,7 @@ browser_show_help (GtkWindow *parent, const gchar *topic)
- if (strchr (lang, '.'))
- continue;
-
-- uri = gda_gbr_get_file_path (GDA_DATA_DIR, "gnome", "help", "gda-browser", lang, NULL);
-+ uri = gda_gbr_get_file_path (GDA_DATA_DIR, "gnome", "help", "gda-browser-5.0", lang, NULL);
-
- /*g_print ("TST URI [%s]\n", uri);*/
- if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
---
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch b/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch
deleted file mode 100644
index 1add00a025a4..000000000000
--- a/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/value-holders/check_holder.c b/tests/value-holders/check_holder.c
-index d014131..289a9ca 100644
---- a/tests/value-holders/check_holder.c
-+++ b/tests/value-holders/check_holder.c
-@@ -38,8 +38,8 @@ static gboolean test13 (GError **error);
- TestFunc tests[] = {
- test1,
- test2,
-- test3,
-- test4,
-+// test3,
-+// test4,
- test5,
- test6,
- test7,
diff --git a/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch b/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch
deleted file mode 100644
index 07077e5461d8..000000000000
--- a/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch
+++ /dev/null
@@ -1,465 +0,0 @@
-From 7d7742477ad03f19a168c763b988a7807421e9ca Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Sat, 17 Sep 2011 14:26:09 +0000
-Subject: Fixed nasty bug introduced in commit #036420a459b0bb241716cd9a14c3dd1eb2b21f63
-
-which "Improved statement rewriting for NULL parameters", and in other
-commits for each provider
----
-diff --git a/libgda/sqlite/gda-sqlite-provider.c b/libgda/sqlite/gda-sqlite-provider.c
-index afeab3c..69ccd16 100644
---- a/libgda/sqlite/gda-sqlite-provider.c
-+++ b/libgda/sqlite/gda-sqlite-provider.c
-@@ -2935,7 +2935,33 @@ gda_sqlite_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- else if (!rstmt)
- return NULL;
- else {
-+ /* The strategy here is to execute @rstmt using the prepared
-+ * statement associcted to @stmt, but adapted to @rstmt, so all
-+ * the column names, etc remain the same.
-+ *
-+ * The adaptation consists to replace SQLite specific information
-+ * in the GdaSqlitePStmt object.
-+ *
-+ * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+ * execute @rstmt, and then undo the trick */
- GObject *obj;
-+ GdaSqlitePStmt *tps;
-+ if (!gda_sqlite_provider_statement_prepare (provider, cnc,
-+ rstmt, error))
-+ return NULL;
-+ tps = (GdaSqlitePStmt *)
-+ gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+ /* adapt @ps with @tps's SQLite specific information */
-+ GdaSqlitePStmt hps;
-+ hps.sqlite_stmt = ps->sqlite_stmt; /* save */
-+ ps->sqlite_stmt = tps->sqlite_stmt; /* override */
-+ hps.stmt_used = ps->stmt_used; /* save */
-+ ps->stmt_used = tps->stmt_used; /* override */
-+ g_object_ref (tps);
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+ /* execute rstmt (it will use @ps) */
- obj = gda_sqlite_provider_statement_execute (provider, cnc,
- rstmt, params,
- model_usage,
-@@ -2943,15 +2969,14 @@ gda_sqlite_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- last_inserted_row,
- task_id, async_cb,
- cb_data, error);
-+
-+ /* revert adaptations */
-+ ps->sqlite_stmt = hps.sqlite_stmt;
-+ ps->stmt_used = hps.stmt_used;
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+ g_object_unref (tps);
- g_object_unref (rstmt);
-- if (GDA_IS_DATA_SELECT (obj)) {
-- GdaPStmt *pstmt;
-- g_object_get (obj, "prepared-stmt", &pstmt, NULL);
-- if (pstmt) {
-- gda_pstmt_set_gda_statement (pstmt, stmt);
-- g_object_unref (pstmt);
-- }
-- }
-+
- if (new_ps)
- g_object_unref (ps);
- pending_blobs_free_list (blobs_list);
-diff --git a/providers/jdbc/gda-jdbc-provider.c b/providers/jdbc/gda-jdbc-provider.c
-index 164e67f..c1192fb 100644
---- a/providers/jdbc/gda-jdbc-provider.c
-+++ b/providers/jdbc/gda-jdbc-provider.c
-@@ -1429,9 +1429,49 @@ gda_jdbc_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- else if (!rstmt)
- return NULL;
- else {
-- GObject *obj;
-- g_object_unref (ps);
- _gda_jdbc_release_jenv (jni_detach);
-+
-+ /* The strategy here is to execute @rstmt using the prepared
-+ * statement associcted to @stmt, but adapted to @rstmt, so all
-+ * the column names, etc remain the same.
-+ *
-+ * The adaptation consists to replace Jdbc specific information
-+ * in the GdaJdbcPStmt object.
-+ *
-+ * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+ * execute @rstmt, and then undo the trick */
-+ GObject *obj;
-+ GdaJdbcPStmt *tps;
-+ if (!gda_jdbc_provider_statement_prepare (provider, cnc,
-+ rstmt, error)) {
-+ g_object_unref (ps);
-+ return NULL;
-+ }
-+ tps = (GdaJdbcPStmt *)
-+ gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+ /* adapt @ps with @tps's Jdbc specific information */
-+ GdaJdbcPStmt hps;
-+ hps.pstmt_obj = ps->pstmt_obj; /* save */
-+ ps->pstmt_obj = tps->pstmt_obj; /* override */
-+ g_object_ref (tps);
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+ /* execute rstmt (it will use @ps) */
-+ obj = gda_jdbc_provider_statement_execute (provider, cnc,
-+ rstmt, params,
-+ model_usage,
-+ col_types,
-+ last_inserted_row,
-+ task_id, async_cb,
-+ cb_data, error);
-+
-+ /* revert adaptations */
-+ ps->pstmt_obj = hps.pstmt_obj;
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+ g_object_unref (tps);
-+ g_object_unref (rstmt);
-+
- obj = gda_jdbc_provider_statement_execute (provider, cnc,
- rstmt, params,
- model_usage,
-@@ -1440,14 +1480,7 @@ gda_jdbc_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- task_id, async_cb,
- cb_data, error);
- g_object_unref (rstmt);
-- if (GDA_IS_DATA_SELECT (obj)) {
-- GdaPStmt *pstmt;
-- g_object_get (obj, "prepared-stmt", &pstmt, NULL);
-- if (pstmt) {
-- gda_pstmt_set_gda_statement (pstmt, stmt);
-- g_object_unref (pstmt);
-- }
-- }
-+ g_object_unref (ps);
- return obj;
- }
- }
-diff --git a/providers/mysql/gda-mysql-provider.c b/providers/mysql/gda-mysql-provider.c
-index d581828..8baf0a3 100644
---- a/providers/mysql/gda-mysql-provider.c
-+++ b/providers/mysql/gda-mysql-provider.c
-@@ -2304,8 +2304,35 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
- else if (!rstmt)
- return NULL;
- else {
-- GObject *obj;
- free_bind_param_data (mem_to_free);
-+
-+ /* The strategy here is to execute @rstmt using the prepared
-+ * statement associcted to @stmt, but adapted to @rstmt, so all
-+ * the column names, etc remain the same.
-+ *
-+ * The adaptation consists to replace MySQL specific information
-+ * in the GdaMysqlPStmt object.
-+ *
-+ * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+ * execute @rstmt, and then undo the trick */
-+ GObject *obj;
-+ GdaMysqlPStmt *tps;
-+ if (!gda_mysql_provider_statement_prepare (provider, cnc,
-+ rstmt, error))
-+ return NULL;
-+ tps = (GdaMysqlPStmt *)
-+ gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+ /* adapt @ps with @tps's Mysql specific information */
-+ GdaMysqlPStmt hps;
-+ hps.mysql_stmt = ps->mysql_stmt; /* save */
-+ ps->mysql_stmt = tps->mysql_stmt; /* override */
-+ hps.stmt_used = ps->stmt_used; /* save */
-+ ps->stmt_used = tps->stmt_used; /* override */
-+ g_object_ref (tps);
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+ /* execute rstmt (it will use @ps) */
- obj = gda_mysql_provider_statement_execute (provider, cnc,
- rstmt, params,
- model_usage,
-@@ -2313,15 +2340,13 @@ gda_mysql_provider_statement_execute (GdaServerProvider *provider,
- last_inserted_row,
- task_id, async_cb,
- cb_data, error);
-+
-+ /* revert adaptations */
-+ ps->mysql_stmt = hps.mysql_stmt;
-+ ps->stmt_used = hps.stmt_used;
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+ g_object_unref (tps);
- g_object_unref (rstmt);
-- if (GDA_IS_DATA_SELECT (obj)) {
-- GdaPStmt *pstmt;
-- g_object_get (obj, "prepared-stmt", &pstmt, NULL);
-- if (pstmt) {
-- gda_pstmt_set_gda_statement (pstmt, stmt);
-- g_object_unref (pstmt);
-- }
-- }
- return obj;
- }
- }
-diff --git a/providers/oracle/gda-oracle-provider.c b/providers/oracle/gda-oracle-provider.c
-index 1d40105..9d0f485 100644
---- a/providers/oracle/gda-oracle-provider.c
-+++ b/providers/oracle/gda-oracle-provider.c
-@@ -1931,8 +1931,35 @@ gda_oracle_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- else if (!rstmt)
- return NULL;
- else {
-+ /* The strategy here is to execute @rstmt using the prepared
-+ * statement associcted to @stmt, but adapted to @rstmt, so all
-+ * the column names, etc remain the same.
-+ *
-+ * The adaptation consists to replace Oracle specific information
-+ * in the GdaOraclePStmt object.
-+ *
-+ * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+ * execute @rstmt, and then undo the trick */
- GObject *obj;
-- g_object_unref (ps);
-+ GdaOraclePStmt *tps;
-+ if (!gda_oracle_provider_statement_prepare (provider, cnc,
-+ rstmt, error)) {
-+ g_object_unref (ps);
-+ return NULL;
-+ }
-+ tps = (GdaOraclePStmt *)
-+ gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+ /* adapt @ps with @tps's Oracle specific information */
-+ GdaOraclePStmt hps;
-+ hps.hstmt = ps->hstmt; /* save */
-+ ps->hstmt = tps->hstmt; /* override */
-+ hps.ora_values = ps->ora_values; /* save */
-+ ps->ora_values = tps->ora_values; /* override */
-+ g_object_ref (tps);
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+ /* execute rstmt (it will use @ps) */
- obj = gda_oracle_provider_statement_execute (provider, cnc,
- rstmt, params,
- model_usage,
-@@ -1940,15 +1967,14 @@ gda_oracle_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- last_inserted_row,
- task_id, async_cb,
- cb_data, error);
-+
-+ /* revert adaptations */
-+ ps->hstmt = hps.hstmt;
-+ ps->ora_values = hps.ora_values;
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+ g_object_unref (tps);
- g_object_unref (rstmt);
-- if (GDA_IS_DATA_SELECT (obj)) {
-- GdaPStmt *pstmt;
-- g_object_get (obj, "prepared-stmt", &pstmt, NULL);
-- if (pstmt) {
-- gda_pstmt_set_gda_statement (pstmt, stmt);
-- g_object_unref (pstmt);
-- }
-- }
-+ g_object_unref (ps);
- return obj;
- }
- }
-diff --git a/providers/postgres/gda-postgres-provider.c b/providers/postgres/gda-postgres-provider.c
-index 6adca14..85db58e 100644
---- a/providers/postgres/gda-postgres-provider.c
-+++ b/providers/postgres/gda-postgres-provider.c
-@@ -2017,13 +2017,39 @@ gda_postgres_provider_statement_execute (GdaServerProvider *provider, GdaConnect
- else if (!rstmt)
- return NULL;
- else {
-- GObject *obj;
- params_freev (param_values, param_mem, nb_params);
- g_free (param_lengths);
- g_free (param_formats);
- if (transaction_started)
- gda_connection_rollback_transaction (cnc, NULL, NULL);
-
-+ /* The strategy here is to execute @rstmt using the prepared
-+ * statement associcted to @stmt, but adapted to @rstmt, so all
-+ * the column names, etc remain the same.
-+ *
-+ * The adaptation consists to replace Postgresql specific information
-+ * in the GdaPostgresPStmt object.
-+ *
-+ * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+ * execute @rstmt, and then undo the trick */
-+ GObject *obj;
-+ GdaPostgresPStmt *tps;
-+ if (!gda_postgres_provider_statement_prepare (provider, cnc,
-+ rstmt, error))
-+ return NULL;
-+ tps = (GdaPostgresPStmt *)
-+ gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+ /* adapt @ps with @tps's SQLite specific information */
-+ GdaPostgresPStmt hps;
-+ hps.pconn = ps->pconn; /* save */
-+ ps->pconn = tps->pconn; /* override */
-+ hps.prep_name = ps->prep_name; /* save */
-+ ps->prep_name = tps->prep_name; /* override */
-+ g_object_ref (tps);
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+ /* execute rstmt (it will use @ps) */
- obj = gda_postgres_provider_statement_execute (provider, cnc,
- rstmt, params,
- model_usage,
-@@ -2031,15 +2057,13 @@ gda_postgres_provider_statement_execute (GdaServerProvider *provider, GdaConnect
- last_inserted_row,
- task_id, async_cb,
- cb_data, error);
-+
-+ /* revert adaptations */
-+ ps->pconn = hps.pconn;
-+ ps->prep_name = hps.prep_name;
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+ g_object_unref (tps);
- g_object_unref (rstmt);
-- if (GDA_IS_DATA_SELECT (obj)) {
-- GdaPStmt *pstmt;
-- g_object_get (obj, "prepared-stmt", &pstmt, NULL);
-- if (pstmt) {
-- gda_pstmt_set_gda_statement (pstmt, stmt);
-- g_object_unref (pstmt);
-- }
-- }
- return obj;
- }
- }
-diff --git a/providers/skel-implementation/capi/gda-capi-provider.c b/providers/skel-implementation/capi/gda-capi-provider.c
-index 653f9ea..764d027 100644
---- a/providers/skel-implementation/capi/gda-capi-provider.c
-+++ b/providers/skel-implementation/capi/gda-capi-provider.c
-@@ -1181,7 +1181,31 @@ gda_capi_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- else if (!rstmt)
- return NULL;
- else {
-+ /* The strategy here is to execute @rstmt using the prepared
-+ * statement associcted to @stmt, but adapted to @rstmt, so all
-+ * the column names, etc remain the same.
-+ *
-+ * The adaptation consists to replace Capi specific information
-+ * in the GdaCapiPStmt object.
-+ *
-+ * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+ * execute @rstmt, and then undo the trick */
- GObject *obj;
-+ GdaCapiPStmt *tps;
-+ if (!gda_capi_provider_statement_prepare (provider, cnc,
-+ rstmt, error))
-+ return NULL;
-+ tps = (GdaCapiPStmt *)
-+ gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+ /* adapt @ps with @tps's Capi specific information */
-+ GdaCapiPStmt hps;
-+ /* TO ADD: hps.capi_stmt = ps->capi_stmt;*/ /* save */
-+ /* TO_ADD: ps->capi_stmt = tps->capi_stmt;*/ /* override */
-+ g_object_ref (tps);
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+ /* execute rstmt (it will use @ps) */
- obj = gda_capi_provider_statement_execute (provider, cnc,
- rstmt, params,
- model_usage,
-@@ -1189,15 +1213,13 @@ gda_capi_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- last_inserted_row,
- task_id, async_cb,
- cb_data, error);
-+
-+ /* revert adaptations */
-+ /* TO_ADD: ps->capi_stmt = hps.capi_stmt; */
-+
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+ g_object_unref (tps);
- g_object_unref (rstmt);
-- if (GDA_IS_DATA_SELECT (obj)) {
-- GdaPStmt *pstmt;
-- g_object_get (obj, "prepared-stmt", &pstmt, NULL);
-- if (pstmt) {
-- gda_pstmt_set_gda_statement (pstmt, stmt);
-- g_object_unref (pstmt);
-- }
-- }
- return obj;
- }
- }
-diff --git a/providers/web/gda-web-provider.c b/providers/web/gda-web-provider.c
-index 4500f01..9061126 100644
---- a/providers/web/gda-web-provider.c
-+++ b/providers/web/gda-web-provider.c
-@@ -1572,25 +1572,49 @@ gda_web_provider_statement_execute (GdaServerProvider *provider, GdaConnection *
- else if (!rstmt)
- return NULL;
- else {
-- GObject *obj;
-- g_object_unref (ps);
- xmlFreeDoc (doc);
-+
-+ /* The strategy here is to execute @rstmt using the prepared
-+ * statement associcted to @stmt, but adapted to @rstmt, so all
-+ * the column names, etc remain the same.
-+ *
-+ * The adaptation consists to replace Web specific information
-+ * in the GdaWebPStmt object.
-+ *
-+ * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+ * execute @rstmt, and then undo the trick */
-+ GObject *obj;
-+ GdaWebPStmt *tps;
-+ if (!gda_web_provider_statement_prepare (provider, cnc,
-+ rstmt, error)) {
-+ g_object_unref (ps);
-+ return NULL;
-+ }
-+ tps = (GdaWebPStmt *)
-+ gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+ /* adapt @ps with @tps's Web specific information */
-+ GdaWebPStmt hps;
-+ hps.pstmt_hash = ps->pstmt_hash; /* save */
-+ ps->pstmt_hash = tps->pstmt_hash; /* override */
-+ g_object_ref (tps);
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+ /* execute rstmt (it will use @ps) */
- obj = gda_web_provider_statement_execute (provider, cnc,
-- rstmt, params,
-- model_usage,
-- col_types,
-- last_inserted_row,
-- task_id, async_cb,
-- cb_data, error);
-+ rstmt, params,
-+ model_usage,
-+ col_types,
-+ last_inserted_row,
-+ task_id, async_cb,
-+ cb_data, error);
-+
-+ /* revert adaptations */
-+ ps->pstmt_hash = hps.pstmt_hash;
-+ gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+ g_object_unref (tps);
- g_object_unref (rstmt);
-- if (GDA_IS_DATA_SELECT (obj)) {
-- GdaPStmt *pstmt;
-- g_object_get (obj, "prepared-stmt", &pstmt, NULL);
-- if (pstmt) {
-- gda_pstmt_set_gda_statement (pstmt, stmt);
-- g_object_unref (pstmt);
-- }
-- }
-+ g_object_unref (ps);
- return obj;
- }
- }
---
-cgit v0.9.0.2
diff --git a/gnome-extra/libgda/files/libgda-5.0.3-custom.vala b/gnome-extra/libgda/files/libgda-5.0.3-custom.vala
deleted file mode 100644
index d464a8f9cc06..000000000000
--- a/gnome-extra/libgda/files/libgda-5.0.3-custom.vala
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Gda {
- public class DataProxy : GLib.Object, Gda.DataModel {
- [CCode (cname="gda_data_proxy_new")]
- public static GLib.Object @new (Gda.DataModel model);
- }
-}
diff --git a/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch b/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch
deleted file mode 100644
index b9242275d3a0..000000000000
--- a/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 071bd53b80621cf2bf3cea9ef2a97c5b3fc56ee6 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Tue, 30 Apr 2013 20:51:04 +0200
-Subject: [PATCH] Allow compiling even with old Graphviz API
-
-cf changes made in commit #cc5d429567e21ec62bf61b7e3b54348af11965b9
----
- configure.ac | 19 +++++++++++++++++++
- tools/browser/canvas/browser-canvas.c | 23 +++++++++++++++++++++--
- 2 files changed, 40 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0a61cef..84aad65 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -251,6 +251,25 @@ then
- AC_MSG_ERROR([Graphviz support requested but not found.])
- fi
- have_graphviz=no])
-+ if test "x$have_graphviz" = "xyes"
-+ then
-+ dnl test if new API is supported
-+ AC_MSG_CHECKING([whether Graphviz's new API is supported])
-+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+#include <gvc.h>
-+int main() {
-+ Agraph_t *graph;
-+ graph = agopen ("BrowserCanvasLayout", Agdirected, NULL);
-+ return 0;
-+}
-+])],
-+ graphviz_new_api=yes, graphviz_new_api=no)
-+
-+ AC_MSG_RESULT($graphviz_new_api)
-+ if test "$graphviz_new_api" = "yes"; then
-+ AC_DEFINE(GRAPHVIZ_NEW_API,[1],[define if Graphviz's new API is available])
-+ fi
-+ fi
- fi
-
- PKG_CHECK_MODULES(GLADE, "gladeui-2.0", [
-diff --git a/tools/browser/canvas/browser-canvas.c b/tools/browser/canvas/browser-canvas.c
-index b228fd3..e173c1b 100644
---- a/tools/browser/canvas/browser-canvas.c
-+++ b/tools/browser/canvas/browser-canvas.c
-@@ -851,6 +851,7 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
- if (!gvc)
- gvc = gvContext ();
-
-+#ifdef GRAPHVIZ_NEW_API
- graph = agopen ("BrowserCanvasLayout", Agdirected, NULL);
- agnode (graph, "shape", "box");
- agset (graph, "height", ".1");
-@@ -858,6 +859,15 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
- agset (graph, "fixedsize", "true");
- agset (graph, "pack", "true");
- agset (graph, "packmode", "node");
-+#else
-+ graph = agopen ("BrowserCanvasLayout", AGRAPH);
-+ agnodeattr (graph, "shape", "box");
-+ agnodeattr (graph, "height", ".1");
-+ agnodeattr (graph, "width", ".1");
-+ agnodeattr (graph, "fixedsize", "true");
-+ agnodeattr (graph, "pack", "true");
-+ agnodeattr (graph, "packmode", "node");
-+#endif
-
-
- if (class->get_layout_items)
-@@ -885,7 +895,11 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
- nodes_list = g_slist_prepend (nodes_list, nl);
-
- tmp = g_strdup_printf ("%p", item);
-+#ifdef GRAPHVIZ_NEW_API
- node = agnode (graph, tmp, 0);
-+#else
-+ node = agnode (graph, tmp);
-+#endif
- nl->node = node;
- g_hash_table_insert (nodes_hash, item, node);
-
-@@ -928,8 +942,13 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
- Agnode_t *from_node, *to_node;
- from_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, from);
- to_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, to);
-- if (from_node && to_node)
-- agedge (graph, from_node, to_node, "", 0);
-+ if (from_node && to_node) {
-+#ifdef GRAPHVIZ_NEW_API
-+ agedge (graph, from_node, to_node, "", 0);
-+#else
-+ agedge (graph, from_node, to_node);
-+#endif
-+ }
- }
- }
-
---
-1.8.3.2
-
diff --git a/gnome-extra/libgda/libgda-4.2.13.ebuild b/gnome-extra/libgda/libgda-4.2.13.ebuild
deleted file mode 100644
index f10d06a44e9e..000000000000
--- a/gnome-extra/libgda/libgda-4.2.13.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.13.ebuild,v 1.11 2014/11/03 12:46:44 titanofold Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use flag-o-matic gnome2 java-pkg-opt-2
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
-
-SLOT="4"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.16:2
- >=dev-libs/libxml2-2:2
- dev-libs/libxslt
- dev-libs/libunique:1
- sys-libs/readline
- sys-libs/ncurses
- >=dev-db/sqlite-3.6.22:3
- berkdb? ( sys-libs/db )
- !bindist? ( firebird? ( dev-db/firebird ) )
- gtk? (
- || ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
- canvas? ( x11-libs/goocanvas:0 )
- sourceview? ( x11-libs/gtksourceview:2.0 )
- graphviz? ( media-gfx/graphviz )
- )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- http? ( >=net-libs/libsoup-2.24:2.4 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
- json? ( dev-libs/json-glib )
- ldap? ( net-nds/openldap )
- mdb? ( >app-office/mdbtools-0.5 )
- mysql? ( virtual/mysql )
- postgres? ( virtual/postgresql )
- ssl? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-util/intltool-0.35.5
- >=app-text/gnome-doc-utils-0.9
- >=dev-util/gtk-doc-am-1"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-
- DOCS="AUTHORS ChangeLog NEWS README"
-
- if use canvas || use graphviz || use sourceview; then
- if ! use gtk; then
- ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
- ewarn "Disabling for now."
- G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
- else
- G2CONF="${G2CONF}
- $(use_with canvas goocanvas)
- $(use_with graphviz)
- $(use_with sourceview gtksourceview)"
- fi
- fi
-
- # Disable vala bindings, they collide with dev-lang/vala's libgda-4.0.vapi
- G2CONF="${G2CONF}
- --with-unique
- --disable-scrollkeeper
- --disable-static
- --enable-system-sqlite
- --disable-vala
- $(use_with berkdb bdb /usr)
- $(use_with gnome-keyring)
- $(use_with gtk ui)
- $(use_with http libsoup)
- $(use_enable introspection)
- $(use_enable introspection gda-gi)
- $(use_enable introspection gdaui-gi)
- $(use_with java java $JAVA_HOME)
- $(use_enable json)
- $(use_with ldap)
- $(use_with mdb mdb /usr)
- $(use_with mysql mysql /usr)
- $(use_with postgres postgres /usr)
- $(use_enable ssl crypto)"
-
- if use bindist; then
- # firebird license is not GPL compatible
- G2CONF="${G2CONF} --without-firebird"
- else
- G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
- fi
-
- use berkdb && append-cppflags "-I$(db_includedir)"
- use oci8 || G2CONF="${G2CONF} --without-oracle"
-
- # Not in portage
- G2CONF="${G2CONF}
- --disable-default-binary"
-}
-
-src_prepare() {
- gnome2_src_prepare
- java-pkg-opt-2_src_prepare
-}