garnome r6504 - in branches/gnome-2-22: . office/abiword office/abiword/files office/enchant office/libgda office/wv

[kbrae svn gnome org]

Author: kbrae
Date: Tue May  6 17:00:15 2008
New Revision: 6504
URL: http://svn.gnome.org/viewvc/garnome?rev=6504&view=rev

Log:
	* office/enchant: bump version to 1.4.2
	* office/wv: bump version to 1.2.5, adjust MASTER_SITES

	* office/libgda: revert to version 3.1.4, latest unstable branch
	using the 3.0 API as needed by libgnomedb

	* office/abiword: bump version to 2.6.3, add upstream patch to fix
	build issues without libxml legacy code



Added:
   branches/gnome-2-22/office/abiword/files/
   branches/gnome-2-22/office/abiword/files/abiword-11483-without-legacy.diff
Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/office/abiword/Makefile
   branches/gnome-2-22/office/abiword/checksums
   branches/gnome-2-22/office/enchant/Makefile
   branches/gnome-2-22/office/enchant/checksums
   branches/gnome-2-22/office/libgda/Makefile
   branches/gnome-2-22/office/libgda/checksums
   branches/gnome-2-22/office/wv/Makefile
   branches/gnome-2-22/office/wv/checksums

Modified: branches/gnome-2-22/office/abiword/Makefile
==============================================================================
--- branches/gnome-2-22/office/abiword/Makefile	(original)
+++ branches/gnome-2-22/office/abiword/Makefile	Tue May  6 17:00:15 2008
@@ -1,7 +1,8 @@
 GARNAME = abiword
-GARVERSION = 2.5.2
+GARVERSION = 2.6.3
 CATEGORIES = office
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = abiword-11483-without-legacy.diff
 
 MASTER_SITES = http://www.abisource.com/downloads/abiword/$(GARVERSION)/source/
 

Modified: branches/gnome-2-22/office/abiword/checksums
==============================================================================
--- branches/gnome-2-22/office/abiword/checksums	(original)
+++ branches/gnome-2-22/office/abiword/checksums	Tue May  6 17:00:15 2008
@@ -1 +1,2 @@
-bbc9c124f8072875129bd67092f0fa0b  download/abiword-2.5.2.tar.gz
+40d9da8b04c70035b89f8ad7fcc4519d  download/abiword-2.6.3.tar.gz
+95b9fe1d307356322fe35f643f237970  download/abiword-11483-without-legacy.diff

Added: branches/gnome-2-22/office/abiword/files/abiword-11483-without-legacy.diff
==============================================================================
--- (empty file)
+++ branches/gnome-2-22/office/abiword/files/abiword-11483-without-legacy.diff	Tue May  6 17:00:15 2008
@@ -0,0 +1,24 @@
+--- trunk/src/af/util/xp/ut_html.cpp	2008/05/02 06:04:46	23736
++++ trunk/src/af/util/xp/ut_html.cpp	2008/05/02 16:45:53	23737
+@@ -171,8 +171,8 @@
+ 					if (htmlParseChunk (ctxt, buffer, static_cast<int>(length), 0))
+ 						{
+ 							UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n",
+-										  szFilename, getLineNumber(ctxt),
+-										  getColumnNumber(ctxt)));
++										  szFilename, xmlSAX2GetLineNumber(ctxt),
++										  xmlSAX2GetColumnNumber(ctxt)));
+ 							ret = UT_IE_IMPORTERROR;
+ 							break;
+ 						}
+@@ -183,8 +183,8 @@
+ 						if (htmlParseChunk (ctxt, 0, 0, 1))
+ 							{
+ 								UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n",
+-											  szFilename, getLineNumber(ctxt),
+-											  getColumnNumber(ctxt)));
++											  szFilename, xmlSAX2GetLineNumber(ctxt),
++											  xmlSAX2GetColumnNumber(ctxt)));
+ 								ret = UT_IE_IMPORTERROR;
+ 							}
+ 					}

Modified: branches/gnome-2-22/office/enchant/Makefile
==============================================================================
--- branches/gnome-2-22/office/enchant/Makefile	(original)
+++ branches/gnome-2-22/office/enchant/Makefile	Tue May  6 17:00:15 2008
@@ -1,5 +1,5 @@
 GARNAME = enchant
-GARVERSION = 1.4.1
+GARVERSION = 1.4.2
 CATEGORIES = office
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 

Modified: branches/gnome-2-22/office/enchant/checksums
==============================================================================
--- branches/gnome-2-22/office/enchant/checksums	(original)
+++ branches/gnome-2-22/office/enchant/checksums	Tue May  6 17:00:15 2008
@@ -1 +1 @@
-8d309d2fb39a0f5fd2aa564446cb8d62  download/enchant-1.4.1.tar.gz
+fe4558269ff59f569ab9581c907d58cb  download/enchant-1.4.2.tar.gz

Modified: branches/gnome-2-22/office/libgda/Makefile
==============================================================================
--- branches/gnome-2-22/office/libgda/Makefile	(original)
+++ branches/gnome-2-22/office/libgda/Makefile	Tue May  6 17:00:15 2008
@@ -1,5 +1,5 @@
 GARNAME = libgda
-GARVERSION = 3.99.2
+GARVERSION = 3.1.4
 CATEGORIES = office
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 

Modified: branches/gnome-2-22/office/libgda/checksums
==============================================================================
--- branches/gnome-2-22/office/libgda/checksums	(original)
+++ branches/gnome-2-22/office/libgda/checksums	Tue May  6 17:00:15 2008
@@ -1 +1 @@
-6ef0e4385808c0dd55b9f786e74c9c3c  download/libgda-3.99.2.tar.bz2
+e584211e04b502d3fb747236c913378e  download/libgda-3.1.4.tar.bz2

Modified: branches/gnome-2-22/office/wv/Makefile
==============================================================================
--- branches/gnome-2-22/office/wv/Makefile	(original)
+++ branches/gnome-2-22/office/wv/Makefile	Tue May  6 17:00:15 2008
@@ -1,9 +1,10 @@
 GARNAME = wv
-GARVERSION = 1.2.4
+GARVERSION = 1.2.5
 CATEGORIES = office
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
-MASTER_SITES = http://$(SOURCEFORGE_NET)/wvware/
+MASTER_SITES = http://www.abisource.com/downloads/wv/$(GARVERSION)/
+# http://$(SOURCEFORGE_NET)/wvware/
 
 LIBDEPS = platform/glib platform/libxml2 office/libgsf
 

Modified: branches/gnome-2-22/office/wv/checksums
==============================================================================
--- branches/gnome-2-22/office/wv/checksums	(original)
+++ branches/gnome-2-22/office/wv/checksums	Tue May  6 17:00:15 2008
@@ -1 +1 @@
-c1861c560491f121e12917fa76970ac5  download/wv-1.2.4.tar.gz
+ae506eae4825c93d0cd7939ce6cbae41  download/wv-1.2.5.tar.gz