r16346 - gnucash/trunk/packaging/win32 - Update LibGSF (1.14.5) and GOffice (0.4.1) on Windows.
Andreas Köhler
andi5 at cvs.gnucash.org
Sat Jul 21 21:41:02 EDT 2007
Author: andi5
Date: 2007-07-21 21:41:01 -0400 (Sat, 21 Jul 2007)
New Revision: 16346
Trac: http://svn.gnucash.org/trac/changeset/16346
Added:
gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff
Removed:
gnucash/trunk/packaging/win32/goffice-0.3.7-patch.diff
Modified:
gnucash/trunk/packaging/win32/Makefile.am
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/install.sh
Log:
Update LibGSF (1.14.5) and GOffice (0.4.1) on Windows.
Modified: gnucash/trunk/packaging/win32/Makefile.am
===================================================================
--- gnucash/trunk/packaging/win32/Makefile.am 2007-07-21 19:57:53 UTC (rev 16345)
+++ gnucash/trunk/packaging/win32/Makefile.am 2007-07-22 01:41:01 UTC (rev 16346)
@@ -4,7 +4,7 @@
dist.sh \
exetype.pl \
functions.sh \
- goffice-0.3.7-patch.diff \
+ goffice-0.4.1-patch.diff \
install.sh \
install-fq-mods.bat \
libofx-0.8.3-patch.diff \
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2007-07-21 19:57:53 UTC (rev 16345)
+++ gnucash/trunk/packaging/win32/defaults.sh 2007-07-22 01:41:01 UTC (rev 16346)
@@ -213,12 +213,12 @@
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-6.4-1-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.3.tar.bz2"
+set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.5.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.3/goffice-0.3.7.tar.bz2"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.4/goffice-0.4.1.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-set_default GOFFICE_PATCH `pwd`/goffice-0.3.7-patch.diff
+set_default GOFFICE_PATCH `pwd`/goffice-0.4.1-patch.diff
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
Deleted: gnucash/trunk/packaging/win32/goffice-0.3.7-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.3.7-patch.diff 2007-07-21 19:57:53 UTC (rev 16345)
+++ gnucash/trunk/packaging/win32/goffice-0.3.7-patch.diff 2007-07-22 01:41:01 UTC (rev 16346)
@@ -1,91 +0,0 @@
-diff -Nur goffice-0.3.7-old/goffice/Makefile.am goffice-0.3.7/goffice/Makefile.am
---- goffice-0.3.7-old/goffice/Makefile.am Thu Mar 1 23:32:46 2007
-+++ goffice-0.3.7/goffice/Makefile.am Sat Mar 10 16:05:03 2007
-@@ -24,7 +24,8 @@
- libgoffice_0_la_DEPENDENCIES = goffice.def
- libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
- if WITH_NATIVE_WIN32
--libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
-+libgoffice_0_la_LDFLAGS += -no-undefined
-+libgoffice_0_la_LIBADD += -luuid
- endif
- endif
-
-@@ -69,7 +70,7 @@
- data/local.def drawing/local.def graph/local.def \
- gtk/local.def ms-compat/local.def utils/local.def
- echo EXPORTS > $@ && \
-- cat $^ | sort >> $@
-+ cat $^ | sort | sed '/^go_doc_mark_not_modified$$/d;/^go_plugin_init$$/d;/^go_plugin_shutdown$$/d' >> $@
-
- if HAVE_LIBEXE
- goffice_mslibdir = $(DESTDIR)$(libdir)
-diff -Nur goffice-0.3.7-old/goffice-win32.mk goffice-0.3.7/goffice-win32.mk
---- goffice-0.3.7-old/goffice-win32.mk Mon Jan 1 02:38:17 2007
-+++ goffice-0.3.7/goffice-win32.mk Sat Mar 10 16:05:03 2007
-@@ -16,7 +16,7 @@
- fi; \
- done; \
- cat $(top_builddir)/goffice/goffice-config.h $$hdrs_list | \
-- sed -e 's/^#[ \t]*include[ \t]\+.*$$//g' | \
-+ sed -e 's/^#[ ]*include[ ]\+.*$$//g' | \
- $(CPP) $(AM_CPPFLAGS) "-DGO_VAR_DECL=__declspec(dllexport)" -P - > xgen-localdef.1 && \
- perl $(top_srcdir)/dumpdef.pl \
- xgen-localdef.1 > xgen-localdef.2 \
-diff -Nur goffice-0.3.7-old/gtk-doc.m4 goffice-0.3.7/gtk-doc.m4
---- goffice-0.3.7-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
-+++ goffice-0.3.7/gtk-doc.m4 Sat Mar 10 16:05:03 2007
-@@ -0,0 +1,53 @@
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ dnl for overriding the documentation installation directory
-+ AC_ARG_WITH(html-dir,
-+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+ [with_html_dir='${datadir}/gtk-doc/html'])
-+ HTML_DIR="$with_html_dir"
-+ AC_SUBST(HTML_DIR)
-+
-+ dnl enable/disable documentation building
-+ AC_ARG_ENABLE(gtk-doc,
-+ AC_HELP_STRING([--enable-gtk-doc],
-+ [use gtk-doc to build documentation [default=no]]),,
-+ enable_gtk_doc=no)
-+
-+ have_gtk_doc=no
-+ if test x$enable_gtk_doc = xyes; then
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
-+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-+ have_gtk_doc=yes
-+ fi
-+
-+ dnl do we want to do a version check?
-+ifelse([$1],[],,
-+ [gtk_doc_min_version=$1
-+ if test "$have_gtk_doc" = yes; then
-+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no)
-+ have_gtk_doc=no
-+ fi
-+ fi
-+])
-+ if test "$have_gtk_doc" != yes; then
-+ enable_gtk_doc=no
-+ fi
-+ fi
-+
-+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+])
Added: gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff 2007-07-21 19:57:53 UTC (rev 16345)
+++ gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff 2007-07-22 01:41:01 UTC (rev 16346)
@@ -0,0 +1,69 @@
+diff -Nur goffice-0.4.1-old/goffice/Makefile.am goffice-0.4.1/goffice/Makefile.am
+--- goffice-0.4.1-old/goffice/Makefile.am Sat Jul 7 00:44:32 2007
++++ goffice-0.4.1/goffice/Makefile.am Sat Jul 21 23:24:22 2007
+@@ -24,7 +24,7 @@
+ libgoffice_0_la_DEPENDENCIES = goffice.def
+ libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
+ if WITH_NATIVE_WIN32
+-libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
++libgoffice_0_la_LIBADD += -luuid
+ endif
+ endif
+
+diff -Nur goffice-0.4.1-old/gtk-doc.m4 goffice-0.4.1/gtk-doc.m4
+--- goffice-0.4.1-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
++++ goffice-0.4.1/gtk-doc.m4 Sat Jul 21 23:25:04 2007
+@@ -0,0 +1,53 @@
++dnl -*- mode: autoconf -*-
++
++# serial 1
++
++dnl Usage:
++dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
++AC_DEFUN([GTK_DOC_CHECK],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++ dnl for overriding the documentation installation directory
++ AC_ARG_WITH(html-dir,
++ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++ [with_html_dir='${datadir}/gtk-doc/html'])
++ HTML_DIR="$with_html_dir"
++ AC_SUBST(HTML_DIR)
++
++ dnl enable/disable documentation building
++ AC_ARG_ENABLE(gtk-doc,
++ AC_HELP_STRING([--enable-gtk-doc],
++ [use gtk-doc to build documentation [default=no]]),,
++ enable_gtk_doc=no)
++
++ have_gtk_doc=no
++ if test x$enable_gtk_doc = xyes; then
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
++ have_gtk_doc=yes
++ fi
++
++ dnl do we want to do a version check?
++ifelse([$1],[],,
++ [gtk_doc_min_version=$1
++ if test "$have_gtk_doc" = yes; then
++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ have_gtk_doc=no
++ fi
++ fi
++])
++ if test "$have_gtk_doc" != yes; then
++ enable_gtk_doc=no
++ fi
++ fi
++
++ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
++ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
++])
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2007-07-21 19:57:53 UTC (rev 16345)
+++ gnucash/trunk/packaging/win32/install.sh 2007-07-22 01:41:01 UTC (rev 16346)
@@ -637,7 +637,7 @@
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
add_to_env $_GOFFICE_UDIR/bin PATH
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgoffice-0.3
+ if quiet ${PKG_CONFIG} --exists libgoffice-0.4
then
echo "goffice already installed. skipping."
else
@@ -660,7 +660,7 @@
make
make install
qpopd
- ${PKG_CONFIG} --exists libgoffice-0.3 || die "goffice not installed correctly"
+ ${PKG_CONFIG} --exists libgoffice-0.4 || die "goffice not installed correctly"
fi
}
More information about the gnucash-changes
mailing list