GNOME.org
 

[gnumeric] [win32] update deps, and improve automation

commit 05bcab163e51670f34cbbbd30703c5f875d07292
Author: Jody Goldberg <jody gnome org>
Date:   Thu Oct 8 14:12:56 2009 -0400

    [win32] update deps, and improve automation
    
    - bump gtk, and cleanup pxlib patch
    - more automation for add_dbhh

 doc/add_dbhh.pl                      |    5 ++
 doc/gnumeric-doc.make                |    8 ++-
 tools/win32/Makefile.am              |   18 ++++++---
 tools/win32/gnumeric.nsi.in          |   13 +++---
 tools/win32/jhbuildrc-debug          |    2 +-
 tools/win32/jhbuildrc-release        |    2 +-
 tools/win32/moduleset                |   52 +++++++++++++------------
 tools/win32/patches/pxlib-intl.patch |   12 +++---
 tools/win32/patches/pygobject.patch  |   68 +++++++++++++++++++++++++++++++++-
 9 files changed, 131 insertions(+), 49 deletions(-)
---
diff --git a/doc/add_dbhh.pl b/doc/add_dbhh.pl
index 0e7eed1..994e9df 100755
--- a/doc/add_dbhh.pl
+++ b/doc/add_dbhh.pl
@@ -10,12 +10,14 @@ use Getopt::Long;
 
 my $indent = 2;
 my $out_dir = 'output';
+my $map_file = 'hhmap';
 
 binmode(STDOUT, ":utf8");
 
 GetOptions(
     'indent=s'  => \$indent,
     'out-dir=s' => \$out_dir,
+    'map-file=s' => \$map_file,
 );
 
 my @list;
