diff options
author | 2012-09-10 03:42:02 +0200 | |
---|---|---|
committer | 2012-09-10 03:42:02 +0200 | |
commit | b270f956327044f56bec89a73ed1f77c52cb73a9 (patch) | |
tree | 99ca2d1afee3313fc97220ced4c0031e82f3c879 /gnome-extra/libgda/files | |
parent | .. (diff) | |
download | luman-b270f956327044f56bec89a73ed1f77c52cb73a9.tar.gz luman-b270f956327044f56bec89a73ed1f77c52cb73a9.tar.bz2 luman-b270f956327044f56bec89a73ed1f77c52cb73a9.zip |
clean up
Diffstat (limited to 'gnome-extra/libgda/files')
13 files changed, 0 insertions, 852 deletions
diff --git a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch deleted file mode 100644 index 4c1aca0..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f39858f84155d0346d31a2607997257a54e246ff Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 29 Sep 2010 23:45:46 +0200 -Subject: [PATCH] fix build order for xml_embedded.h - ---- - libgda/sqlite/Makefile.am | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am -index 1d2df2c..ecce04b 100644 ---- a/libgda/sqlite/Makefile.am -+++ b/libgda/sqlite/Makefile.am -@@ -58,9 +58,9 @@ sqlitesources = \ - gda-sqlite.h \ - keywords_hash.h \ - gda-symbols-util.h \ -- gda-symbols-util.c -- --$(libgda_sqlite_la_OBJECTS): xml_embedded.h keywords_hash.c -+ gda-symbols-util.c \ -+ xml_embedded.h \ -+ keywords_hash.c - - libgda_sqlite_la_SOURCES = $(sqlitesources) - libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\" -@@ -85,4 +85,5 @@ gdainclude_HEADERS=$(sqliteheaders) - - EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list - --CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) xml_embedded.h mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c -+CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES) -+BUILT_SOURCES = xml_embedded.h keywords_hash.c --- -1.7.3 - diff --git a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch deleted file mode 100644 index 5e7dd61..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 29 Sep 2010 23:53:54 +0200 -Subject: [PATCH] Fix missing include in keyword_hash generator - ---- - libgda/sqlite/mkkeywordhash.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c -index dc6ce89..28f4f83 100644 ---- a/libgda/sqlite/mkkeywordhash.c -+++ b/libgda/sqlite/mkkeywordhash.c -@@ -370,6 +370,10 @@ main (int argc, char **argv) - } - - /* Begin generating code */ -+ printf("#include <stdio.h>\n"); -+ printf("#include <string.h>\n"); -+ printf("#include <glib.h>\n"); -+ - printf("/* Hash score: %d */\n", bestCount); - printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : ""); - printf(" /* zText[] encodes %d bytes of keywords in %d bytes */\n", --- -1.7.3 - diff --git a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch deleted file mode 100644 index ac31089..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libgda/sqlite/Makefile.am.orig 2010-12-04 11:33:12.000000000 +0100 -+++ libgda/sqlite/Makefile.am 2010-12-04 11:34:50.000000000 +0100 -@@ -58,9 +58,9 @@ - gda-sqlite.h \ - keywords_hash.h \ - gda-symbols-util.h \ -- gda-symbols-util.c -- --BUILT_SOURCES = xml_embedded.h keywords_hash.c -+ gda-symbols-util.c \ -+ xml_embedded.h \ -+ keywords_hash.c - - libgda_sqlite_la_SOURCES = $(sqlitesources) - libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\" -@@ -86,3 +86,4 @@ - EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list - - CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES) -+BUILT_SOURCES = xml_embedded.h keywords_hash.c diff --git a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch b/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch deleted file mode 100644 index bea88cf..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 7ce16f8..3f5ae10 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5,6 +5,7 @@ m4_define([gda_stable], - m4_if(m4_eval(minor % 2), [0], [yes], [no])) - AC_CONFIG_MACRO_DIR([m4]) - m4_include(m4/introspection.m4) -+m4_include(m4/dk-warn.m4) - m4_include(m4/mdbtools.m4) - m4_include(m4/bdb.m4) - m4_include(m4/mysql.m4) diff --git a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch b/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch deleted file mode 100644 index b8f6d31..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f8042173c2139f65c69502a393fb44e00124ecc6 Mon Sep 17 00:00:00 2001 -From: Daniel Espinosa <esodan@gmail.com> -Date: Thu, 02 Jun 2011 15:51:52 +0000 -Subject: Added checks for LDAP on table-columns for GdaBrowser - ---- -diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c -index 80cdaee..26ad771 100644 ---- a/tools/browser/schema-browser/table-columns.c -+++ b/tools/browser/schema-browser/table-columns.c -@@ -117,12 +117,14 @@ table_columns_show_all (GtkWidget *widget) - { - TableColumns *tcolumns = (TableColumns *) widget; - GTK_WIDGET_CLASS (parent_class)->show_all (widget); -+#ifdef HAVE_LDAP - if (browser_connection_is_ldap (tcolumns->priv->bcnc)) { - if (! tcolumns->priv->ldap_props_shown) { - gtk_widget_hide (tcolumns->priv->ldap_header); - gtk_widget_hide (tcolumns->priv->ldap_text); - } - } -+#endif - } - - GType --- -cgit v0.9 diff --git a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch b/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch deleted file mode 100644 index 8d24430..0000000 --- a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9c1a1809650321c3d752a143f87089d325c49237 Mon Sep 17 00:00:00 2001 -From: Vivien Malerba <malerba@gnome-db.org> -Date: Mon, 06 Jun 2011 18:42:19 +0000 -Subject: Correction for bug #651922 - libgda-4.2.8 wants to write on /etc/libgda-4.0/config during compilation with --enable-gtk-doc - ---- -diff --git a/libgda/gda-config.c b/libgda/gda-config.c -index e1b65c0..e0a51c7 100644 ---- a/libgda/gda-config.c -+++ b/libgda/gda-config.c -@@ -20,6 +20,7 @@ - * Boston, MA 02111-1307, USA. - */ - -+#include <unistd.h> - #include <stdio.h> - #include <gmodule.h> - #include <libgda/gda-config.h> -@@ -630,12 +631,34 @@ gda_config_constructor (GType type, - LIBGDA_ABI_NAME, "config", NULL); - unique_instance->priv->system_config_allowed = FALSE; - if (unique_instance->priv->system_file) { -+#ifdef G_OS_WIN32 -+ - FILE *file; - file = fopen (unique_instance->priv->system_file, "a"); /* Flawfinder: ignore */ - if (file) { - unique_instance->priv->system_config_allowed = TRUE; - fclose (file); - } -+#else -+ struct stat stbuf; -+ if (stat (unique_instance->priv->system_file, &stbuf) == 0) { -+ /* use effective user and group IDs */ -+ uid_t euid; -+ gid_t egid; -+ euid = geteuid (); -+ egid = getegid (); -+ if (euid == stbuf.st_uid) { -+ if ((stbuf.st_mode & S_IWUSR) && (stbuf.st_mode & S_IRUSR)) -+ unique_instance->priv->system_config_allowed = TRUE; -+ } -+ else if (egid == stbuf.st_gid) { -+ if ((stbuf.st_mode & S_IWGRP) && (stbuf.st_mode & S_IRGRP)) -+ unique_instance->priv->system_config_allowed = TRUE; -+ } -+ else if ((stbuf.st_mode & S_IWOTH) && (stbuf.st_mode & S_IROTH)) -+ unique_instance->priv->system_config_allowed = TRUE; -+ } -+#endif - } - - /* Setup file monitoring */ --- -cgit v0.9 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 deleted file mode 100644 index 06166e6..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch +++ /dev/null @@ -1,85 +0,0 @@ -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(-) - rename control-center/data/{hicolor_apps_16x16_gda-control-center.png => hicolor_apps_16x16_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_22x22_gda-control-center.png => hicolor_apps_22x22_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_24x24_gda-control-center.png => hicolor_apps_24x24_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_256x256_gda-control-center.png => hicolor_apps_256x256_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_32x32_gda-control-center.png => hicolor_apps_32x32_gda-control-center-5.0.png} (100%) - rename control-center/data/{hicolor_apps_48x48_gda-control-center.png => hicolor_apps_48x48_gda-control-center-5.0.png} (100%) - -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/data/hicolor_apps_16x16_gda-control-center.png b/control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_16x16_gda-control-center.png -rename to control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_22x22_gda-control-center.png b/control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_22x22_gda-control-center.png -rename to control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_24x24_gda-control-center.png b/control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_24x24_gda-control-center.png -rename to control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_256x256_gda-control-center.png b/control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_256x256_gda-control-center.png -rename to control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_32x32_gda-control-center.png b/control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_32x32_gda-control-center.png -rename to control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png -diff --git a/control-center/data/hicolor_apps_48x48_gda-control-center.png b/control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png -similarity index 100% -rename from control-center/data/hicolor_apps_48x48_gda-control-center.png -rename to control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png -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 deleted file mode 100644 index 9616a42..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch +++ /dev/null @@ -1,43 +0,0 @@ -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(-) - rename tools/browser/doc/{gda-browser-docs.sgml => gda-browser-5.0-docs.sgml} (100%) - rename tools/browser/doc/{gda-browser-sections.txt => gda-browser-5.0-sections.txt} (100%) - rename tools/browser/doc/{gda-browser.types => gda-browser-5.0.types} (100%) - -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 -diff --git a/tools/browser/doc/gda-browser-docs.sgml b/tools/browser/doc/gda-browser-5.0-docs.sgml -similarity index 100% -rename from tools/browser/doc/gda-browser-docs.sgml -rename to tools/browser/doc/gda-browser-5.0-docs.sgml -diff --git a/tools/browser/doc/gda-browser-sections.txt b/tools/browser/doc/gda-browser-5.0-sections.txt -similarity index 100% -rename from tools/browser/doc/gda-browser-sections.txt -rename to tools/browser/doc/gda-browser-5.0-sections.txt -diff --git a/tools/browser/doc/gda-browser.types b/tools/browser/doc/gda-browser-5.0.types -similarity index 100% -rename from tools/browser/doc/gda-browser.types -rename to tools/browser/doc/gda-browser-5.0.types --- -1.7.5.3 - 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 46e7282..0000000 --- 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 1add00a..0000000 --- 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 07077e5..0000000 --- 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-9999-disable-broken-tests.patch b/gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch deleted file mode 100644 index 1add00a..0000000 --- a/gnome-extra/libgda/files/libgda-9999-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-9999-fix-build-order.patch b/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch deleted file mode 100644 index cd2fbb5..0000000 --- a/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am -index b3bf302..c7be5e1 100644 ---- a/libgda/sqlite/Makefile.am -+++ b/libgda/sqlite/Makefile.am -@@ -58,7 +58,8 @@ sqlitesources = \ - gda-sqlite.h \ - keywords_hash.h \ - gda-symbols-util.h \ -- gda-symbols-util.c -+ gda-symbols-util.c \ -+ $(BUILT_SOURCES) - - BUILT_SOURCES = xml_embedded.h keywords_hash.c - |