aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/gnumeric/be_brave_with_libgsf_dep.patch12
-rw-r--r--office/gnumeric/doinst.sh2
-rw-r--r--office/gnumeric/gnumeric.SlackBuild7
-rw-r--r--office/gnumeric/gnumeric.info6
4 files changed, 6 insertions, 21 deletions
diff --git a/office/gnumeric/be_brave_with_libgsf_dep.patch b/office/gnumeric/be_brave_with_libgsf_dep.patch
deleted file mode 100644
index ffa19c48adec1..0000000000000
--- a/office/gnumeric/be_brave_with_libgsf_dep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gnumeric-1.10.12.orig//configure gnumeric-1.10.12//configure
---- gnumeric-1.10.12.orig//configure 2010-11-20 11:27:24.000000000 -0600
-+++ gnumeric-1.10.12//configure 2010-11-28 04:22:21.807932393 -0600
-@@ -12807,7 +12807,7 @@
-
- libspreadsheet_reqs="
- libgoffice-${GOFFICE_API_VER} >= 0.8.10
-- libgsf-1 >= 1.14.18
-+ libgsf-1 >= 1.14.16
- libxml-2.0 >= 2.4.12
- "
- gnumeric_reqs="$libspreadsheet_reqs
diff --git a/office/gnumeric/doinst.sh b/office/gnumeric/doinst.sh
index 97978d94d5e32..85059233907e4 100644
--- a/office/gnumeric/doinst.sh
+++ b/office/gnumeric/doinst.sh
@@ -3,7 +3,7 @@ schema_install() {
GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
chroot . gconftool-2 --makefile-install-rule \
/etc/gconf/schemas/$SCHEMA \
- 1>/dev/null
+ 1>/dev/null 2>/dev/null
}
schema_install gnumeric-dialogs.schemas
diff --git a/office/gnumeric/gnumeric.SlackBuild b/office/gnumeric/gnumeric.SlackBuild
index 60af611de2303..7ee09049ab7d2 100644
--- a/office/gnumeric/gnumeric.SlackBuild
+++ b/office/gnumeric/gnumeric.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gnumeric
-# Copyright 2010 Robby Workman, Northport, Alabama, USA
+# Copyright 2010,2011 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gnumeric
-VERSION=${VERSION:-1.10.12}
+VERSION=${VERSION:-1.10.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,9 +73,6 @@ find . \
# The docs will still be missing, but at least we can build the app itself
touch doc/C/gnumeric-C.omf.out
-# Surely the bump from 1.4.16 to 1.4.18 of libgsf can't be *that* needed
-patch -p1 < $CWD/be_brave_with_libgsf_dep.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/office/gnumeric/gnumeric.info b/office/gnumeric/gnumeric.info
index 47fd9c1cd058d..7c0bbb9bc75ea 100644
--- a/office/gnumeric/gnumeric.info
+++ b/office/gnumeric/gnumeric.info
@@ -1,8 +1,8 @@
PRGNAM="gnumeric"
-VERSION="1.10.12"
+VERSION="1.10.14"
HOMEPAGE="http://projects.gnome.org/gnumeric/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.10/gnumeric-1.10.12.tar.bz2"
-MD5SUM="d93c01092fccefa33e796c07ef0a5b37"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.10/gnumeric-1.10.14.tar.bz2"
+MD5SUM="d712851505e33f01d40e32b0c6dae56a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Robby Workman"