@@ -37,6 +39,7 @@ sub start {
 my $id = 10;
 
 mkdir $out_dir;
+open MAP, '>:utf8', "$map_file";
 
 foreach my $file (<*.xml>) {
     open FH, "<:utf8", $file;
@@ -61,6 +64,7 @@ foreach my $file (<*.xml>) {
         my ($offset, $column, $name) = @$sect;
         print FH substr($xml, $last, ($offset - $last));
         print FH "\n" . (' ' x ($column + $indent)) . "<?dbhh topicname=\"$name\" topicid=\"$id\"?>\n";
+        print MAP "$id\t$name\n";
         $last = $offset;
         ++$id;
     }
@@ -69,5 +73,6 @@ foreach my $file (<*.xml>) {
 
     close FH;
 }
+close MAP;
 
 # vi: set autoindent shiftwidth=4 tabstop=8 softtabstop=4 expandtab:
diff --git a/doc/gnumeric-doc.make b/doc/gnumeric-doc.make
index 78bf169..74ecdee 100644
--- a/doc/gnumeric-doc.make
+++ b/doc/gnumeric-doc.make
@@ -56,10 +56,12 @@ validate :
 # http://frogleg.mvps.org/helptechnologies/htmlhelp/hhtutorials.html
 # --param htmlhelp.force.map.and.alias 1
 chm :
-	-rm -rf chm
-	mkdir -p chm && cd chm && xsltproc -o . 	\
+	-rm -rf chm output
+	mkdir -p chm
+	cd $(srcdir) ; ../add_dbhh.pl --out-dir=$(abs_builddir)/output --map-file=$(abs_builddir)/chm/gnumeric.hhmap
+	cd chm && xsltproc -o . 	\
 	    $(srcdir)/../gnumeric-docbook-2-htmlhelp.xsl\
-	    $(srcdir)/../gnumeric.xml
+	    ../output/gnumeric.xml
 	xmllint --valid --noout --html chm/*.html
 	for f in chm/*.html; do				\
 	    xmllint --format --html "$$f" > chm/.$$$$;	\
diff --git a/tools/win32/Makefile.am b/tools/win32/Makefile.am
index a8ddded..f436ad8 100755
--- a/tools/win32/Makefile.am
+++ b/tools/win32/Makefile.am
@@ -1,10 +1,16 @@
 EXTRA_DIST = gnumeric.nsi.in
 
-WINEDIR=${HOME}/.wine/drive_c
+sandbox		= ${HOME}/win32/debug
+
+export WINEPREFIX	= ${sandbox}/wine
+export WINEDIR		= ${WINEPREFIX}/drive_c
+export py_pkg		= "http://www.python.org/ftp/python/2.6.3/python-2.6.3.msi";
 
 setup :
-	if [ ! -L Python25 ]; then		ln -s ${WINEDIR}/Python25 ; fi
-	if [ ! -d bin ]; then			mkdir bin; fi
-	if [ ! -d bin/libpython25.dll ]; then (	cd bin ; ln -s ${WINEDIR}/windows/system32/python25.dll libpython25.dll ) ; fi
-	if [ ! -d lib ]; then			mkdir lib; fi
-	if [ ! -d lib/libpython25.a ]; then (	cd lib ; ln -s ${WINEDIR}/Python25/libs/libpython25.a libpython25.a ) ; fi
+	cd ${sandbox} \
+	wine msiexec ~/Desktop/python-2.6.3.msi	\
+	if [ ! -L Python26 ]; then		ln -s ${WINEDIR}/Python26 ; fi	\
+	if [ ! -d bin ]; then			mkdir bin; fi	\
+	if [ ! -d bin/libpython26.dll ]; then (	cd bin ; ln -s ${WINEDIR}/windows/system32/python26.dll libpython26.dll ) ; fi	\
+	if [ ! -d lib ]; then			mkdir lib; fi	\
+	if [ ! -d lib/libpython26.a ]; then (	cd lib ; ln -s ${WINEDIR}/Python26/libs/python26.lib libpython26.dll.a ) ; fi
diff --git a/tools/win32/gnumeric.nsi.in b/tools/win32/gnumeric.nsi.in
index 96e5005..792d0ee 100644
--- a/tools/win32/gnumeric.nsi.in
+++ b/tools/win32/gnumeric.nsi.in
@@ -17,8 +17,8 @@ SetCompressor /SOLID lzma
 
 !define GOFFICE_VERSION		"@GOFFICE_VERSION@"
 
-!define GTK_VERSION		"2.16"
-!define GTK_VENDORRC		"1"
+!define GTK_VERSION		"2.18"
+!define GTK_VENDORRC		"2"
 !define GTK_VENDORVERSION	"${GTK_VERSION}.${GTK_VENDORRC}"
 
 ; MUI 1.67 compatible ------
@@ -131,10 +131,11 @@ Section "Gnumeric (required)" SEC01
     ;ExecWait "${GNM_ROOT}\gtk-update-icon-cache.exe ${GNM_ROOT}\share\icons\gnome"
     ;ExecWait "${GNM_ROOT}\gtk-update-icon-cache.exe ${GNM_ROOT}\share\icons\hicolor"
 
-    WriteRegStr HKCR "GNOME.Gnumeric"			"" "Gnumeric Spreadsheet"
-    WriteRegStr HKCR "GNOME.Gnumeric\shell"		"" "Open"
-    WriteRegStr HKCR "GNOME.Gnumeric\DefaultIcon"		"" "${GNM_ROOT}\bin\gnumeric.exe,0"
-    WriteRegStr HKCR "GNOME.Gnumeric\shell\Open\command"	"" '"${GNM_ROOT}\bin\gnumeric.exe" "%1"'
+    WriteRegStr HKCR "GNOME.Gnumeric"					"" "Gnumeric Spreadsheet"
+    WriteRegStr HKCR "GNOME.Gnumeric\shell"				"" "Open"
+    WriteRegStr HKCR "GNOME.Gnumeric\DefaultIcon"			"" "${GNM_ROOT}\bin\gnumeric.exe,0"
+    WriteRegStr HKCR "GNOME.Gnumeric\shell\Open\command"		"" '"${GNM_ROOT}\bin\gnumeric.exe" "%1"'
+    WriteRegStr HKCR "Applications\gnumeric.exe\shell\Open\command"	"" '"${GNM_ROOT}\bin\gnumeric.exe" "%1"'
 SectionEnd
 
 #############################################################################
diff --git a/tools/win32/jhbuildrc-debug b/tools/win32/jhbuildrc-debug
index daf4db3..dc106d5 100644
--- a/tools/win32/jhbuildrc-debug
+++ b/tools/win32/jhbuildrc-debug
@@ -117,7 +117,7 @@ module_autogenargs['libxml2']	= autogenargs + """ --disable-scrollkeeper --witho
 autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
 
 module_autogenargs['atk']	= autogenargs + """ --disable-glibtest"""
-module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --without-libjasper"""
+module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --without-libjasper  --without-libtiff --without-libjpeg"""
 
 module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda --without-java"""
 module_autogenargs['pxlib']	= autogenargs + """ --with-gsf=""" + prefix
diff --git a/tools/win32/jhbuildrc-release b/tools/win32/jhbuildrc-release
index 25934fa..95a6938 100644
--- a/tools/win32/jhbuildrc-release
+++ b/tools/win32/jhbuildrc-release
@@ -117,7 +117,7 @@ module_autogenargs['libxml2']	= autogenargs + """ --disable-scrollkeeper --witho
 autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
 
 module_autogenargs['atk']	= autogenargs + """ --disable-glibtest"""
-module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --without-libjasper"""
+module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --without-libjasper  --without-libtiff --without-libjpeg"""
 
 module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda --without-java"""
 module_autogenargs['pxlib']	= autogenargs + """ --with-gsf=""" + prefix
diff --git a/tools/win32/moduleset b/tools/win32/moduleset
index cc54486..494eb52 100644
--- a/tools/win32/moduleset
+++ b/tools/win32/moduleset
@@ -32,25 +32,22 @@
 	<dependencies/>
     </tarball>
 
-    <tarball id="pcre" version="7.8">
-	<source href="http://downloads.sourceforge.net/pcre/pcre-7.8.tar.bz2"/>
+    <tarball id="pcre" version="7.9">
+	<source href="http://downloads.sourceforge.net/pcre/pcre-7.9.tar.bz2"/>
     </tarball>
     <autotools id="gtk-doc">
 	<branch module="gtk-doc" checkoutdir="gtk-doc"/>
-	<dependencies>
-	    <dep package="glib"/>
-	</dependencies>
     </autotools>
 
     <autotools id="glib">
-	<branch repo="gnome.org" module="sources/glib/2.20/glib-2.20.4.tar.bz2" version="2.20.4">
+	<branch repo="gnome.org" module="sources/glib/2.22/glib-2.22.2.tar.bz2" version="2.22.2">
 	    <patch file="&patch_dir;glib-win32-cachefile.patch.gz"/>
 	    <patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	</branch>
 	<dependencies>
 	    <dep package="gettext"/>
 	    <dep package="iconv"/>
-<!--	    <dep package="gtk-doc"/> -->
+	    <dep package="gtk-doc"/>
 	</dependencies>
     </autotools>
 
@@ -73,14 +70,13 @@
 
 <!-- Image formats  -->
     <tarball id="jpeg" version="6b" checkoutdir="jpeg-6b">
-	<source href="http://www.ijg.org/files/jpegsrc.v6b.tar.gz";
-		md5sum="dbd5f3b47ed13132f04c685d608a7547"/>
+	<source href="http://www.ijg.org/files/jpegsrc.v7.tar.gz"/>
 	<patches>
 	    <patch file="http://gnome.org/~aruiz/gtk+/patches/jpeg_mingwport.patch"; strip="1"/>
 	</patches>
     </tarball>
-    <tarball id="png" version="1.2.37">
-	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.37.tar.bz2"/>
+    <tarball id="png" version="1.2.40">
+	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.40.tar.bz2"/>
 	<dependencies>
 	    <dep package="zlib"/>
 	</dependencies>
@@ -131,8 +127,8 @@
     </autotools>
     <autotools id="libthai">
 	<branch repo="debian"
-		module="libt/libthai/libthai_0.1.11.orig.tar.gz"
-		version="0.1.11" checkoutdir="libthai-0.1.11">
+		module="libt/libthai/libthai_0.1.12.orig.tar.gz"
+		version="0.1.12" checkoutdir="libthai-0.1.12">
 	    <patch file="&patch_dir;libthai.patch"/>
 	</branch>
 	<dependencies>
@@ -186,15 +182,15 @@
     </autotools>
 
     <autotools id="atk">
-	<branch repo="gnome.org" module="sources/atk/2.26/atk-1.26.0.tar.bz2" version="1.26.0"/>
+	<branch repo="gnome.org" module="sources/atk/1.28/atk-1.28.0.tar.bz2" version="1.28.0"/>
 	<dependencies>
 	    <dep package="glib"/>
 	</dependencies>
     </autotools>
 
     <autotools id="gtk+">
-	<branch repo="gnome.org" module="sources/gtk+/2.16/gtk+-2.16.2.tar.bz2"
-		version="2.16.2">
+	<branch repo="gnome.org" module="sources/gtk+/2.18/gtk+-2.18.2.tar.bz2"
+		version="2.18.2">
 	    <patch file="&patch_dir;gtk-disable-demo.patch"/>
 	</branch>
 	<dependencies>
@@ -223,8 +219,8 @@
 <!-- python stack -->
     <autotools id="pygobject" 
 	autogen-sh="autoreconf" skip-autogen="never">
-	<branch repo="gnome.org" module="sources/pygobject/2.16/pygobject-2.16.1.tar.bz2"
-		version="2.16.1">
+	<branch repo="gnome.org" module="sources/pygobject/2.20/pygobject-2.20.0.tar.bz2"
+		version="2.20.0">
 	    <patch file="&patch_dir;pygobject.patch"/>
 	</branch>
 
@@ -234,8 +230,8 @@
     </autotools>
 
     <autotools id="libgda">
-	<branch repo="gnome.org" module="sources/libgda/4.1/libgda-4.1.0.tar.bz2"
-		version="4.1.0">
+	<branch repo="gnome.org" module="sources/libgda/4.1/libgda-4.1.2.tar.bz2"
+		version="4.1.2">
 	</branch>
 	<dependencies>
 	    <dep package="glib"/>
@@ -257,19 +253,22 @@
     <tarball id="pxlib" version="0.6.3">
 	<source href="http://superb-east.dl.sourceforge.net/sourceforge/pxlib/pxlib-0.6.3.tar.gz";
 		md5sum="0742020854496fa757d7acbe6a895224"/>
+	<patches>
+	    <patch file="&patch_dir;pxlib.patch"/>
+	</patches>
     </tarball>
 
     <autotools id="psiconv">
 	<branch repo="debian"
-		module="p/psiconv/psiconv_0.9.8.orig.gz"
+		module="p/psiconv/psiconv_0.9.8.orig.tar.gz"
 		version="0.9.8" checkoutdir="psiconv-0.9.8">
 	    <patch file="&patch_dir;psiconv.patch"/>
 	</branch>
     </autotools>
 
 <!-- print preview -->
-  <tarball id="poppler" version="0.10.5">
-    <source href="http://poppler.freedesktop.org/poppler-0.10.5.tar.gz"/>
+  <tarball id="poppler" version="0.12.0">
+    <source href="http://poppler.freedesktop.org/poppler-0.12.0.tar.gz"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="glib"/>
@@ -282,6 +281,9 @@
     <after>
       <dep package="gtk+"/>
     </after>
+    <patches>
+	<patch file="&patch_dir;poppler-is-same-color.patch"/>
+    </patches>
   </tarball>
   <autotools id="evince">
     <branch/>
@@ -324,7 +326,6 @@
 	    <dep package="pcre"/>
 	    <dep package="libxml2"/>
 	    <dep package="pango"/>
-	    <dep package="libglade"/>
 	    <dep package="lasem"/>
 	</dependencies>
     </autotools>
@@ -332,9 +333,10 @@
 	<branch/>
 	<dependencies>
 	    <dep package="goffice"/>
+	    <dep package="libglade"/>
 	</dependencies>
 	<suggests>
-	    <dep package="libgnomedb"/>
+<!--	    <dep package="libgnomedb"/> -->
 	    <dep package="pxlib"/>
 	    <dep package="psiconv"/>
 	    <dep package="pygobject"/>
diff --git a/tools/win32/patches/pxlib-intl.patch b/tools/win32/patches/pxlib-intl.patch
index 62b4a8a..655e86e 100644
--- a/tools/win32/patches/pxlib-intl.patch
+++ b/tools/win32/patches/pxlib-intl.patch
@@ -1,19 +1,19 @@
-*** src/Makefile.in.orig	2007-10-01 03:26:59.000000000 -0400
---- src/Makefile.in	2009-05-08 21:56:16.000000000 -0400
+*** Makefile.am	Sun Oct  4 12:31:57 2009
+--- Makefile.am	Sun Oct  4 12:32:29 2009
 ***************
-*** 273,279 ****
+*** 33,39 ****
   		px_crypt.c \
   		gregor.c
   
 ! libpx_la_LIBADD = @RECODE_LIBS@ @GSF_LIBS@
+  
   BUILD_LIBS = -lm
-  all: all-am
   
---- 273,279 ----
+--- 33,39 ----
   		px_crypt.c \
   		gregor.c
   
 ! libpx_la_LIBADD = @RECODE_LIBS@ @GSF_LIBS@ -lintl -liconv
+  
   BUILD_LIBS = -lm
-  all: all-am
   
diff --git a/tools/win32/patches/pygobject.patch b/tools/win32/patches/pygobject.patch
index e26a855..c65d431 100644
--- a/tools/win32/patches/pygobject.patch
+++ b/tools/win32/patches/pygobject.patch
@@ -1,4 +1,4 @@
-*** m4/python.m4.orig	2009-05-04 20:36:02.000000000 -0400
+*** m4/python.m4	2009-05-04 20:36:02.000000000 -0400
 --- m4/python.m4	2009-05-04 20:40:46.000000000 -0400
 ***************
 *** 43,58 ****
@@ -36,3 +36,69 @@
   AC_SUBST(PYTHON_INCLUDES)
   dnl check if the headers exist:
   save_CPPFLAGS="$CPPFLAGS"
+***************
+*** 235,250 ****
+  [AC_REQUIRE([AM_PATH_PYTHON])
+  AC_MSG_CHECKING(for headers required to compile python extensions)
+  dnl deduce PYTHON_INCLUDES
+! py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+! py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
+! if test -x "$PYTHON-config"; then
+! PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+! else
+! PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+! if test "$py_prefix" != "$py_exec_prefix"; then
+!   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+! fi
+! fi
+  AC_SUBST(PYTHON_INCLUDES)
+  dnl check if the headers exist:
+  save_CPPFLAGS="$CPPFLAGS"
+--- 235,251 ----
+  [AC_REQUIRE([AM_PATH_PYTHON])
+  AC_MSG_CHECKING(for headers required to compile python extensions)
+  dnl deduce PYTHON_INCLUDES
+! dnl py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+! dnl py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
+! dnl if test -x "$PYTHON-config"; then
+! dnl PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+! dnl else
+! dnl PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+! dnl if test "$py_prefix" != "$py_exec_prefix"; then
+! dnl   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+! dnl fi
+! dnl fi
+! PYTHON_INCLUDES="-I${PY_INCLUDE_DIR}"
+  AC_SUBST(PYTHON_INCLUDES)
+  dnl check if the headers exist:
+  save_CPPFLAGS="$CPPFLAGS"
+*** configure.ac	Sun May 24 16:37:19 2009
+--- configure.ac	Wed Jul  1 09:21:25 2009
+***************
+*** 76,87 ****
+  JD_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+  
+  AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
+! py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+! if test -x "$PYTHON-config"; then
+! PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+! else
+! PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+! fi
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
+  AC_TRY_COMPILE([#include <Python.h>],
+--- 76,88 ----
+  JD_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+  
+  AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
+! dnl py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+! dnl if test -x "$PYTHON-config"; then
+! dnl PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+! dnl else
+! dnl PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+! dnl fi
+! PYTHON_INCLUDES="-I${PY_INCLUDE_DIR}"
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
+  AC_TRY_COMPILE([#include <Python.h>],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]