gnumeric r16898 - in trunk: . tools/win32

[jody svn gnome org]

Author: jody
Date: Sat Oct 18 20:25:44 2008
New Revision: 16898
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16898&view=rev

Log:
2008-10-18  Jody Goldberg <jody gnome org>

	* tools/win32/moduleset : use the latestest shiniest glib/gtk

	* configure.in : add a GOFFICE_API_VER for use in the .pc file.
	* libspreadsheet.pc.in : drop the old mising LIBGOFFICE variables, and
	  use the new tidy ones.

Modified:
   trunk/BUGS
   trunk/ChangeLog
   trunk/configure.in
   trunk/libspreadsheet.pc.in
   trunk/tools/win32/moduleset

Modified: trunk/BUGS
==============================================================================
--- trunk/BUGS	(original)
+++ trunk/BUGS	Sat Oct 18 20:25:44 2008
@@ -36,7 +36,6 @@
 - load/save of external references
 - all the merged cell singleton bugs
 - scripting
-- Save as ps
 
 Short term goals
 ----------------

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Oct 18 20:25:44 2008
@@ -144,6 +144,16 @@
 CPPFLAGS=${_cppflags}
 LDFLAGS=${_ldflags}
 
+dnl **********
+dnl * Goffice 
+dnl **********
+# Goffice releases are parallel installable, which do we depend on
+GOFFICE_API_VER="0.8"
+AC_SUBST(GOFFICE_API_VER)
+# Components
+GOFFICE_PLUGINS_DIR=`pkg-config --variable=PluginDir libgoffice-0.8`
+AC_SUBST(GOFFICE_PLUGINS_DIR)
+
 dnl PKG_PROG_PKG_CONFIG is expanded just before the first occurrence of
 dnl PKG_CHECK_MODULES.  Since this is inside an `if,' it can escape
 dnl execution.  Thus we need an explicit call:
@@ -151,7 +161,7 @@
 
 dnl *****************************
 libspreadsheet_reqs="
-	libgoffice-0.8		>= 0.7.1
+	libgoffice-${GOFFICE_API_VER}	>= 0.7.2
 	libgsf-1		>= 1.14.9
 	libxml-2.0		>= 2.4.12
 "
@@ -1004,12 +1014,6 @@
 ])
 
 dnl **************************************************
-dnl * Goffice component stuff
-dnl **************************************************
-GOFFICE_PLUGINS_DIR=`pkg-config --variable=PluginDir libgoffice-0.8`
-AC_SUBST(GOFFICE_PLUGINS_DIR)
-
-dnl **************************************************
 dnl * Config defaults (Must be after bonobo)
 dnl **************************************************
 dnl

Modified: trunk/libspreadsheet.pc.in
==============================================================================
--- trunk/libspreadsheet.pc.in	(original)
+++ trunk/libspreadsheet.pc.in	Sat Oct 18 20:25:44 2008
@@ -4,15 +4,17 @@
 includedir= includedir@
 VERSION= VERSION@
 gnumeric_libdir= gnumeric_libdir@
-libgoffice= LIBGOFFICE@
+GOFFICE_API_VER= GOFFICE_API_VER@
+libgoffice=libgoffice-${GOFFICE_API_VER}
+GNUMERIC_API_VER= GNUMERIC_API_VER@
 
 Name: libspreadsheet
 Description: The spreadsheet internals of Gnumeric (DEVELOPMENT VERSION)
 Version: @VERSION@
 URL: http://www.gnumeric.org
-Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 @LIBGOFFICE@
-Requires.private: libart-2.0
-Libs: -L${libdir} -lspreadsheet- GNUMERIC_API_VER@ @GTK_EXTRA_LIBS@
+Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 ${libgoffice}
+Requires.private:
+Libs: -L${libdir} -lspreadsheet-${GNUMERIC_API_VER}
 
 # for now include both the directory and the child, until we rename the includes in svn
 Cflags: -I${includedir}/libspreadsheet- GNUMERIC_API_VER@/spreadsheet -I${includedir}/libspreadsheet- GNUMERIC_API_VER@ -I${gnumeric_libdir}/include

Modified: trunk/tools/win32/moduleset
==============================================================================
--- trunk/tools/win32/moduleset	(original)
+++ trunk/tools/win32/moduleset	Sat Oct 18 20:25:44 2008
@@ -22,11 +22,9 @@
 	<dependencies/>
     </tarball>
 
-    <tarball id="pcre" version="7.2">
-	<source href="http://downloads.sourceforge.net/pcre/pcre-7.2.tar.bz2";
-		md5sum="53305db73855f1ff155dcd2c05d448d3"/>
+    <tarball id="pcre" version="7.8">
+	<source href="http://downloads.sourceforge.net/pcre/pcre-7.8.tar.bz2"/>
 	<patches>
-	    <patch file="&patch_dir;pcre.patch"/>
 	</patches>
     </tarball>
     <autotools id="gtk-doc">
@@ -51,8 +49,8 @@
 	</dependencies>
     </autotools>
 -->
-    <tarball id="glib" version="2.18.1">
-	<source href="http://download.gnome.org/sources/glib/2.18/glib-2.18.1.tar.bz2"; />
+    <tarball id="glib" version="2.18.2">
+	<source href="http://download.gnome.org/sources/glib/2.18/glib-2.18.2.tar.bz2"; />
 	<patches>
 		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch"/>
 		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
@@ -183,9 +181,9 @@
     </autotools>
     -->
 
-    <autotools id="gtk+" version="2.14.3">
-	<branch repo="gnome.org" module="sources/gtk+/2.14/gtk+-2.14.3.tar.bz2"
-		version="2.14.3">
+    <autotools id="gtk+" version="2.14.4">
+	<branch repo="gnome.org" module="sources/gtk+/2.14/gtk+-2.14.4.tar.bz2"
+		version="2.14.4">
 	    <patch file="&patch_dir;gtk-VK_DECIMAL.patch"/>
 	</branch>
 	<dependencies>