IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Install.sh: Bump goffice to 0.3.7.

Browse Source 
* add pcre which is a hard dependency of goffice now
* use the same patch for goffice 0.3.7 as for 0.3.2 (was not in use)
* make inst.sh'ed gnucash and gnucash.bat scripts work again


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15705 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2007-03-10 19:01:37 +00:00
parent 5354305dc6
commit 4ebb0dc551
5 changed files with 49 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/win32/custom.sh
View File

@ -155,13 +155,16 @@ GNOME_DIR=$GLOBAL_DIR\\gnome
SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.31.zip"
SWIG_DIR=$GLOBAL_DIR\\swig
PCRE_BIN_URL="$SF_MIRROR/gnuwin32/pcre-6.4-1-bin.zip"
PCRE_LIB_URL="$SF_MIRROR/gnuwin32/pcre-6.4-1-lib.zip"
PCRE_DIR=$GLOBAL_DIR\\pcre
LIBGSF_URL="$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.3.tar.bz2"
LIBGSF_DIR=$GLOBAL_DIR\\libgsf
# do not update this if you are unwilling to hack gnc-html-graph-gog.c
GOFFICE_URL="$GNOME_MIRROR/sources/goffice/0.3/goffice-0.3.0.tar.bz2"
GOFFICE_URL="$GNOME_MIRROR/sources/goffice/0.3/goffice-0.3.7.tar.bz2"
GOFFICE_DIR=$GLOBAL_DIR\\goffice
GOFFICE_PATCH=`pwd`/goffice-0.3.0-patch.diff
GOFFICE_PATCH=`pwd`/goffice-0.3.7-patch.diff
GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
GLADE_DIR=$GLOBAL_DIR\\glade
@ -215,6 +218,7 @@ add_step inst_exetype
add_step inst_libxml2
add_step inst_gnome
add_step inst_swig
add_step inst_pcre
add_step inst_libgsf
add_step inst_goffice
#add_step inst_glade

8
packaging/win32/dist.sh
View File

