sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Robin Cook (45ec71461c92501ffa358995f143cbb8434cf4cc)

From: Robin Cook <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (45ec71461c92501ffa358995f143cbb8434cf4cc)
Date: Mon, 31 Dec 2007 09:56:00 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
gnome2-apps/gnumeric/BUILD | 2
gnome2-apps/gnumeric/DEPENDS | 17 +----
gnome2-apps/gnumeric/DETAILS | 6 -
gnome2-apps/gnumeric/HISTORY | 9 ++
gnome2-apps/gnumeric/PRE_BUILD | 4 -
gnome2-apps/gnumeric/gnumeric-1.6.3.tar.bz2.sig | 0
gnome2-apps/gnumeric/gnumeric-1.7.91.tar.bz2.sig | 0
gnome2-apps/gnumeric/gnumeric-1.8.0-omf.patch | 77
+++++++++++++++++++++++
gnome2-apps/gnumeric/gnumeric-1.8.0.tar.bz2.sig |binary
gnome2-apps/gnumeric/libgda103.patch | 16 ----
11 files changed, 95 insertions(+), 36 deletions(-)

New commits:
commit 14bbaf8ae003ce4da71ecb8040436c61af0c041d
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gnumeric: updated to 1.8.0

diff --git a/gnome2-apps/gnumeric/BUILD b/gnome2-apps/gnumeric/BUILD
index 8c960bd..538806d 100755
--- a/gnome2-apps/gnumeric/BUILD
+++ b/gnome2-apps/gnumeric/BUILD
@@ -20,7 +20,7 @@ if [ "$LONGDOUBLE" == "y" ]; then
OPTS="$OPTS --with-long-double"
else
OPTS="$OPTS --without-long-double"
-fi
+fi &&

make_single &&
default_build &&
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index 9a9ff72..4ba6d78 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,15 +1,8 @@
-depends libole2-2 &&
-depends rarian &&
-depends libgsf &&
-
-
-if [[ "${GNUMERIC_DEVEL}" == "y" ]]; then
- depends goffice-0.5 &&
- depends libxml2
-else
- depends goffice &&
- depends libgnomeprintui
-fi &&
+depends libole2-2 &&
+depends rarian &&
+depends libgsf &&
+depends goffice-0.6 &&
+depends libxml2 &&

optional_depends gtk+2 \
"--with-gtk" \
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index b4bd0d8..d64203e 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,10 +1,8 @@
SPELL=gnumeric
if [[ "${GNUMERIC_DEVEL}" == "y" ]]; then
- VERSION=1.7.91
+ VERSION=1.8.0
else
- VERSION=1.6.3
- PATCHLEVEL=2
- UPDATED=20050918
+ VERSION=1.8.0
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 27d24e0..c208ca1 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,12 @@
+2007-12-29 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.8.0
+ removed 1.6 items
+ * DEPENDS: removed if statements
+ changed goffice to 0.6
+ * PRE_BUILD: removed libgda patch and added omf patch
+ http://bugzilla.gnome.org/show_bug.cgi?id=506335
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/gnumeric/files/gnumeric-1.8.0-omf.patch?view=markup
+
2007-12-05 George Sherwood <geroge AT beernabeer.com>
* DETAILS: Updated VERSION to 1.7.91.
* PRE_BUILD: Removed incorporated patch.
diff --git a/gnome2-apps/gnumeric/PRE_BUILD b/gnome2-apps/gnumeric/PRE_BUILD
index 5584665..201a302 100755
--- a/gnome2-apps/gnumeric/PRE_BUILD
+++ b/gnome2-apps/gnumeric/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-if [[ "${GNUMERIC_DEVEL}" == "n" ]]; then
- patch -p0 < ${SCRIPT_DIRECTORY}/libgda103.patch
-fi
+patch -p0 < ${SCRIPT_DIRECTORY}/gnumeric-1.8.0-omf.patch
diff --git a/gnome2-apps/gnumeric/gnumeric-1.6.3.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.6.3.tar.bz2.sig
deleted file mode 100644
index 1497080..0000000
Binary files a/gnome2-apps/gnumeric/gnumeric-1.6.3.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/gnumeric/gnumeric-1.7.91.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.7.91.tar.bz2.sig
deleted file mode 100644
index 3418d79..0000000
Binary files a/gnome2-apps/gnumeric/gnumeric-1.7.91.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/gnumeric/gnumeric-1.8.0-omf.patch
b/gnome2-apps/gnumeric/gnumeric-1.8.0-omf.patch
new file mode 100644
index 0000000..0881958
--- /dev/null
+++ b/gnome2-apps/gnumeric/gnumeric-1.8.0-omf.patch
@@ -0,0 +1,77 @@
+
+diff -Nua doc/C/gnumeric-C.omf doc/C/gnumeric-C.omf
+--- doc/C/gnumeric-C.omf 1970-01-01 01:00:00.000000000 +0100
++++ doc/C/gnumeric-C.omf 2007-12-30 23:05:42.000000000 +0100
+@@ -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>
++ miguel AT gnome.org (Miguel de Icaza)
++ </creator>
++ <maintainer>
++ jody AT gnome.org (Jody Goldberg)
++ </maintainer>
++ <contributor>
++ acuster AT gmail.com (Adrian Custer)
++ </contributor>
++ <contributor>
++ mrproper AT ximian.com (Kevin Breit)
++ </contributor>
++ <contributor>
++ aguelzow AT taliesin.ca (Andreas Guelzow)
++ </contributor>
++ <contributor>
++ aaron AT ximian.com (Aaron Weber)
++ </contributor>
++ <contributor>
++ tommydal AT ihug.com.au (Thomas Canty)
++ </contributor>
++ <contributor>
++ kirillov AT math.sunysb.edu (Alexander Kirillov)
++ </contributor>
++ <contributor>
++ k_wayne AT linuxpower.org (Wayne Schuller)
++ </contributor>
++ <contributor>
++ jiivonen AT hutcs.cs.hut.fi (Jukka-Pekka Iivonen)
++ </contributor>
++ <contributor>
++ adrian AT 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/gnome2-apps/gnumeric/gnumeric-1.8.0.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.8.0.tar.bz2.sig
new file mode 100644
index 0000000..22312c1
Binary files /dev/null and b/gnome2-apps/gnumeric/gnumeric-1.8.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/gnumeric/libgda103.patch
b/gnome2-apps/gnumeric/libgda103.patch
deleted file mode 100644
index 99fbf52..0000000
--- a/gnome2-apps/gnumeric/libgda103.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- plugins/gda/plugin-gda.c.orig 2005-08-09 11:49:36.000000000 +0000
-+++ plugins/gda/plugin-gda.c
-@@ -62,11 +62,11 @@ display_recordset (GdaDataModel *recset,
- for (row = 0; row < rowcount; row++) {
- for (col = 0; col < fieldcount; col++) {
- gchar *str;
-- const GdaValue *value;
-+ const GValue *value;
-
- value = gda_data_model_get_value_at (GDA_DATA_MODEL
(recset),
- col, row);
-- str = gda_value_stringify ((GdaValue *) value);
-+ str = gda_value_stringify (value);
- value_array_set (array,
- col,
- row,

[SM-Commit] GIT changes to master grimoire by Robin Cook (45ec71461c92501ffa358995f143cbb8434cf4cc), Robin Cook, 12/31/2007