From 8c4c6ba7a47b8fa39385787b232d1ca94e6a213a Mon Sep 17 00:00:00 2001
From: steve <steve@FreeBSD.org>
Date: Sun, 9 May 1999 17:22:54 +0000
Subject: Update to version 0.25.

PR:		11544
Submitted by:	Ade Lovett <ade@lovett.com>
---
 math/gnumeric2/files/patch-aa | 32 ++++++++++++++++++++++++++------
 math/gnumeric2/files/patch-ba |  4 ++--
 2 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'math/gnumeric2/files')

diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 1c57a9bcda2d..c8d972afdef9 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,15 +1,15 @@
---- configure.orig	Wed Feb 24 03:49:18 1999
-+++ configure	Wed Feb 24 18:46:00 1999
-@@ -3309,7 +3309,7 @@
+--- configure.orig	Tue Apr 27 14:23:58 1999
++++ configure	Thu May  6 10:48:39 1999
+@@ -3335,7 +3335,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lxml `gnome-config --libs xml` $LIBS"
 +LIBS="`xml-config --libs` $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 3315 "configure"
+ #line 3341 "configure"
  #include "confdefs.h"
-@@ -3340,7 +3340,7 @@
+@@ -3366,7 +3366,7 @@
    
  		
  		
@@ -18,7 +18,7 @@
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -5557,15 +5557,15 @@
+@@ -5583,15 +5583,15 @@
  fi
  
          
@@ -40,3 +40,23 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
+@@ -6174,7 +6174,7 @@
+ test -n "$AWK" && break
+ done
+ 
+-GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h"
++GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gtk12/gdk/gdkkeysyms.h"
+ 
+ cat >> confdefs.h <<\EOF
+ #define ENABLE_GNOME 1
+@@ -6198,8 +6198,8 @@
+   LIBGLADE_FULLDIST_TRUE='#'
+   LIBGLADE_FULLDIST_FALSE=
+ fi
+-XML_LIBS=`gnome-config --libs xml`
+-XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml
++XML_LIBS=`xml-config --libs`
++XML_CFLAGS=`xml-config --cflags`
+ 
+ 
+ 
diff --git a/math/gnumeric2/files/patch-ba b/math/gnumeric2/files/patch-ba
index 3dff658d020c..6a7b72a8443b 100644
--- a/math/gnumeric2/files/patch-ba
+++ b/math/gnumeric2/files/patch-ba
@@ -4,8 +4,8 @@
  perl_val = @perl_val@
  python_val = @python_val@
  
--SUBDIRS = intl po macros plugins src doc
-+SUBDIRS = intl po macros plugins src
+-SUBDIRS = intl po macros libglade plugins src doc
++SUBDIRS = intl po macros libglade plugins src
  
  EXTRA_DIST =  	gnumeric.desktop README HACKING gnumeric.spec.in 	gnumeric.keys.in gnumeric.mime $(appicon_DATA)
  
-- 
cgit