..

6 files changed, 134 insertions, 0 deletions

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 5b504fb..3b3f433 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,8 +1,13 @@
 AUX libgda-4.2.0-fix-build-order.patch 1260 RMD160 45d51d47cc3e7117e80d30f360d6bf5988330153 SHA1 15ebfd96457e72b9c04f4b94e615576eb7a590ff SHA256 e7cf87eece86ecdbb1ee8a877b757b5cff05a8efe309f7551b865a01a07b75ab
 AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f
+AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc706f4b6a077d SHA1 f72ecb1dd74a776decfb8fc6c7de1b0ceec90d43 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1
+AUX libgda-4.2.5-missing-m4.patch 359 RMD160 495d1eb184ffeb1d529a385291b61b41fccff445 SHA1 55c70bfdbaf9411a10ddf6f63b71f6e12b315703 SHA256 ed03d29bdb6454d6a54bd21cb1844ecd294e2d58593ec58496deb09953176b2f
+AUX libgda-4.2.8-ldap.patch 900 RMD160 aa2bb0c3972cbc06408b3905cea97ecde7b4d3c8 SHA1 c343c8f054706738691a3691b1db601b3d7df20a SHA256 fe2ca3407626b87b9daca3f20293ba91de7faeb099312ee0a1b627561f19f07f
+AUX libgda-4.2.8-sandbox-fix.patch 1884 RMD160 8f22b90ed93c634a01f9d2e3883ab346181c5131 SHA1 885cb7fc5d4cd899df1d9d28a9f70496f11b2120 SHA256 9eb945c021309a2ebd1d1f5f92c44a787b9e60519929f0c954e814a134e9ae0a
 AUX libgda-4.99.1-control-center-icon-collision.patch 4936 RMD160 09a5e9d06384f38512ec6efcdb030db4840657b7 SHA1 195bcd2a4c31517e0c12df8b144e7b79b19c59cc SHA256 d9d77e140b9c59f8e5e5afdb2103e1be18e1cc3e798824385bfc440a8b6a4c78
 AUX libgda-4.99.1-gda-browser-doc-collision.patch 1847 RMD160 b103d8a8eb0e44318afe78191f0a6041b7364aa0 SHA1 b38ae8cdda23c6abd16d3aa1017b0bccd0d689b5 SHA256 54afb7f259dad0d3fd7a4de057113f788e64c212c4c3c25b8987a9223540dea0
 AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 RMD160 e7675db0e35b98d4f94b22b204b806c9938051c1 SHA1 1ba6f0587f82a66f7062cc48fff05b024b8bdc4d SHA256 b9d20506fe89fd0219f3d737450bbba0a98e5b850cf152e570ca8a6a66740994
+AUX libgda-4.99.4-disable-broken-tests.patch 363 RMD160 3c2559b32d5a01b9377782f7130980b68ca85f8a SHA1 360074a84e6eadc7480a8e1adeceedce344af0d7 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c
 AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 RMD160 b8b5a084b9e548b913595ae94defa9320b17febe SHA1 e702517de6d0fb128f46513a7d9bd839d20930ba SHA256 81c6089b0899ef43428e5e6f182df153c85730e879f2ecefa7c769b0073c756d
 AUX libgda-9999-disable-broken-tests.patch 363 RMD160 3c2559b32d5a01b9377782f7130980b68ca85f8a SHA1 360074a84e6eadc7480a8e1adeceedce344af0d7 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c
 AUX libgda-9999-fix-build-order.patch 372 RMD160 31346346a53beed118f4131ec1eafd5cb3f3ee71 SHA1 ccdb903ba680c6acf614498c612b317be5a696d8 SHA256 3979cbcc1f0fd2943fd426bde591fdf12c614f72ac43582e4c25900e13154142
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
new file mode 100644
index 0000000..ac31089
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 0000000..bea88cf
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..b8f6d31
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000..8d24430
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch
@@ -0,0 +1,55 @@
+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.4-disable-broken-tests.patch b/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch
new file mode 100644
index 0000000..1add00a
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch
@@ -0,0 +1,15 @@
+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,