* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/, gnome-extra/libgda/files/
@ 2011-06-14 6:45 Nirbheek Chauhan
0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-06-14 6:45 UTC (permalink / raw
To: gentoo-commits
commit: 51a98a5f759de0d607a0231bad0d5ce018022677
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jun 4 07:41:18 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 06:44:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=51a98a5f
gnome-extra/libgda:4.99.0 → 4.99.1 and 9999 updates
Version bump with numerous bug fixes and improvements. Ebuild changes:
* Enable mdb support, it works perfectly well with mdbtools-0.6_pre2-r2
(tested with sample mdb files).
* Patch to put conversion script subdirectories in /usr/share, not /usr/bin;
this prevents file collisions with libgda:4 (upstream bug 594115).
* Those conversion scripts are written in python2, so we should
python_convert_shebangs and python_mod_optimize them.
* Patch to rename gda-browser-5.0's gnome help directory to avoid file
collisions with libgda:4.
* Patch and mv to rename gda-browser-5.0's gtk-doc directory to avoid
file collisions with libgda:4. Also, modify the pre-generated gtk-doc
files (for those who USE=-doc) so that devhelp picks them up correctly
after the rename.
* Patch and mv gda-control-center-5.0's icons to avoid collisions with
libgda:4.
* Fix compilation without LDAP (bug #370233) and add missing ldap USE flag.
* Fix sandbox violations with USE doc, bug #370013, upstream #651922.
* Get rid of obsolete gtk3 EGIT_BRANCH, development now happens in master.
* Update -9999 ebuild with all relevant changes from -4.99.1, verify
that it builds and installs correctly.
Note: for me, FEATURES=test fails tests/data-models/check_vcnc in
libga-4.99.1 as well as 4.99.0. However, when building by hand in my
home directory, all tests run successfully. Not sure what's going on.
Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>
---
.../files/libgda-4.1.1-no-subdir-in-bindir.patch | 52 ++++++++++++
| 27 ++++++
.../libgda/files/libgda-4.2.8-sandbox-fix.patch | 55 +++++++++++++
...bgda-4.99.1-control-center-icon-collision.patch | 85 ++++++++++++++++++++
.../libgda-4.99.1-gda-browser-doc-collision.patch | 43 ++++++++++
.../libgda-4.99.1-gda-browser-help-collision.patch | 38 +++++++++
.../{libgda-4.99.0.ebuild => libgda-4.99.1.ebuild} | 70 +++++++++++++---
| 61 +++++++++++---
8 files changed, 407 insertions(+), 24 deletions(-)
diff --git a/gnome-extra/libgda/files/libgda-4.1.1-no-subdir-in-bindir.patch b/gnome-extra/libgda/files/libgda-4.1.1-no-subdir-in-bindir.patch
new file mode 100644
index 0000000..517b457
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.1.1-no-subdir-in-bindir.patch
@@ -0,0 +1,52 @@
+Index: libgda-4.1.1/libgda-report/RML/gda-report-rml-document.c
+===================================================================
+--- libgda-4.1.1.orig/libgda-report/RML/gda-report-rml-document.c
++++ libgda-4.1.1/libgda-report/RML/gda-report-rml-document.c
+@@ -198,7 +198,7 @@ gda_report_rml_document_run_as_html (Gda
+ if (!converter) {
+ converter = g_find_program_in_path ("trml2html.py");
+ if (!converter) {
+- converter = gda_gbr_get_file_path (GDA_BIN_DIR, "gda_trml2html", "trml2html.py", NULL);
++ converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2html", "trml2html.py", NULL);
+ if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
+ g_free (converter);
+ converter = NULL;
+@@ -229,7 +229,7 @@ gda_report_rml_document_run_as_pdf (GdaR
+ if (!converter) {
+ converter = g_find_program_in_path ("trml2pdf.py");
+ if (!converter) {
+- converter = gda_gbr_get_file_path (GDA_BIN_DIR, "gda_trml2pdf", "trml2pdf.py", NULL);
++ converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2pdf", "trml2pdf.py", NULL);
+ if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
+ g_free (converter);
+ converter = NULL;
+Index: libgda-4.1.1/libgda-report/RML/trml2html/Makefile.am
+===================================================================
+--- libgda-4.1.1.orig/libgda-report/RML/trml2html/Makefile.am
++++ libgda-4.1.1/libgda-report/RML/trml2html/Makefile.am
+@@ -1,7 +1,7 @@
+ trml2html_SCRIPTS = trml2html.py
+ trml2html_DATA = __init__.py utils.py
+-trml2htmldir = $(bindir)/gda_trml2html
++trml2htmldir = $(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/gda_trml2html
+
+ EXTRA_DIST = \
+ $(trml2html_SCRIPTS) \
+- $(trml2html_DATA)
+\ No newline at end of file
++ $(trml2html_DATA)
+Index: libgda-4.1.1/libgda-report/RML/trml2pdf/Makefile.am
+===================================================================
+--- libgda-4.1.1.orig/libgda-report/RML/trml2pdf/Makefile.am
++++ libgda-4.1.1/libgda-report/RML/trml2pdf/Makefile.am
+@@ -1,7 +1,7 @@
+ trml2pdf_SCRIPTS = trml2pdf.py
+ trml2pdf_DATA = __init__.py color.py utils.py
+-trml2pdfdir = $(bindir)/gda_trml2pdf
++trml2pdfdir = $(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/gda_trml2pdf
+
+ EXTRA_DIST = \
+ $(trml2pdf_SCRIPTS) \
+- $(trml2pdf_DATA)
+\ No newline at end of file
++ $(trml2pdf_DATA)
--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.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..06166e6
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
@@ -0,0 +1,85 @@
+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
new file mode 100644
index 0000000..9616a42
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 0000000..46e7282
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch
@@ -0,0 +1,38 @@
+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/libgda-4.99.0.ebuild b/gnome-extra/libgda/libgda-4.99.1.ebuild
similarity index 60%
rename from gnome-extra/libgda/libgda-4.99.0.ebuild
rename to gnome-extra/libgda/libgda-4.99.1.ebuild
index 7460f94..56f2650 100644
--- a/gnome-extra/libgda/libgda-4.99.0.ebuild
+++ b/gnome-extra/libgda/libgda-4.99.1.ebuild
@@ -5,8 +5,9 @@
EAPI="3"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
+PYTHON_DEPEND="2"
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,11 +16,9 @@ DESCRIPTION="Gnome Database Access Library"
HOMEPAGE="http://www.gnome-db.org/"
LICENSE="GPL-2 LGPL-2"
-# MDB support currently works with CVS only, so disable it in the meantime
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
SLOT="5"
if [[ ${PV} = 9999 ]]; then
- EGIT_BRANCH="gtk3"
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -47,11 +46,12 @@ RDEPEND="
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? ( dev-db/postgresql-base )
ssl? ( dev-libs/openssl )
>=dev-db/sqlite-3.6.22:3"
-# mdb? ( >app-office/mdbtools-0.5 )
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.18
@@ -87,11 +87,11 @@ pkg_setup() {
$(use_enable introspection)
$(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)
- --without-mdb"
-# $(use_with mdb mdb /usr)
+ $(use_enable ssl crypto)"
if use bindist; then
# firebird license is not GPL compatible
@@ -115,9 +115,46 @@ src_prepare() {
# Fix compilation failure of keyword_hash.c, upstream #630959
#epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
+ # Fix compilation without ldap, bug #370233, upstream #651713
+ # XXX: remove patch on 4.99.2 bump
+ epatch "${FILESDIR}/${PN}-4.2.8-ldap.patch"
+
+ # Fix sandbox violations with USE doc, bug #370013, upstream #651922
+ # XXX: remove patch on 4.99.2 bump
+ epatch "${FILESDIR}/${PN}-4.2.8-sandbox-fix.patch"
+
# Disable broken tests so we can check the others
epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
+ # Put subdirectories for conversion scripts in /usr/share, not /usr/bin
+ # https://bugzilla.gnome.org/show_bug.cgi?id=594115 comment 2
+ epatch "${FILESDIR}/${PN}-4.1.1-no-subdir-in-bindir.patch"
+
+ # Prevent file collisions with libgda:4
+ epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
+ epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+ epatch "${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
+ if [[ ${PV} != 9999 ]] ; then
+ 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
+ fi
+ 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
+
+ python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
+
+ eautoreconf
gnome2_src_prepare
}
@@ -125,9 +162,18 @@ src_test() {
emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
}
-src_install() {
- gnome2_src_install
+pkg_postinst() {
+ gnome2_pkg_postinst
+ local d
+ for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+ python_mod_optimize ${d}
+ done
+}
- # File-collisions. How do we handle this?
- rm -rf "${ED}"/usr/bin/gda_trml2* || die
+pkg_postrm() {
+ gnome2_pkg_postrm
+ local d
+ for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+ python_mod_cleanup ${d}
+ done
}
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index 7460f94..ca4fd16 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -5,8 +5,9 @@
EAPI="3"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
+PYTHON_DEPEND="2"
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
+inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,11 +16,9 @@ DESCRIPTION="Gnome Database Access Library"
HOMEPAGE="http://www.gnome-db.org/"
LICENSE="GPL-2 LGPL-2"
-# MDB support currently works with CVS only, so disable it in the meantime
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
SLOT="5"
if [[ ${PV} = 9999 ]]; then
- EGIT_BRANCH="gtk3"
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -47,11 +46,12 @@ RDEPEND="
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? ( dev-db/postgresql-base )
ssl? ( dev-libs/openssl )
>=dev-db/sqlite-3.6.22:3"
-# mdb? ( >app-office/mdbtools-0.5 )
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.18
@@ -87,11 +87,11 @@ pkg_setup() {
$(use_enable introspection)
$(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)
- --without-mdb"
-# $(use_with mdb mdb /usr)
+ $(use_enable ssl crypto)"
if use bindist; then
# firebird license is not GPL compatible
@@ -118,6 +118,34 @@ src_prepare() {
# Disable broken tests so we can check the others
epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
+ # Put subdirectories for conversion scripts in /usr/share, not /usr/bin
+ # https://bugzilla.gnome.org/show_bug.cgi?id=594115 comment 2
+ epatch "${FILESDIR}/${PN}-4.1.1-no-subdir-in-bindir.patch"
+
+ # Prevent file collisions with libgda:4
+ epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
+ epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+ epatch "${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
+ if [[ ${PV} != 9999 ]] ; then
+ 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
+ fi
+ 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
+
+ python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
+
gnome2_src_prepare
}
@@ -125,9 +153,18 @@ src_test() {
emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
}
-src_install() {
- gnome2_src_install
+pkg_postinst() {
+ gnome2_pkg_postinst
+ local d
+ for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+ python_mod_optimize ${d}
+ done
+}
- # File-collisions. How do we handle this?
- rm -rf "${ED}"/usr/bin/gda_trml2* || die
+pkg_postrm() {
+ gnome2_pkg_postrm
+ local d
+ for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+ python_mod_cleanup ${d}
+ done
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/, gnome-extra/libgda/files/
@ 2011-06-24 17:35 Alexandre Restovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-06-24 17:35 UTC (permalink / raw
To: gentoo-commits
commit: d3c229c5836156775a060afdd22a90c0daf2052d
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jun 23 04:58:57 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jun 24 17:15:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d3c229c5
gnome-extra/libgda: 4.99.1 → 4.99.2
Version bump with lots of bugfixes. The sandbox, ldap, and bindir
subdir patches have been applied upstream. Use the xz tarball (manually,
since python eclass does not support EAPI 4), saves 2 MB.
Tests still fail.
---
.../files/libgda-4.1.1-no-subdir-in-bindir.patch | 52 ------------------
| 27 ----------
.../libgda/files/libgda-4.2.8-sandbox-fix.patch | 55 --------------------
.../{libgda-4.99.1.ebuild => libgda-4.99.2.ebuild} | 13 +----
| 5 +--
5 files changed, 2 insertions(+), 150 deletions(-)
diff --git a/gnome-extra/libgda/files/libgda-4.1.1-no-subdir-in-bindir.patch b/gnome-extra/libgda/files/libgda-4.1.1-no-subdir-in-bindir.patch
deleted file mode 100644
index 517b457..0000000
--- a/gnome-extra/libgda/files/libgda-4.1.1-no-subdir-in-bindir.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: libgda-4.1.1/libgda-report/RML/gda-report-rml-document.c
-===================================================================
---- libgda-4.1.1.orig/libgda-report/RML/gda-report-rml-document.c
-+++ libgda-4.1.1/libgda-report/RML/gda-report-rml-document.c
-@@ -198,7 +198,7 @@ gda_report_rml_document_run_as_html (Gda
- if (!converter) {
- converter = g_find_program_in_path ("trml2html.py");
- if (!converter) {
-- converter = gda_gbr_get_file_path (GDA_BIN_DIR, "gda_trml2html", "trml2html.py", NULL);
-+ converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2html", "trml2html.py", NULL);
- if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
- g_free (converter);
- converter = NULL;
-@@ -229,7 +229,7 @@ gda_report_rml_document_run_as_pdf (GdaR
- if (!converter) {
- converter = g_find_program_in_path ("trml2pdf.py");
- if (!converter) {
-- converter = gda_gbr_get_file_path (GDA_BIN_DIR, "gda_trml2pdf", "trml2pdf.py", NULL);
-+ converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2pdf", "trml2pdf.py", NULL);
- if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
- g_free (converter);
- converter = NULL;
-Index: libgda-4.1.1/libgda-report/RML/trml2html/Makefile.am
-===================================================================
---- libgda-4.1.1.orig/libgda-report/RML/trml2html/Makefile.am
-+++ libgda-4.1.1/libgda-report/RML/trml2html/Makefile.am
-@@ -1,7 +1,7 @@
- trml2html_SCRIPTS = trml2html.py
- trml2html_DATA = __init__.py utils.py
--trml2htmldir = $(bindir)/gda_trml2html
-+trml2htmldir = $(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/gda_trml2html
-
- EXTRA_DIST = \
- $(trml2html_SCRIPTS) \
-- $(trml2html_DATA)
-\ No newline at end of file
-+ $(trml2html_DATA)
-Index: libgda-4.1.1/libgda-report/RML/trml2pdf/Makefile.am
-===================================================================
---- libgda-4.1.1.orig/libgda-report/RML/trml2pdf/Makefile.am
-+++ libgda-4.1.1/libgda-report/RML/trml2pdf/Makefile.am
-@@ -1,7 +1,7 @@
- trml2pdf_SCRIPTS = trml2pdf.py
- trml2pdf_DATA = __init__.py color.py utils.py
--trml2pdfdir = $(bindir)/gda_trml2pdf
-+trml2pdfdir = $(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/gda_trml2pdf
-
- EXTRA_DIST = \
- $(trml2pdf_SCRIPTS) \
-- $(trml2pdf_DATA)
-\ No newline at end of file
-+ $(trml2pdf_DATA)
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/libgda-4.99.1.ebuild b/gnome-extra/libgda/libgda-4.99.2.ebuild
similarity index 90%
rename from gnome-extra/libgda/libgda-4.99.1.ebuild
rename to gnome-extra/libgda/libgda-4.99.2.ebuild
index 56f2650..c640ae9 100644
--- a/gnome-extra/libgda/libgda-4.99.1.ebuild
+++ b/gnome-extra/libgda/libgda-4.99.2.ebuild
@@ -5,6 +5,7 @@
EAPI="3"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="xz" # remove when python eclass supports EAPI 4
PYTHON_DEPEND="2"
inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
@@ -115,21 +116,9 @@ src_prepare() {
# Fix compilation failure of keyword_hash.c, upstream #630959
#epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
- # Fix compilation without ldap, bug #370233, upstream #651713
- # XXX: remove patch on 4.99.2 bump
- epatch "${FILESDIR}/${PN}-4.2.8-ldap.patch"
-
- # Fix sandbox violations with USE doc, bug #370013, upstream #651922
- # XXX: remove patch on 4.99.2 bump
- epatch "${FILESDIR}/${PN}-4.2.8-sandbox-fix.patch"
-
# Disable broken tests so we can check the others
epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
- # Put subdirectories for conversion scripts in /usr/share, not /usr/bin
- # https://bugzilla.gnome.org/show_bug.cgi?id=594115 comment 2
- epatch "${FILESDIR}/${PN}-4.1.1-no-subdir-in-bindir.patch"
-
# Prevent file collisions with libgda:4
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index ca4fd16..ce19c99 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -5,6 +5,7 @@
EAPI="3"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="xz" # remove when python eclass supports EAPI 4
PYTHON_DEPEND="2"
inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
@@ -118,10 +119,6 @@ src_prepare() {
# Disable broken tests so we can check the others
epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
- # Put subdirectories for conversion scripts in /usr/share, not /usr/bin
- # https://bugzilla.gnome.org/show_bug.cgi?id=594115 comment 2
- epatch "${FILESDIR}/${PN}-4.1.1-no-subdir-in-bindir.patch"
-
# Prevent file collisions with libgda:4
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/, gnome-extra/libgda/files/
@ 2011-09-19 8:44 Alexandre Restovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-09-19 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 49f18df8d7209c224ce17aefd27b5ae2132c1cc3
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 08:22:27 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 19 08:44:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=49f18df8
gnome-extra/libgda: 4.99.3 → 4.99.4
Version bump with numerous bugfixes. Restrict tests for now until it
becomes clear why they are failing.
---
.../libgda-4.99.4-statement-rewriting-fix.patch | 465 ++++++++++++++++++++
.../{libgda-4.99.3.ebuild => libgda-4.99.4.ebuild} | 6 +
| 3 +
3 files changed, 474 insertions(+), 0 deletions(-)
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
new file mode 100644
index 0000000..07077e5
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch
@@ -0,0 +1,465 @@
+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/libgda-4.99.3.ebuild b/gnome-extra/libgda/libgda-4.99.4.ebuild
similarity index 95%
rename from gnome-extra/libgda/libgda-4.99.3.ebuild
rename to gnome-extra/libgda/libgda-4.99.4.ebuild
index c640ae9..7a4d659 100644
--- a/gnome-extra/libgda/libgda-4.99.3.ebuild
+++ b/gnome-extra/libgda/libgda-4.99.4.ebuild
@@ -60,6 +60,9 @@ DEPEND="${RDEPEND}
>=app-text/gnome-doc-utils-0.9
doc? ( >=dev-util/gtk-doc-1 )"
+# XXX: some tests fail when run from portage (but pass when building by hand)
+RESTRICT="test"
+
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
@@ -116,6 +119,9 @@ src_prepare() {
# Fix compilation failure of keyword_hash.c, upstream #630959
#epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
+ # Upstream patch to fix a serious statement rewriting bug, in next release
+ epatch "${FILESDIR}/${P}-statement-rewriting-fix.patch"
+
# Disable broken tests so we can check the others
epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index ce19c99..f838a18 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -60,6 +60,9 @@ DEPEND="${RDEPEND}
>=app-text/gnome-doc-utils-0.9
doc? ( >=dev-util/gtk-doc-1 )"
+# XXX: some tests fail when run from portage (but pass when building by hand)
+RESTRICT="test"
+
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/, gnome-extra/libgda/files/
@ 2012-11-05 8:26 Alexandre Rostovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Rostovtsev @ 2012-11-05 8:26 UTC (permalink / raw
To: gentoo-commits
commit: d44440a08686bed5c495ad1e8c9743c5f4fc60c6
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 5 08:21:31 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Nov 5 08:25:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d44440a0
gnome-extra/libgda: add 5.1.1, update for modern style
Needed because introspection bindings in <5.1.0 fail to build with
gobject-introspection-1.34 due to numerous gtk-doc syntax issues.
Vala bindings still fail to build in 5.1.1, but 5.1.2 should be better
in that regard.
---
.../files/libgda-4.2.0-fix-build-order.patch | 36 ----------
...missing-include-in-keyword_hash-generator.patch | 27 -------
...bgda-4.99.1-control-center-icon-collision.patch | 30 --------
.../libgda-4.99.1-gda-browser-doc-collision.patch | 15 ----
.../files/libgda-9999-disable-broken-tests.patch | 15 ----
.../{libgda-9999.ebuild => libgda-5.1.1.ebuild} | 73 +++++++++----------
| 71 +++++++++-----------
7 files changed, 67 insertions(+), 200 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.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
index 06166e6..fe814a7 100644
--- 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
@@ -13,12 +13,6 @@ Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons
... 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
@@ -43,30 +37,6 @@ index 03fa362..862ec88 100644
$(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
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
index 9616a42..2fd31ab 100644
--- 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
@@ -9,9 +9,6 @@ Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files
...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
@@ -26,18 +23,6 @@ index 971fa79..cf6637a 100644
# 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-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/libgda-9999.ebuild b/gnome-extra/libgda/libgda-5.1.1.ebuild
similarity index 73%
copy from gnome-extra/libgda/libgda-9999.ebuild
copy to gnome-extra/libgda/libgda-5.1.1.ebuild
index 589b166..2d07ee5 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-5.1.1.ebuild
@@ -1,37 +1,38 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
+# $Header: $
EAPI="4"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
PYTHON_DEPEND="2"
+#VALA_MIN_API_VERSION="0.16"
+#VALA_MAX_API_VERSION="0.16" # configure explicitly checks for 0.16
+#VALA_USE_DEPEND="vapigen"
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python # vala
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="Gnome Database Access Library"
HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
+IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala
SLOT="5"
if [[ ${PV} = 9999 ]]; then
+ IUSE="${IUSE} doc"
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
RDEPEND="
app-text/iso-codes
- >=dev-libs/glib-2.16:2
+ >=dev-libs/glib-2.32:2
>=dev-libs/libxml2-2
dev-libs/libxslt
- dev-libs/libunique:3
sys-libs/readline
sys-libs/ncurses
berkdb? ( sys-libs/db )
@@ -42,9 +43,9 @@ RDEPEND="
sourceview? ( x11-libs/gtksourceview:3.0 )
graphviz? ( media-gfx/graphviz )
)
- gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
+ gnome-keyring? ( app-crypt/libsecret )
http? ( >=net-libs/libsoup-2.24:2.4 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
json? ( dev-libs/json-glib )
ldap? ( net-nds/openldap )
mdb? ( >app-office/mdbtools-0.5 )
@@ -54,15 +55,27 @@ RDEPEND="
>=dev-db/sqlite-3.6.22:3"
DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35.5
- virtual/pkgconfig
>=app-text/gnome-doc-utils-0.9
- doc? ( >=dev-util/gtk-doc-1 )"
-
-# XXX: some tests fail when run from portage (but pass when building by hand)
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ java? ( virtual/jdk:1.6 )"
+# vala? ( $(vala_depend) )
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+ doc? (
+ >=dev-util/gtk-doc-1.14
+ vala? ( app-text/yelp-tools ) )"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
RESTRICT="test"
pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README"
if use canvas || use graphviz || use sourceview; then
@@ -79,7 +92,6 @@ pkg_setup() {
fi
G2CONF="${G2CONF}
- --with-unique
--disable-scrollkeeper
--disable-static
--enable-system-sqlite
@@ -94,7 +106,9 @@ pkg_setup() {
$(use_with mdb mdb /usr)
$(use_with mysql mysql /usr)
$(use_with postgres postgres /usr)
- $(use_enable ssl crypto)"
+ $(use_enable ssl crypto)
+ --disable-vala"
+ # vala bindings fail to build
if use bindist; then
# firebird license is not GPL compatible
@@ -110,22 +124,6 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-default-binary"
- export XDG_DATA_HOME="${T}/.local"
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix build order for generated content, upstream #630958
- #epatch "${FILESDIR}/${PN}-9999-fix-build-order.patch"
-
- # Fix compilation failure of keyword_hash.c, upstream #630959
- #epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
- # Disable broken tests so we can check the others
- epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
-
# Prevent file collisions with libgda:4
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
@@ -150,11 +148,10 @@ src_prepare() {
python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
+ [[ ${PV} = 9999 ]] || eautoreconf
gnome2_src_prepare
-}
-
-src_test() {
- emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
+ java-pkg-opt-2_src_prepare
+ use vala && vala_src_prepare
}
pkg_postinst() {
--git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index 589b166..5362369 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -1,37 +1,38 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
+# $Header: $
EAPI="4"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="yes"
PYTHON_DEPEND="2"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python vala
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="Gnome Database Access Library"
HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
+IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
+REQUIRED_USE="vala? ( introspection )"
SLOT="5"
if [[ ${PV} = 9999 ]]; then
+ IUSE="${IUSE} doc"
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
RDEPEND="
app-text/iso-codes
- >=dev-libs/glib-2.16:2
+ >=dev-libs/glib-2.32:2
>=dev-libs/libxml2-2
dev-libs/libxslt
- dev-libs/libunique:3
sys-libs/readline
sys-libs/ncurses
berkdb? ( sys-libs/db )
@@ -42,9 +43,9 @@ RDEPEND="
sourceview? ( x11-libs/gtksourceview:3.0 )
graphviz? ( media-gfx/graphviz )
)
- gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
+ gnome-keyring? ( app-crypt/libsecret )
http? ( >=net-libs/libsoup-2.24:2.4 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
json? ( dev-libs/json-glib )
ldap? ( net-nds/openldap )
mdb? ( >app-office/mdbtools-0.5 )
@@ -54,15 +55,24 @@ RDEPEND="
>=dev-db/sqlite-3.6.22:3"
DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35.5
- virtual/pkgconfig
>=app-text/gnome-doc-utils-0.9
- doc? ( >=dev-util/gtk-doc-1 )"
-
-# XXX: some tests fail when run from portage (but pass when building by hand)
-RESTRICT="test"
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ java? ( virtual/jdk:1.6 )
+ vala? ( $(vala_depend) )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+ doc? (
+ >=dev-util/gtk-doc-1.14
+ vala? ( app-text/yelp-tools ) )"
pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README"
if use canvas || use graphviz || use sourceview; then
@@ -79,7 +89,6 @@ pkg_setup() {
fi
G2CONF="${G2CONF}
- --with-unique
--disable-scrollkeeper
--disable-static
--enable-system-sqlite
@@ -94,7 +103,8 @@ pkg_setup() {
$(use_with mdb mdb /usr)
$(use_with mysql mysql /usr)
$(use_with postgres postgres /usr)
- $(use_enable ssl crypto)"
+ $(use_enable ssl crypto)
+ $(use_enable vala)"
if use bindist; then
# firebird license is not GPL compatible
@@ -110,22 +120,6 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-default-binary"
- export XDG_DATA_HOME="${T}/.local"
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix build order for generated content, upstream #630958
- #epatch "${FILESDIR}/${PN}-9999-fix-build-order.patch"
-
- # Fix compilation failure of keyword_hash.c, upstream #630959
- #epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
- # Disable broken tests so we can check the others
- epatch "${FILESDIR}/${PN}-9999-disable-broken-tests.patch"
-
# Prevent file collisions with libgda:4
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
@@ -150,11 +144,10 @@ src_prepare() {
python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
+ [[ ${PV} = 9999 ]] || eautoreconf
gnome2_src_prepare
-}
-
-src_test() {
- emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
+ java-pkg-opt-2_src_prepare
+ use vala && vala_src_prepare
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-05 8:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-19 8:44 [gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/, gnome-extra/libgda/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2012-11-05 8:26 Alexandre Rostovtsev
2011-06-24 17:35 Alexandre Restovtsev
2011-06-14 6:45 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox