Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29364
Modified Files:
Tag: pangocairo-branch
gnumeric.info
Added Files:
Tag: pangocairo-branch
gnumeric.patch
Log Message:
new upstream, set to use libgoffice-0.6, prevent multiply-defined symbol errors
(jfm, dmacks), patch bug affecting libtool (pogma), add file missing from
tarball, validator appeasement, use fink's python25 (dmacks)
Index: gnumeric.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/Attic/gnumeric.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- gnumeric.info 12 Dec 2007 01:13:27 -0000 1.1.2.1
+++ gnumeric.info 14 Jan 2008 06:09:02 -0000 1.1.2.2
@@ -1,8 +1,10 @@
Package: gnumeric
-Version: 1.7.91
-Revision: 1
-Source: gnome
-Source-MD5: feead347e057a103d002dba20e8c807d
+Version: 1.8.0
+Revision: 3
+Source: mirror:gnome:sources/%n/1.8/%n-%v.tar.bz2
+Source-MD5: 5a3a4687203edd4a079d37ff8e1546fe
+PatchFile: %n.patch
+PatchFile-MD5: ec4dae799a8d83d22744a009588d7d2c
BuildDepends: <<
atk1 (>= 1.20.0-1),
audiofile,
@@ -12,6 +14,7 @@
dbus-dev (>= 1.0-1),
esound (>= 0.2.38-1),
expat1,
+ fink (>= 0.24.12),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
gail18-dev,
@@ -30,7 +33,7 @@
libgda4-dev,
libgettext3-dev,
libglade2 (>= 2.6.2-1),
- libgoffice-0.5,
+ libgoffice-0.6,
libgnome2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
libgnomedb4-dev,
@@ -53,12 +56,26 @@
x11-dev,
xft2-dev
<<
-Depends: %N-shlibs (= %v-%r), desktop-file-utils, rarian-compat
+Depends: %N-shlibs (= %v-%r), desktop-file-utils, rarian-compat, scrollkeeper
PatchScript: <<
+ %{default_script}
perl -pi.bak -e 's/-scrollkeeper-update.*$/-echo "no scrollkeeper-update"/g'
omf.make doc/C/Makefile.in
perl -pi.bak -e 's, \-DGNOME_DISABLE_DEPRECATED,,; s,
\-DGTK_DISABLE_DEPRECATED,,' configure{.in,}
+ perl -pi.bak -e 's,GNM_PY_LDFLAGS\=\"\-L
\$PY_LIB_DIR,GNM_PY_LDFLAGS\=\"\-L\$PY_LIB_DIR,g' configure{.in,}
+<<
+ConfigureParams: <<
+ --disable-schemas-install \
+ --mandir='${prefix}/share/man' \
+ --libexecdir='${prefix}/lib' \
+ --disable-dependency-tracking \
+
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
\
+ FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config \
+ PYGOBJECT_LDFLAGS="-L%p/lib/python2.5/config"
+<<
+CompileScript: <<
+PYTHON=%p/bin/python2.5 ./configure %c
+make
<<
-ConfigureParams: --disable-schemas-install --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib' --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
PYGOBJECT_LDFLAGS="-L%p/lib/python2.5/config -Wl,-m"
InstallScript: <<
%{default_script}
mkdir -p %i/share/doc ; ln -s %N-shlibs %i/share/doc/%n
@@ -79,20 +96,21 @@
libgnome2-shlibs (>= 2.20.0-1),
libgnomedb4-shlibs,
libgnomeui2-shlibs (>= 2.20.0-1),
- libgoffice-0.5-shlibs (>= 0.5.4-1),
+ libgoffice-0.6-shlibs (>= 0.6.1-1),
libgsf1.114-gnome-shlibs,
libgsf1.114-shlibs,
libxml2-shlibs (>= 2.6.30-1),
pygobject2-py25
<<
Files: share/pixmaps share/locale lib/gnumeric lib/libspreadsheet-*.dylib
- Shlibs: %p/lib/libspreadsheet-1.7.91.dylib 0.0.0 %n (>= 1.7.91-1)
+ Shlibs: %p/lib/libspreadsheet-1.8.0.dylib 0.0.0 %n (>= 1.8.0-1)
DocFiles: AUTHORS BEVERAGES BUGS COPYING ChangeLog HACKING INSTALL
MAINTAINERS NEWS README
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (>= %v-%r)
Files: include lib
+ BuildDependsOnly: True
InstallScript: mkdir -p %i/share/doc ; ln -s %N-shlibs %i/share/doc/%n
<<
PostInstScript: <<
@@ -119,6 +137,8 @@
Added 2 lines to PatchScript to enable building with gcc 4.
Now works on Intel, so removed Architecture field. -- danielj7
+ PatchFile - followed jfm example to avoid multiply-defined symbols.
+ Also add file missing from tarball --dbreiser
<<
Homepage: http://www.gnome.org/projects/gnumeric/
Maintainer: Spundun Bhatt <[EMAIL PROTECTED]>
--- NEW FILE: gnumeric.patch ---
diff -Nurd gnumeric-1.8.0/doc/C/gnumeric-C.omf
modgnumeric-1.8.0/doc/gnumeric-C.omf
--- gnumeric-1.8.0/doc/C/gnumeric-C.omf 1969-12-31 19:00:00.000000000 -0500
+++ modgnumeric-1.8.0/doc/C/gnumeric-C.omf 2008-01-11 11:07:48.000000000
-0500
@@ -0,0 +1,72 @@
+<?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>
+ [EMAIL PROTECTED] (Miguel de Icaza)
+ </creator>
+ <maintainer>
+ [EMAIL PROTECTED] (Jody Goldberg)
+ </maintainer>
+ <contributor>
+ [EMAIL PROTECTED] (Adrian Custer)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (Kevin Breit)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (Andreas Guelzow)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (Aaron Weber)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (Thomas Canty)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (Alexander Kirillov)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (Wayne Schuller)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (Jukka-Pekka Iivonen)
+ </contributor>
+ <contributor>
+ [EMAIL PROTECTED] (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 -Nurd gnumeric-1.8.0/plugins/python-loader/gnm-python.c
modgnumeric-1.8.0/plugins/python-loader/gnm-python.c
--- gnumeric-1.8.0/plugins/python-loader/gnm-python.c 2007-12-29
01:43:58.000000000 -0500
+++ modgnumeric-1.8.0/plugins/python-loader/gnm-python.c 2008-01-11
20:16:53.000000000 -0500
@@ -7,6 +7,7 @@
#include <gnumeric-config.h>
#include <Python.h>
+#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
#include <glib.h>
#include "gnm-py-interpreter.h"
diff -Nurd gnumeric-1.8.0/plugins/python-loader/py-gnumeric.c
modgnumeric-1.8.0/plugins/python-loader/py-gnumeric.c
--- gnumeric-1.8.0/plugins/python-loader/py-gnumeric.c 2007-12-29
01:43:54.000000000 -0500
+++ modgnumeric-1.8.0/plugins/python-loader/py-gnumeric.c 2008-01-11
20:19:23.000000000 -0500
@@ -9,6 +9,7 @@
#include <Python.h>
#include <gnumeric.h>
#include <glib.h>
+#define NO_IMPORT_PYGOBJECT
#include "pygobject.h"
#include "application.h"
#include "workbook.h"
diff -Nurd gnumeric-1.8.0/plugins/python-loader/python-loader.c
modgnumeric-1.8.0/plugins/python-loader/python-loader.c
--- gnumeric-1.8.0/plugins/python-loader/python-loader.c 2007-12-29
01:43:59.000000000 -0500
+++ modgnumeric-1.8.0/plugins/python-loader/python-loader.c 2008-01-11
22:52:41.000000000 -0500
@@ -10,6 +10,7 @@
#include "python-loader.h"
#include <Python.h>
+#define NO_IMPORT_PYGOBJECT
#include "pygobject.h"
#include "py-gnumeric.h"
#include "gnm-python.h"
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