@ -28,6 +28,7 @@ function prepare() {
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
_LIBXML2_UDIR=`unix_path $LIBXML2_DIR`
_GNOME_UDIR=`unix_path $GNOME_DIR`
_PCRE_UDIR=`unix_path $PCRE_DIR`
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
_OPENSP_UDIR=`unix_path $OPENSP_DIR`
@ -114,6 +115,12 @@ function dist_gnome() {
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
}
function dist_pcre() {
setup pcre
mkdir -p $DIST_UDIR/bin
cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
}
function dist_libgsf() {
setup libGSF
mkdir -p $DIST_UDIR/bin
@ -221,6 +228,7 @@ dist_guile
dist_openssl
dist_libxml2
dist_gnome
dist_pcre
dist_libgsf
dist_goffice
dist_libofx

189
packaging/win32/goffice-0.3.0-patch.diff
View File

@ -1,189 +0,0 @@
diff -Nur goffice-0.3.0-old/configure.in goffice-0.3.0/configure.in
--- goffice-0.3.0-old/configure.in Mon Apr 17 19:15:44 2006
+++ goffice-0.3.0/configure.in Wed Oct 11 16:56:52 2006
@@ -93,6 +93,7 @@
libxml-2.0 >= 2.4.12
pango >= 1.8.1
pangoft2 >= 1.8.1
+ freetype2 >= 2.1.0
libart-2.0 >= 2.3.11
"
goffice_cairo_reqs="
@@ -225,6 +226,8 @@
AC_MSG_RESULT($with_win32)
AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
AM_CONDITIONAL(HAVE_LIBEXE, test x$LIBEXE = xyes)
+
+AC_CHECK_HEADERS([pwd.h grp.h])
dnl *****************************
dnl FIXME: perhaps declare with AC_ARG_VAR?
diff -Nur goffice-0.3.0-old/goffice/Makefile.am goffice-0.3.0/goffice/Makefile.am
--- goffice-0.3.0-old/goffice/Makefile.am Mon Apr 17 20:53:01 2006
+++ goffice-0.3.0/goffice/Makefile.am Wed Oct 11 16:56:52 2006
@@ -30,7 +30,7 @@
if WITH_WIN32
libgoffice_0_la_DEPENDENCIES = goffice.def
libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
-libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
+libgoffice_0_la_LIBADD += -luuid
endif
BUILT_SOURCES = goffice-paths.h
@@ -66,14 +66,14 @@
include $(top_srcdir)/goffice.mk
if WITH_WIN32
-LIB_PUBLIC_HDRS = $(libgoffice_1_la_HEADERS)
+LIB_PUBLIC_HDRS = $(libgoffice_0_la_HEADERS)
goffice.def: local.def app/local.def \
cut-n-paste/foocanvas/local.def \
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.0-old/goffice/utils/go-file.c goffice-0.3.0/goffice/utils/go-file.c
--- goffice-0.3.0-old/goffice/utils/go-file.c Wed Mar 29 15:41:37 2006
+++ goffice-0.3.0/goffice/utils/go-file.c Wed Oct 11 16:56:52 2006
@@ -44,8 +44,12 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
+#ifdef HAVE_PWD_H
+# include <pwd.h>
+#endif
+#ifdef HAVE_GRP_H
+# include <grp.h>
+#endif
#include <time.h>
/* ------------------------------------------------------------------------- */
@@ -675,11 +679,13 @@
{
gboolean error = FALSE;
guint uid = 0;
+ gboolean islocal = FALSE;
+#ifdef HAVE_PWD_H
struct passwd *password_info;
const char *name;
gsize namelen;
char *nameutf8;
- gboolean islocal = FALSE;
+#endif
#ifdef GOFFICE_WITH_GNOME
GnomeVFSFileInfo *file_info;
@@ -718,6 +724,7 @@
return g_strdup (_("remote user"));
}
+#ifdef HAVE_PWD_H
password_info = getpwuid (uid);
if (password_info == NULL)
@@ -739,6 +746,9 @@
nameutf8[--namelen] = 0;
return nameutf8;
+#else
+ return NULL;
+#endif
}
/*
@@ -750,10 +760,12 @@
{
gboolean error = FALSE;
guint gid = 0;
- struct group *group_info;
gboolean islocal = FALSE;
+#ifdef HAVE_GRP_H
+ struct group *group_info;
const char *name;
char *nameutf8;
+#endif
#ifdef GOFFICE_WITH_GNOME
GnomeVFSFileInfo *file_info;
@@ -793,6 +805,7 @@
return g_strdup (_("remote"));
}
+#ifdef HAVE_GRP_H
group_info = getgrgid (gid);
if (group_info == NULL)
@@ -802,6 +815,9 @@
(void) go_guess_encoding (name, strlen (name),
NULL, &nameutf8);
return nameutf8;
+#else
+ return NULL;
+#endif
}
GOFilePermissions *
diff -Nur goffice-0.3.0-old/gtk-doc.m4 goffice-0.3.0/gtk-doc.m4
--- goffice-0.3.0-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
+++ goffice-0.3.0/gtk-doc.m4 Wed Oct 11 16:57:21 2006
@@ -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")
+])

22
packaging/win32/goffice-0.3.2-patch.diff → packaging/win32/goffice-0.3.7-patch.diff
View File

@ -1,7 +1,7 @@
diff -Nur goffice-0.3.2-old/goffice/Makefile.am goffice-0.3.2/goffice/Makefile.am
--- goffice-0.3.2-old/goffice/Makefile.am Tue Sep 19 16:06:53 2006
+++ goffice-0.3.2/goffice/Makefile.am Mon Oct 30 15:47:16 2006
@@ -31,7 +31,8 @@
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
@ -11,7 +11,7 @@ diff -Nur goffice-0.3.2-old/goffice/Makefile.am goffice-0.3.2/goffice/Makefile.a
endif
endif
@@ -76,7 +77,7 @@
@@ -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 > $@ && \
@ -20,9 +20,9 @@ diff -Nur goffice-0.3.2-old/goffice/Makefile.am goffice-0.3.2/goffice/Makefile.a
if HAVE_LIBEXE
goffice_mslibdir = $(DESTDIR)$(libdir)
diff -Nur goffice-0.3.2-old/goffice-win32.mk goffice-0.3.2/goffice-win32.mk
--- goffice-0.3.2-old/goffice-win32.mk Tue Sep 19 16:06:52 2006
+++ goffice-0.3.2/goffice-win32.mk Mon Oct 30 15:50:27 2006
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; \
@ -32,9 +32,9 @@ diff -Nur goffice-0.3.2-old/goffice-win32.mk goffice-0.3.2/goffice-win32.mk
$(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.2-old/gtk-doc.m4 goffice-0.3.2/gtk-doc.m4
--- goffice-0.3.2-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
+++ goffice-0.3.2/gtk-doc.m4 Mon Oct 30 15:47:16 2006
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 -*-
+

27
packaging/win32/install.sh
View File

@ -22,6 +22,8 @@ register_env_var INTLTOOL_PERL " "
register_env_var KTOBLZCHECK_CPPFLAGS " "
register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
register_env_var PCRE_CPPFLAGS " "
register_env_var PCRE_LDFLAGS " "
register_env_var PKG_CONFIG ":" ""
register_env_var PKG_CONFIG_PATH ":"
register_env_var READLINE_CPPFLAGS " "
@ -529,6 +531,23 @@ function inst_swig() {
quiet swig -version || die "swig unavailable"
}
function inst_pcre() {
setup pcre
_PCRE_UDIR=`unix_path $PCRE_DIR`
add_to_env -I$_PCRE_UDIR/include PCRE_CPPFLAGS
add_to_env -L$_PCRE_UDIR/lib PCRE_LDFLAGS
add_to_env $_PCRE_UDIR/bin PATH
if quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile
then
echo "pcre already installed. skipping."
else
mkdir -p $_PCRE_UDIR
wget_unpacked $PCRE_BIN_URL $DOWNLOAD_DIR $PCRE_DIR
wget_unpacked $PCRE_LIB_URL $DOWNLOAD_DIR $PCRE_DIR
fi
quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
}
function inst_libgsf() {
setup libGSF
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
@ -575,8 +594,8 @@ function inst_goffice() {
automake
autoconf
./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
CPPFLAGS="${GNOME_CPPFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS}"
CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS}"
[ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
make
make install
@ -877,7 +896,7 @@ function inst_gnucash() {
qpushd src/bin
rm gnucash
make PATH_SEPARATOR=";" \
bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}" \
bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin" \
gnucash
qpopd
@ -909,7 +928,7 @@ function inst_gnucash() {
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;%PATH%" > gnucash.bat
echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;%PATH%" > gnucash.bat
echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.bat
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat