summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-06-12 22:07:19 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-06-12 22:07:19 -0500
commitdc32b3a732442ee211cba793fd024b51c9567f5b (patch)
tree9c09a2f6b29c29f65ae87875e92ab921c4125f67
parent2296385c3f2b3dd6eadd95aca049bd5273b768cd (diff)
downloadslackbuilds-dc32b3a732442ee211cba793fd024b51c9567f5b.tar.gz
slackbuilds-dc32b3a732442ee211cba793fd024b51c9567f5b.tar.xz
libraries/goffice: Updated for version 0.8.5.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r--libraries/goffice/README2
-rw-r--r--libraries/goffice/goffice.SlackBuild11
-rw-r--r--libraries/goffice/goffice.info8
-rw-r--r--libraries/goffice/gtkdoc-rebase.patch61
4 files changed, 10 insertions, 72 deletions
diff --git a/libraries/goffice/README b/libraries/goffice/README
index 1678137a54..84796c7073 100644
--- a/libraries/goffice/README
+++ b/libraries/goffice/README
@@ -1 +1,3 @@
GOffice -- A glib/gtk set of document centric objects and utilities
+
+This requires GConf.
diff --git a/libraries/goffice/goffice.SlackBuild b/libraries/goffice/goffice.SlackBuild
index 6248a65e29..48c313938c 100644
--- a/libraries/goffice/goffice.SlackBuild
+++ b/libraries/goffice/goffice.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=goffice
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,9 +69,6 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# patch --gtkdoc-rebase flag evaluation
-patch -p1 < $CWD/gtkdoc-rebase.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -79,6 +76,8 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
@@ -88,9 +87,7 @@ cp -a AUTHORS BUGS COPYING ChangeLog INSTALL MAINTAINERS NEWS README \
$PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -type f -exec chmod 644 {} \;
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
- ln -s /usr/share/gtk-doc/html/goffice html
-)
+(cd $PKG/usr/doc/$PRGNAM-$VERSION; ln -s /usr/share/gtk-doc/html/goffice html)
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/goffice/goffice.info b/libraries/goffice/goffice.info
index 3c0add9042..771fae5c54 100644
--- a/libraries/goffice/goffice.info
+++ b/libraries/goffice/goffice.info
@@ -1,10 +1,10 @@
PRGNAM="goffice"
-VERSION="0.7.0"
+VERSION="0.8.5"
HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/goffice/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/goffice/0.7/goffice-0.7.0.tar.bz2"
-MD5SUM="835a7d2d57bc406a44ae11e1be6f04ca"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/goffice/0.8/goffice-0.8.5.tar.bz2"
+MD5SUM="3dda09fa540c947d45384b53713e49d5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="alkos333"
EMAIL="me@alkos333.net"
-APPROVED="David Somero"
+APPROVED="Erik Hanson"
diff --git a/libraries/goffice/gtkdoc-rebase.patch b/libraries/goffice/gtkdoc-rebase.patch
deleted file mode 100644
index 42ac02ac0f..0000000000
--- a/libraries/goffice/gtkdoc-rebase.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ru goffice-0.6.1/docs/reference/Makefile.in goffice-0.6.1/docs/reference/Makefile.in
---- goffice-0.6.1/docs/reference/Makefile.in 2007-12-20 11:11:28.000000000 +0000
-+++ goffice-0.6.1/docs/reference/Makefile.in 2008-01-04 18:33:52.000000000 +0000
-@@ -288,10 +288,10 @@
- expand_content_files =
- GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(GOFFICE_CFLAGS)
- GTKDOC_LIBS = $(top_builddir)/goffice/libgoffice-@GOFFICE_API_VER@.la $(GOFFICE_LIBS)
--@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
--@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-
- # We set GPATH here; this gives us semantics for GNU make
- # which are more like other make's VPATH, when it comes to
-@@ -588,8 +588,9 @@
- done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ if test `which gtkdoc-rebase` != ""; then \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ fi \
- fi
-
- uninstall-local:
-diff -ru goffice-0.6.1/gtk-doc.make goffice-0.6.1/gtk-doc.make
---- goffice-0.6.1/gtk-doc.make 2007-12-20 11:11:23.000000000 +0000
-+++ goffice-0.6.1/gtk-doc.make 2008-01-04 18:33:48.000000000 +0000
-@@ -5,11 +5,11 @@
- ####################################
-
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- else
--GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- endif
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -139,8 +139,9 @@
- done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ if test `which gtkdoc-rebase` != ""; then \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ fi \
- fi
-
-