[gnumeric] [win32] fix libgda and poppler
- From: Jody Goldberg <jody src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnumeric] [win32] fix libgda and poppler
- Date: Wed, 30 Dec 2009 16:13:55 +0000 (UTC)
commit e24a283f83071ee7c0e9128ab8e15c23f79f9c09
Author: Jody Goldberg <jody gnome org>
Date: Wed Dec 30 11:11:06 2009 -0500
[win32] fix libgda and poppler
- disable gcrypt for xslt
- disable soup for gda
- disable cms for poppler
NEWS | 1 +
tools/win32/build | 4 ++++
tools/win32/jhbuildrc.py | 6 ++++--
tools/win32/moduleset.in | 12 ------------
4 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/NEWS b/NEWS
index 1ede463..760dca3 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,7 @@ Jean
Jody:
* Fix use of ExprEntry from glade on win32.
+ * More win32 build fixes (xslt for libgda & poppler).
--------------------------------------------------------------------------
Gnumeric 1.9.17
diff --git a/tools/win32/build b/tools/win32/build
index 32b73ab..7ea262f 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -99,6 +99,10 @@ setup_html_help() {
if [ "x${target}" = "xshell" ]; then
${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" shell
elif [ "x${target}" = "xdoc" ]; then
+ echo make -C "${srcdir}/../../doc/C" chm
+ make -C "${srcdir}/../../doc/C" chm
+ echo cp -r "${srcdir}/../../doc/C/chm" ..
+ cp -r "${srcdir}/../../doc/C/chm" ..
echo exiting
exit 0
elif [ ! "x${start}" = "x" ]; then
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index 1889cdd..d471be8 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -66,7 +66,7 @@ os.environ['CPPLAGS'] = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + '
os.environ['CXXLAGS'] = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, prefix, 'include')
os.environ['ARFLAGS'] = 'rcs'
os.environ['INSTALL'] = os.path.expanduser('~/bin/install-check')
-os.environ['ACLOCAL_AMFLAGS'] = ' -I '+prefix+'/share/aclocal' # for libgnomedb
+os.environ['ACLOCAL_AMFLAGS'] = ' -I m4 -I '+prefix+'/share/aclocal' # for libgnomedb
os.environ['WINEDEBUG'] = '-all'
#os.environ['MAKE'] = 'colormake'
@@ -132,17 +132,19 @@ module_autogenargs['psiconv'] = autogenargs + """ --disable-xhtml-docs \
--without-imagemagick"""
module_autogenargs['libxml2'] = autogenargs + """ --disable-scrollkeeper --without-iconv"""
+module_autogenargs['libxslt'] = autogenargs + """ --without-crypto"""
autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
module_autogenargs['atk'] = autogenargs + """ --disable-glibtest"""
module_autogenargs['gtk+'] = autogenargs + """ --disable-glibtest --enable-gdiplus --without-libjasper --without-libtiff --without-libjpeg --enable-cups=no"""
-module_autogenargs['libgda'] = autogenargs + """ --without-odbc --without-lda --without-java"""
+module_autogenargs['libgda'] = autogenargs + """ --without-odbc --without-java --without-libsoup"""
module_autogenargs['pxlib'] = autogenargs + """ --with-gsf=""" + prefix
module_autogenargs['libglade'] = autogenargs
module_autogenargs['pygobject'] = autogenargs
module_autogenargs['libgsf'] = autogenargs + """ --without-gnome-vfs --without-bonobo"""
module_autogenargs['goffice'] = autogenargs + """ --without-gconf --with-gmathml"""
module_autogenargs['gnumeric'] = autogenargs + """ --disable-component"""
+module_autogenargs['poppler'] = autogenargs + """ --disable-cms"""
module_autogenargs['evince'] = autogenargs + """ --without-gconf --without-keyring"""
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index e6c1a71..43f9d71 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -233,21 +233,9 @@
</dependencies>
</autotools>
- <tarball id="libgpg-error" version="1.4">
- <source href="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.4.tar.bz2"
- size="467196" md5sum="2ea1e25b7a6f9365c969403af4a6dbc5" />
- </tarball>
- <tarball id="libgcrypt" version="1.2.2">
- <source href="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.2.tar.bz2"
- size="780315" md5sum="4a8a9a7572892ae3803a5aa558e52e02" />
- <dependencies>
- <dep package="libgpg-error" />
- </dependencies>
- </tarball>
<tarball id="libxslt" version="1.1.26">
<source href="ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz"/>
<dependencies>
- <dep package="libgcrypt"/>
<dep package="libxml2"/>
</dependencies>
</tarball>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]