[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (aabbf5a2baa17fa54f469771568a7a8c47bba365)

Vlad Glagolev scm at sourcemage.org
Sun Oct 31 12:34:05 EDT 2010


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 gnome2-libs/libgda4/DEPENDS      |  116 +++++++++++++++++++++++++++++++--------
 gnome2-libs/libgda4/HISTORY      |    6 +-
 gnome2-libs/libgda4/PRE_BUILD    |    4 +
 gnome2-libs/libgda4/sqlite.patch |   35 +++++++++++
 4 files changed, 138 insertions(+), 23 deletions(-)

New commits:
commit aabbf5a2baa17fa54f469771568a7a8c47bba365
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libgda4: added dependency hell

diff --git a/gnome2-libs/libgda4/DEPENDS b/gnome2-libs/libgda4/DEPENDS
index 16ab5fa..d628934 100755
--- a/gnome2-libs/libgda4/DEPENDS
+++ b/gnome2-libs/libgda4/DEPENDS
@@ -1,23 +1,95 @@
-depends glib2             &&
-depends libxml2           &&
-depends libxslt           &&
-
-optional_depends gtk-doc  \
-"--enable-gtk-doc"        \
-"--disable-gtk-doc"       \
-"to build documentation"  &&
-
-optional_depends sqlite   \
-"--enable-system-sqlite"  \
-"--disable-system-sqlite" \
-"to use system sqlite"    &&
-
-optional_depends libsoup  \
-"--with-libsoup"          \
-"--without-libsoup"       \
-"to enable libsoup support" &&
-
-optional_depends gobject-introspection     \
-                 "--enable-introspection"  \
+depends glib2 &&
+depends libxml2 &&
+depends libxslt &&
+
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "for Native Language Support" &&
+
+optional_depends sqlite \
+                 "--enable-system-sqlite" \
+                 "--disable-system-sqlite" \
+                 "to use system SQLite" &&
+
+optional_depends db \
+                 "--with-bdb" \
+                 "--without-bdb" \
+                 "for Berkeley DB backend support" &&
+
+optional_depends ODBC-MGR \
+                 "--with-odbc" \
+                 "--without-odbc" \
+                 "for Unix ODBC backend support" &&
+
+optional_depends MYSQL \
+                 "--with-mysql" \
+                 "--without-mysql" \
+                 "for MySQL backend support" &&
+
+optional_depends postgresql \
+                 "--with-postgres" \
+                 "--without-postgres" \
+                 "for PostgreSQL backend support" &&
+
+optional_depends FIREBIRD \
+                 "--with-firebird" \
+                 "--without-firebird" \
+                 "for FireBird backend support" &&
+
+optional_depends openldap \
+                 "--with-ldap" \
+                 "--without-ldap" \
+                 "for LDAP backend support" &&
+
+optional_depends gnome-keyring \
+                 "--with-gnome-keyring" \
+                 "--without-gnome-keyring" \
+                 "for gnome-keyring support" &&
+
+optional_depends gtk+2 \
+                 "--with-ui" \
+                 "--without-ui" \
+                 "for GTK+ extension and tools" &&
+
+optional_depends gtksourceview \
+                 "--with-gtksourceview" \
+                 "--without-gtksourceview" \
+                 "for using GtkSourceView" &&
+
+optional_depends goocanvas \
+                 "--with-goocanvas" \
+                 "--without-goocanvas" \
+                 "for using GooCanvas" &&
+
+optional_depends graphviz \
+                 "--with-graphviz" \
+                 "--without-graphviz" \
+                 "for using Graphviz" &&
+
+optional_depends unique \
+                 "--with-unique" \
+                 "--without-unique" \
+                 "to use LibUnique to have only one control center" &&
+
+optional_depends libsoup \
+                 "--with-libsoup" \
+                 "--without-libsoup" \
+                 "to enable libsoup support" &&
+
+optional_depends gobject-introspection \
+                 "--enable-introspection" \
                  "--disable-introspection" \
-                 "to enable introspection for this build"
+                 "to enable introspection for this build" &&
+
+optional_depends rarian \
+                 "--enable-scrollkeeper" \
+                 "--disable-scrollkeeper" \
+                 "to make updates to the scrollkeeper database" &&
+
+optional_depends gtk-doc \
+                 "--enable-gtk-doc" \
+                 "--disable-gtk-doc" \
+                 "to build documentation" &&
+
+optional_depends libgcrypt "" "" "for password entry plugin"
diff --git a/gnome2-libs/libgda4/HISTORY b/gnome2-libs/libgda4/HISTORY
index bc8f3bb..018629c 100644
--- a/gnome2-libs/libgda4/HISTORY
+++ b/gnome2-libs/libgda4/HISTORY
@@ -1,3 +1,8 @@
+2010-10-31 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: rewritten, to add a lot of dependencies
+	* PRE_BUILD: added, to apply the patch
+	* sqlite.patch: added, to fix compilation with system sqlite
+
 2010-10-23 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: added optional_depends gobject-introspection
 
@@ -18,4 +23,3 @@
 
 2009-12-30 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DEPENDS, DETAILS: spell created
-
diff --git a/gnome2-libs/libgda4/PRE_BUILD b/gnome2-libs/libgda4/PRE_BUILD
new file mode 100755
index 0000000..ca11b68
--- /dev/null
+++ b/gnome2-libs/libgda4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/sqlite.patch"
diff --git a/gnome2-libs/libgda4/sqlite.patch b/gnome2-libs/libgda4/sqlite.patch
new file mode 100644
index 0000000..8c1e043
--- /dev/null
+++ b/gnome2-libs/libgda4/sqlite.patch
@@ -0,0 +1,35 @@
+--- libgda/sqlite/mkkeywordhash.c.orig
++++ 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",
+--- libgda/sqlite/Makefile.am.orig
++++ 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



More information about the SM-Commit mailing list