Update to 1.9.4.

2 files changed, 11 insertions, 118 deletions

diff --git a/math/gnumeric/files/gnumeric-C.omf b/math/gnumeric/files/gnumeric-C.omf
deleted file mode 100644
index a18da047fffb..000000000000
--- a/math/gnumeric/files/gnumeric-C.omf
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
-<omf>
-  <resource>
-    <creator>
-      miguel@gnome.org (Miguel de Icaza)
-    </creator>
-    <maintainer>
-      jody@gnome.org (Jody Goldberg)
-    </maintainer>
-    <contributor>
-      acuster@gmail.com (Adrian Custer)
-    </contributor>
-    <contributor>
-      mrproper@ximian.com (Kevin Breit)
-    </contributor>
-    <contributor>
-      aguelzow@taliesin.ca (Andreas Guelzow)
-    </contributor>
-    <contributor>
-      aaron@ximian.com (Aaron Weber)
-    </contributor>
-    <contributor>
-      tommydal@ihug.com.au (Thomas Canty)
-    </contributor>
-    <contributor>
-      kirillov@math.sunysb.edu (Alexander Kirillov)
-    </contributor>
-    <contributor>
-      k_wayne@linuxpower.org (Wayne Schuller)
-    </contributor>
-    <contributor>
-      jiivonen@hutcs.cs.hut.fi (Jukka-Pekka Iivonen)
-    </contributor>
-    <contributor>
-      adrian@gimp.or (Adrian Likins)
-    </contributor>
-
-    <title>
-      The Gnumeric Manual, version 1.8.
-    </title>
-
-    <date>
-      2007-12-20
-    </date>
-
-    <version identifier="1.7" date="2007-10-27" 
-      description="Updated for 1.8"/>
-    <version identifier="1.3" date="2004-12-09" 
-      description="Updated for 1.4"/>
-
-    <subject category="GNOME|Applications|Office"/>
-
-    <description>
-      This is the user's manual for Gnumeric, a GNOME spreadsheet.
-    </description>
-
-    <type>
-      User's Guide
-    </type>
-
-    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN"/>
-    <identifier url="gnumeric.xml"/>
-    <language code="C"/>
-    <relation seriesid="c5e3db84-64c3-11d6-85a3-a3e50590e6d1"/>
-    <rights type="GNU FDL" license.version="1.1"
-      license="http://www.gnu.org/licenses/fdl.html" 
-      holder="Miguel de Icaza, Jody Goldberg, Thomas Canty, 
-      Jukka-Pekka Iivonen, Andreas J. Guelzow, Wayne Schuller, 
-      Adrian Custer, Kevin Breit, Aaron Weber, Alexander Kirillov"/>
-  </resource>
-</omf>
diff --git a/math/gnumeric/files/patch-configure b/math/gnumeric/files/patch-configure
index 992b6246c244..19bf11dd46b2 100644
--- a/math/gnumeric/files/patch-configure
+++ b/math/gnumeric/files/patch-configure
@@ -1,46 +1,11 @@
---- configure.orig	2007-09-16 17:10:01.000000000 -0400
-+++ configure	2007-09-16 17:10:01.000000000 -0400
-@@ -23327,12 +23327,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GB_CFLAGS="$GB_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb == 1.17\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgb == 1.17") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb = 1.17\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgb = 1.17") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GB_CFLAGS=`$PKG_CONFIG --cflags "libgb == 1.17" 2>/dev/null`
-+  pkg_cv_GB_CFLAGS=`$PKG_CONFIG --cflags "libgb = 1.17" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -23345,12 +23345,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GB_LIBS="$GB_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb == 1.17\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgb == 1.17") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgb = 1.17\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgb = 1.17") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GB_LIBS=`$PKG_CONFIG --libs "libgb == 1.17" 2>/dev/null`
-+  pkg_cv_GB_LIBS=`$PKG_CONFIG --libs "libgb = 1.17" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -23369,9 +23369,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgb == 1.17"`
-+	        GB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgb = 1.17"`
-         else
--	        GB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgb == 1.17"`
-+	        GB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgb = 1.17"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GB_PKG_ERRORS" >&5
+--- configure.orig	2009-02-23 20:47:18.000000000 -0500
++++ configure	2009-02-23 20:48:20.000000000 -0500
+@@ -14117,7 +14117,7 @@ if test "x$gnumeric_with_gtk" = xtrue -a
+ 
+ # Check whether --with-gnome was given.
+ if test "${with_gnome+set}" = set; then
+-  withval=$with_gnome; if test "x$withval" == xyes; then
++  withval=$with_gnome; if test "x$withval" = xyes; then
+ 			ui_msg="Gnome"
+ 			gnumeric_with_gnome=true
+ 		fi