[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (c0bf51c5284e2de3d04ba3c910e68289ede0181f)

Ladislav Hagara scm at sourcemage.org
Mon Nov 15 07:43:38 EST 2010


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 dev/null                                     |binary
 gnome2-libs/libgda4/DETAILS                  |    2 -
 gnome2-libs/libgda4/HISTORY                  |    4 +++
 gnome2-libs/libgda4/PRE_BUILD                |    4 ---
 gnome2-libs/libgda4/libgda-4.2.0.tar.bz2.sig |    0 
 gnome2-libs/libgda4/libgda-4.2.1.tar.bz2.sig |binary
 gnome2-libs/libgda4/sqlite.patch             |   35 ---------------------------
 7 files changed, 5 insertions(+), 40 deletions(-)

New commits:
commit c0bf51c5284e2de3d04ba3c910e68289ede0181f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libgda4 4.2.1

diff --git a/gnome2-libs/libgda4/DETAILS b/gnome2-libs/libgda4/DETAILS
index 77bacb8..54152c3 100755
--- a/gnome2-libs/libgda4/DETAILS
+++ b/gnome2-libs/libgda4/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgda4
-         VERSION=4.2.0
+         VERSION=4.2.1
           BRANCH=$(echo $VERSION|cut -d . -f 1,2)
           SOURCE="libgda-${VERSION}.tar.bz2"
    SOURCE_URL[0]=$GNOME_URL/sources/libgda/$BRANCH/$SOURCE
diff --git a/gnome2-libs/libgda4/HISTORY b/gnome2-libs/libgda4/HISTORY
index 018629c..c236b17 100644
--- a/gnome2-libs/libgda4/HISTORY
+++ b/gnome2-libs/libgda4/HISTORY
@@ -1,3 +1,7 @@
+2010-11-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.2.1
+	* PRE_BUILD, sqlite.patch: removed
+
 2010-10-31 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: rewritten, to add a lot of dependencies
 	* PRE_BUILD: added, to apply the patch
diff --git a/gnome2-libs/libgda4/PRE_BUILD b/gnome2-libs/libgda4/PRE_BUILD
deleted file mode 100755
index ca11b68..0000000
--- a/gnome2-libs/libgda4/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/sqlite.patch"
diff --git a/gnome2-libs/libgda4/libgda-4.2.0.tar.bz2.sig b/gnome2-libs/libgda4/libgda-4.2.0.tar.bz2.sig
deleted file mode 100644
index edfe975..0000000
Binary files a/gnome2-libs/libgda4/libgda-4.2.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libgda4/libgda-4.2.1.tar.bz2.sig b/gnome2-libs/libgda4/libgda-4.2.1.tar.bz2.sig
new file mode 100644
index 0000000..c6de92e
Binary files /dev/null and b/gnome2-libs/libgda4/libgda-4.2.1.tar.bz2.sig differ
diff --git a/gnome2-libs/libgda4/sqlite.patch b/gnome2-libs/libgda4/sqlite.patch
deleted file mode 100644
index 8c1e043..0000000
--- a/gnome2-libs/libgda4/sqlite.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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