gnumeric r16703 - in trunk: . tools/win32 tools/win32/patches

From: jody svn gnome org
To: svn-commits-list gnome org
Subject: gnumeric r16703 - in trunk: . tools/win32 tools/win32/patches
Date: Wed, 9 Jul 2008 02:07:07 +0000 (UTC)
Author: jody
Date: Wed Jul  9 02:07:07 2008
New Revision: 16703
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16703&view=rev

Log:
* 20080707 debug package
- convert zlib to autotools package so that the makeinstallflags works
- surgery on libbz2 to make it work
- make pygobject and libgnomedb turnkey
- add comments to remind that gnumeric patch is manual
- remove unncessary goffice patch.

Added:
   trunk/tools/win32/patches/gnumeric-pending-win32-fixes.patch
   trunk/tools/win32/patches/libbz2.patch
   trunk/tools/win32/patches/zlib.patch
Removed:
   trunk/tools/win32/patches/goffice-remove-gtk-doc-test.patch
Modified:
   trunk/configure.in
   trunk/tools/win32/gnumeric.nsi.in
   trunk/tools/win32/jhbuildrc
   trunk/tools/win32/moduleset
   trunk/tools/win32/patches/libgnomedb.patch
   trunk/tools/win32/patches/pygobject.patch

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jul  9 02:07:07 2008
@@ -1021,6 +1021,8 @@
 dnl **************************************************
 GOFFICE_PLUGINS_DIR=`pkg-config --variable=GOffice_plugins_dir $libgoffice`
 AC_SUBST(GOFFICE_PLUGINS_DIR)
+GOFFICE_VERSION=`pkg-config --modversion $libgoffice`
+AC_SUBST(GOFFICE_VERSION)
 
 dnl **************************************************
 dnl * Config defaults (Must be after bonobo)

Modified: trunk/tools/win32/gnumeric.nsi.in
==============================================================================
--- trunk/tools/win32/gnumeric.nsi.in	(original)
+++ trunk/tools/win32/gnumeric.nsi.in	Wed Jul  9 02:07:07 2008
@@ -8,7 +8,7 @@
 !define GNM_LONGNAME		"Gnumeric Spreadsheet"
 !define GNM_APPNAME		"Gnumeric Spreadsheet"
 !define GNM_VERSION		"@VERSION@"
-!define GNM_VERSION_TAG		"win32-1"
+!define GNM_VERSION_TAG		"20080707-debug"
 !define GNM_VERSION_FULL	"${GNM_VERSION}-${GNM_VERSION_TAG}"
 !define GNM_UNINST_KEY		"Software\Microsoft\Windows\CurrentVersion\Uninstall\${GNM_NAME}"
 !define GNM_STARTMENU_REG_VAL	"NSIS:StartMenuDir"
@@ -17,8 +17,8 @@
 
 !define GOFFICE_VERSION		"@GOFFICE_VERSION@"
 
-!define GTK_VERSION		"2.10"
-!define GTK_VENDORRC		"14"
+!define GTK_VERSION		"2.13"
+!define GTK_VENDORRC		"4"
 !define GTK_VENDORVERSION	"${GTK_VERSION}.${GTK_VENDORRC}"
 
 ; MUI 1.67 compatible ------
@@ -69,7 +69,7 @@
 Name "${GNM_LONGNAME} ${GNM_VERSION_FULL}"
 OutFile			"gnumeric-${GNM_VERSION_FULL}.exe"
 Icon			"share\pixmaps\win32-gnumeric.ico"
-InstallDir		"C:\Program Files\${GNM_NAME}"
+InstallDir		"$PROGRAMFILES\${GNM_NAME}"
 InstallDirRegKey	HKLM "Software\GNOME\${GNM_NAME}" "Path"
 ShowInstDetails		hide
 ShowUnInstDetails	show

Modified: trunk/tools/win32/jhbuildrc
==============================================================================
--- trunk/tools/win32/jhbuildrc	(original)
+++ trunk/tools/win32/jhbuildrc	Wed Jul  9 02:07:07 2008
@@ -48,9 +48,9 @@
 
 #Exporting tool flags enviroment variables
 os.environ['LDFLAGS']	 = ' -mno-cygwin -L'+prefix+'/lib  -no-undefined'
-os.environ['CFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 ' 
-os.environ['CPPFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686'
-os.environ['CXXFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 '
+os.environ['CFLAGS']	 = ' -O0 -gstabs -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 ' 
+os.environ['CPPFLAGS']	 = ' -O0 -gstabs -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686'
+os.environ['CXXFLAGS']	 = ' -O0 -gstabs -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 '
 os.environ['ARFLAGS']	 = 'rcs'
 os.environ['INSTALL']	 = os.path.expanduser('~/bin/install-check')
 os.environ['ACLOCAL_AMFLAGS'] = ' -I '+prefix+'/share/aclocal'	# for libgnomedb

Modified: trunk/tools/win32/moduleset
==============================================================================
--- trunk/tools/win32/moduleset	(original)
+++ trunk/tools/win32/moduleset	Wed Jul  9 02:07:07 2008
@@ -6,6 +6,10 @@
 <moduleset>
     <repository type="svn" name="svn.gnome.org" default="yes"
 		href="http://svn.gnome.org/svn/"/>
+    <repository type="tarball" name="gnome.org"
+		href="http://download.gnome.org/sources"/>
+    <repository type="tarball" name="zlib.net"
+		href="http://www.zlib.net"/>
     <repository type="git" name="freedesktop.org"
 		href="git://cgit.freedesktop.org/git"/>
 
@@ -34,30 +38,19 @@
 	    <patch file="&patch_dir;pcre.patch"/>
 	</patches>
     </tarball>
-    <!--
-    <tarball id="glib" version="2.14.6">
-	<source href="http://download.gnome.org/sources/glib/2.14/glib-2.14.6.tar.bz2";
-		md5sum="3b340946d6916ee9cbf2c348e7c099f1"/>
-	<patches>
-		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch"/>
-		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
-	</patches>
-	<dependencies>
-	    <dep package="gettext"/>
-	    <dep package="iconv"/>
-	</dependencies>
-    </tarball>
-    -->
     <autotools id="gtk-doc">
 	<branch module="gtk-doc/trunk" checkoutdir="gtk-doc"/>
 	<dependencies>
 	</dependencies>
     </autotools>
     <autotools id="glib">
-	<branch/>
-	<patches>
+	<branch>
+	    <patches>
+		<!-- APPLY MANUALLY -->
 		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch.gz"/>
-	</patches>
+		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
+	    </patches>
+	</branch>
 	<dependencies>
 	    <dep package="gettext"/>
 	    <dep package="gtk-doc"/>
@@ -65,20 +58,35 @@
 	</dependencies>
     </autotools>
 
-<!-- Compression -->
-    <tarball id="zlib" version="1.2.3" makeargs="-f win32/Makefile.gcc -e zlib1.dll" makeinstallargs="-f win32/Makefile.gcc -e install">
-	<source href="http://www.zlib.net/zlib-1.2.3.tar.gz";
-		md5sum="debc62758716a169df9f62e6ab2bc634"/>
+    <!--
+    <tarball id="glib" version="2.14.6">
+	<source href="http://download.gnome.org/sources/glib/2.14/glib-2.14.6.tar.bz2";
+		md5sum="3b340946d6916ee9cbf2c348e7c099f1"/>
 	<patches>
-	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/zlib_mingw.patch"/>
+		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch"/>
+		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	</patches>
+	<dependencies>
+	    <dep package="gettext"/>
+	    <dep package="iconv"/>
+	</dependencies>
     </tarball>
-    <tarball id="libbz2" version="1.0.4">
-	<source href="http://www.bzip.org/1.0.4/bzip2-1.0.4.tar.gz";
-		md5sum="fc310b254f6ba5fbb5da018f04533688"/>
+    -->
+
+<!-- Compression -->
+    <autotools id="zlib"
+	makeargs="-f win32/Makefile.gcc"
+	makeinstallargs="-f win32/Makefile.gcc -e install">
+	<branch repo="zlib.net" module="zlib-1.2.3.tar.gz"
+		version="1.2.3"
+		md5sum="debc62758716a169df9f62e6ab2bc634">
+	    <patch file="&patch_dir;zlib.patch"/>
+	</branch>
+    </autotools>
+    <tarball id="libbz2" version="1.0.5">
+	<source href="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz"/>
 	<patches>
-	    <patch file="&patch_dir;libbz-win32.patch.gz"/>
-	    <patch file="&patch_dir;libbz-configure.patch.gz"/>
+	    <patch file="&patch_dir;libbz2.patch"/>
 	</patches>
     </tarball>
 
@@ -134,9 +142,15 @@
 	</patches>
     </tarball>
 
+    <autotools id="gnome-common">
+	<branch/>
+	<dependencies>
+	</dependencies>
+    </autotools>
     <autotools id="intltool">
 	<branch/>
 	<dependencies>
+	    <dep package="gnome-common"/>
 	</dependencies>
     </autotools>
 
@@ -230,18 +244,18 @@
 	    <dep package="libxml2"/>
 	</dependencies>
     </tarball>
-    <tarball id="libgnomedb" version="trunk">
-	<source href="http://download.gnome.org/sources/libgnomedb/3.1/libgnomedb-3.1.2.tar.bz2";
-		md5sum="9896bd66451c3f1e2bdd1cd79d524348"/>
-	<patches>
+    <autotools id="libgnomedb" version="trunk"
+	autogen-sh="autoreconf">
+	<branch repo="gnome.org" module="libgnomedb/3.1/libgnomedb-3.1.2.tar.bz2"
+		version="3.1.2">
 	    <patch file="&patch_dir;libgnomedb.patch"/>
-	</patches>
+	</branch>
 	<dependencies>
 	    <dep package="intltool"/>
 	    <dep package="libgda"/>
 	    <dep package="gtk+"/>
 	</dependencies>
-    </tarball>
+    </autotools>
 
     <tarball id="pxlib" version="0.6.3">
 	<source href="http://superb-east.dl.sourceforge.net/sourceforge/pxlib/pxlib-0.6.3.tar.gz";
@@ -287,11 +301,12 @@
 	    <dep package="intltool"/>
 	</dependencies>
 	<patches>
-	    <patch file="&patch_dir;goffice.patch"/>
 	</patches>
     </autotools>
     <autotools id="gnumeric" version="trunk">
-	<branch/>
+	<branch>
+	    <patch file="&patch_dir;gnumeric-pending-win32-fixes.patch"/>
+	</branch>
 	<dependencies>
 	    <dep package="goffice"/>
 	</dependencies>

Added: trunk/tools/win32/patches/gnumeric-pending-win32-fixes.patch
==============================================================================
--- (empty file)
+++ trunk/tools/win32/patches/gnumeric-pending-win32-fixes.patch	Wed Jul  9 02:07:07 2008
@@ -0,0 +1,39 @@
+patches/gnumeric-pending-win32-fixes.patch
+===================================================================
+--- src/print-cell.c	(revision 16464)
++++ src/print-cell.c	(working copy)
+@@ -118,7 +118,7 @@
+ 
+ 		/* Clip the printed rectangle */
+ 		cairo_save (context);
+-
++#if 0
+ 		if (!rv->rotation) {
+ 			/* We do not clip rotated cells.  */
+ 			cairo_new_path (context);
+@@ -126,7 +126,7 @@
+ 					 width + 1, height + 1);
+ 			cairo_clip (context);
+ 		}
+-
++#endif
+ 		/* Set the font colour */
+ 		cairo_set_source_rgb (context,
+ 			 UINT_RGBA_R (fore_color) / 255.,
+Index: src/main-application.c
+===================================================================
+--- src/main-application.c	(revision 16464)
++++ src/main-application.c	(working copy)
+@@ -189,6 +189,12 @@
+ 	g_option_context_add_main_entries (ocontext, gnumeric_options, GETTEXT_PACKAGE);
+ 	g_option_context_add_group	  (ocontext, gnm_get_option_group ());
+ 
++#ifdef G_OS_WIN32
++	/* we have already translated to utf8, do not do it again.
++	 * http://bugzilla.gnome.org/show_bug.cgi?id=361321 */
++	g_option_context_set_delocalize   (ocontext, FALSE);
++#endif
++
+ #ifdef GNM_WITH_GNOME
+ #ifndef GNOME_PARAM_GOPTION_CONTEXT
+ 	/*

Added: trunk/tools/win32/patches/libbz2.patch
==============================================================================
--- (empty file)
+++ trunk/tools/win32/patches/libbz2.patch	Wed Jul  9 02:07:07 2008
@@ -0,0 +1,192 @@
+diff -c bzip2.c bzip2.c
+*** bzip2.c	2007-12-09 07:22:06.000000000 -0500
+--- bzip2.c	2008-07-05 21:53:05.000000000 -0400
+***************
+*** 128,134 ****
+  #if BZ_LCCWIN32
+  #   include <io.h>
+  #   include <fcntl.h>
+! #   include <sys\stat.h>
+  
+  #   define NORETURN       /**/
+  #   define PATH_SEP       '\\'
+--- 128,134 ----
+  #if BZ_LCCWIN32
+  #   include <io.h>
+  #   include <fcntl.h>
+! #   include <sys/stat.h>
+  
+  #   define NORETURN       /**/
+  #   define PATH_SEP       '\\'
+diff -c Makefile Makefile
+*** Makefile	2008-02-14 07:39:18.000000000 -0500
+--- Makefile	2008-07-05 22:28:46.000000000 -0400
+***************
+*** 15,31 ****
+  SHELL=/bin/sh
+  
+  # To assist in cross-compiling
+! CC=gcc
+! AR=ar
+! RANLIB=ranlib
+  LDFLAGS=
+  
+  BIGFILES=-D_FILE_OFFSET_BITS=64
+  CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
+  
+  # Where you want it installed when you do 'make install'
+! PREFIX=/usr/local
+  
+  
+  OBJS= blocksort.o  \
+        huffman.o    \
+--- 15,33 ----
+  SHELL=/bin/sh
+  
+  # To assist in cross-compiling
+! #CC=gcc
+! #AR=ar
+! #RANLIB=ranlib
+  LDFLAGS=
+  
+  BIGFILES=-D_FILE_OFFSET_BITS=64
+  CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
+  
+  # Where you want it installed when you do 'make install'
+! PREFIX=$(prefix)
+  
++ RC =i586-mingw32msvc-windres
++ RCFLAGS = --define GCC_WINDRES
+  
+  OBJS= blocksort.o  \
+        huffman.o    \
+***************
+*** 33,56 ****
+        randtable.o  \
+        compress.o   \
+        decompress.o \
+        bzlib.o
+  
+! all: libbz2.a bzip2 bzip2recover test
+  
+! bzip2: libbz2.a bzip2.o
+  	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+  
+  bzip2recover: bzip2recover.o
+  	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
+  
+! libbz2.a: $(OBJS)
+! 	rm -f libbz2.a
+! 	$(AR) cq libbz2.a $(OBJS)
+! 	@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
+! 		-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
+! 		echo $(RANLIB) libbz2.a ; \
+! 		$(RANLIB) libbz2.a ; \
+! 	fi
+  
+  check: test
+  test: bzip2
+--- 35,58 ----
+        randtable.o  \
+        compress.o   \
+        decompress.o \
++       bz2librc.o   \
+        bzlib.o
+  
+! SHAREDLIB = libbz2.dll
+! IMPLIB    = libbz2.lib
+  
+! all: bzip2 bzip2recover test $(SHAREDLIB) $(IMPLIB)
+! 
+! bzip2: libbz2.dll bzip2.o
+  	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+  
+  bzip2recover: bzip2recover.o
+  	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
+  
+! $(IMPLIB): $(SHAREDLIB)
+! 
+! $(SHAREDLIB): $(OBJS)
+! 	$(CC) -shared -o $@ $(OBJS)
+  
+  check: test
+  test: bzip2
+***************
+*** 72,115 ****
+  install: bzip2 bzip2recover
+  	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+  	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+- 	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+- 	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+  	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+- 	cp -f bzip2 $(PREFIX)/bin/bzip2
+- 	cp -f bzip2 $(PREFIX)/bin/bunzip2
+- 	cp -f bzip2 $(PREFIX)/bin/bzcat
+- 	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
+- 	chmod a+x $(PREFIX)/bin/bzip2
+- 	chmod a+x $(PREFIX)/bin/bunzip2
+- 	chmod a+x $(PREFIX)/bin/bzcat
+- 	chmod a+x $(PREFIX)/bin/bzip2recover
+- 	cp -f bzip2.1 $(PREFIX)/man/man1
+- 	chmod a+r $(PREFIX)/man/man1/bzip2.1
+  	cp -f bzlib.h $(PREFIX)/include
+  	chmod a+r $(PREFIX)/include/bzlib.h
+! 	cp -f libbz2.a $(PREFIX)/lib
+! 	chmod a+r $(PREFIX)/lib/libbz2.a
+! 	cp -f bzgrep $(PREFIX)/bin/bzgrep
+! 	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+! 	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+! 	chmod a+x $(PREFIX)/bin/bzgrep
+! 	cp -f bzmore $(PREFIX)/bin/bzmore
+! 	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+! 	chmod a+x $(PREFIX)/bin/bzmore
+! 	cp -f bzdiff $(PREFIX)/bin/bzdiff
+! 	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+! 	chmod a+x $(PREFIX)/bin/bzdiff
+! 	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+! 	chmod a+r $(PREFIX)/man/man1/bzgrep.1
+! 	chmod a+r $(PREFIX)/man/man1/bzmore.1
+! 	chmod a+r $(PREFIX)/man/man1/bzdiff.1
+! 	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
+! 	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+! 	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+! 	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
+  
+  clean: 
+! 	rm -f *.o libbz2.a bzip2 bzip2recover \
+  	sample1.rb2 sample2.rb2 sample3.rb2 \
+  	sample1.tst sample2.tst sample3.tst
+  
+--- 74,87 ----
+  install: bzip2 bzip2recover
+  	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+  	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+  	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+  	cp -f bzlib.h $(PREFIX)/include
+  	chmod a+r $(PREFIX)/include/bzlib.h
+! 	cp -f libbz2.dll $(PREFIX)/bin
+! 	chmod a+r $(PREFIX)/bin/libbz2.dll
+  
+  clean: 
+! 	rm -f *.o libbz2.dll bzip2 bzip2recover \
+  	sample1.rb2 sample2.rb2 sample3.rb2 \
+  	sample1.tst sample2.tst sample3.tst
+  
+***************
+*** 132,138 ****
+  	$(CC) $(CFLAGS) -c bzip2.c
+  bzip2recover.o: bzip2recover.c
+  	$(CC) $(CFLAGS) -c bzip2recover.c
+! 
+  
+  distclean: clean
+  	rm -f manual.ps manual.html manual.pdf
+--- 104,111 ----
+  	$(CC) $(CFLAGS) -c bzip2.c
+  bzip2recover.o: bzip2recover.c
+  	$(CC) $(CFLAGS) -c bzip2recover.c
+! bz2librc.o: libbz2.rc
+! 	$(RC) $(RCFLAGS) -o $@ $<
+  
+  distclean: clean
+  	rm -f manual.ps manual.html manual.pdf

Modified: trunk/tools/win32/patches/libgnomedb.patch
==============================================================================
--- trunk/tools/win32/patches/libgnomedb.patch	(original)
+++ trunk/tools/win32/patches/libgnomedb.patch	Wed Jul  9 02:07:07 2008
@@ -1,47 +1,76 @@
-Index: data/Makefile.am
-===================================================================
---- data/Makefile.am	(revision 1658)
-+++ data/Makefile.am	(working copy)
-@@ -15,8 +15,11 @@
- SUBDIRS = $(glade3_directory_16) $(glade3_directory_22)
- 
- # GConf schemas
-+scemas = libgnomedb-3.0.schemas
- schemadir   = $(GCONF_SCHEMA_FILE_DIR)
--schema_DATA = libgnomedb-3.0.schemas
-+if GCONF_SCHEMAS_INSTALL
-+schema_DATA = $(schemas)
-+endif
- 
- @INTLTOOL_SCHEMAS_RULE@
- 
-Index: configure.in
-===================================================================
---- configure.in	(revision 1658)
-+++ configure.in	(working copy)
-@@ -118,11 +118,23 @@
- ALL_LINGUAS="ar az be ca cs da de dz el en_CA en_GB es eu fa fi fr ga gl hr hu it ja ka ko lt ml ms nb ne nl pl pt pt_BR ru rw sk sl sq sr sr Latn sv ta tr uk vi zh_CN zh_HK zh_TW"
- AM_GLIB_GNU_GETTEXT
- 
-+dnl The following conditional is set in AM_GCONF_SOURCE_2.
-+dnl Because we may skip its execution, we have to set a default here.
-+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-+m4_pattern_allow([^AM_GCONF_SOURCE_2$])
-+
- dnl *******************************
- dnl GConf schemas
- dnl ******************************
--AC_PATH_PROG(GCONFTOOL, gconftool-2)
--AM_GCONF_SOURCE_2
-+dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired.
-+GCONFTOOL=
-+AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no])
-+if test "x$GCONFTOOL" = "xno"; then
-+    AC_MSG_WARN([Unable to find gconftool-2])
-+else
-+    AM_GCONF_SOURCE_2
-+fi
-+AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno")
- 
- dnl ******************************
- dnl Checks for GConf librarie
+diff -cr configure.in configure.in
+*** configure.in	2007-10-14 08:15:21.000000000 -0400
+--- configure.in	2008-07-07 13:07:14.000000000 -0400
+***************
+*** 119,142 ****
+  ALL_LINGUAS="ar az be ca cs da de dz el en_CA en_GB es eu fa fi fr ga gl hr hu it ja ka ko lt ml ms nb ne nl oc pl pt pt_BR ru rw sk sl sq sr sr Latn sv ta tr uk vi zh_CN zh_HK zh_TW"
+  AM_GLIB_GNU_GETTEXT
+  
+  dnl *******************************
+  dnl GConf schemas
+  dnl ******************************
+! AC_PATH_PROG(GCONFTOOL, gconftool-2)
+! AM_GCONF_SOURCE_2
+! 
+! dnl ******************************
+! dnl Checks for GConf librarie
+! dnl ******************************
+! 
+! GCONF_MODULES="gconf-2.0"
+! PKG_CHECK_MODULES(GCONF, $GCONF_MODULES, have_gconf=yes, have_gconf=no)
+! AM_CONDITIONAL(HAVE_GCONF, test x"$have_gconf" = "xyes")
+! if test x"$have_gconf" = "xyes"
+! then
+! 	GCONF_CFLAGS="$GCONF_CFLAGS -DHAVE_GCONF"
+!         LIBGNOMEDB_REQUIRES="$LIBGNOMEDB_REQUIRES $GCONF_MODULES"
+! fi
+  AC_SUBST(GCONF_CFLAGS)
+  AC_SUBST(GCONF_LIBS)
+  
+--- 119,139 ----
+  ALL_LINGUAS="ar az be ca cs da de dz el en_CA en_GB es eu fa fi fr ga gl hr hu it ja ka ko lt ml ms nb ne nl oc pl pt pt_BR ru rw sk sl sq sr sr Latn sv ta tr uk vi zh_CN zh_HK zh_TW"
+  AM_GLIB_GNU_GETTEXT
+  
++ dnl The following conditional is set in AM_GCONF_SOURCE_2.
++ dnl Because we may skip its execution, we have to set a default here.
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
++ m4_pattern_allow([^AM_GCONF_SOURCE_2$])
++ 
+  dnl *******************************
+  dnl GConf schemas
+  dnl ******************************
+! 
+! GCONFTOOL=
+! HAVE_GCONF=no
+! AM_CONDITIONAL(WITH_GCONF, false)
+! AM_CONDITIONAL(HAVE_GCONF, false)
+! GCONF_CFLAGS=
+! GCONF_LIBS=
+  AC_SUBST(GCONF_CFLAGS)
+  AC_SUBST(GCONF_LIBS)
+  
+diff -cr data/Makefile.am data/Makefile.am
+*** data/Makefile.am	2007-09-01 08:28:25.000000000 -0400
+--- data/Makefile.am	2008-07-07 13:01:35.000000000 -0400
+***************
+*** 15,22 ****
+  SUBDIRS = $(glade3_directory_16) $(glade3_directory_22)
+  
+  # GConf schemas
+  schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+! schema_DATA = libgnomedb-3.0.schemas
+  
+  @INTLTOOL_SCHEMAS_RULE@
+  
+--- 15,25 ----
+  SUBDIRS = $(glade3_directory_16) $(glade3_directory_22)
+  
+  # GConf schemas
++ schemas = libgnomedb-3.0.schemas
+  schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+! if GCONF_SCHEMAS_INSTALL
+! schema_DATA = $(schemas)
+! endif
+  
+  @INTLTOOL_SCHEMAS_RULE@
+  

Modified: trunk/tools/win32/patches/pygobject.patch
==============================================================================
--- trunk/tools/win32/patches/pygobject.patch	(original)
+++ trunk/tools/win32/patches/pygobject.patch	Wed Jul  9 02:07:07 2008
@@ -1,43 +1,107 @@
---- configure	2007-07-23 12:29:19.000000000 -0400
-+++ configure	2007-07-23 13:17:03.000000000 -0400
-@@ -9303,8 +9303,10 @@
- if test "${am_cv_python_pythondir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
--     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+#  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-+#     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+    am_cv_python_pythondir="$PY_PREFIX/Lib/site-packages"
-+    echo $am_cv_python_pythondir
- fi
- echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
- echo "${ECHO_T}$am_cv_python_pythondir" >&6
-@@ -9320,8 +9322,10 @@
- if test "${am_cv_python_pyexecdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
--     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
-+#  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-+#     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
-+  am_cv_python_pyexecdir="$PY_PREFIX/Lib/site-packages"
-+     echo "$am_cv_python_pyexecdir"
- fi
- echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
- echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
-@@ -9342,10 +9342,10 @@ echo "$as_me:$LINENO: checking for heade
- echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--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
-+PYTHON_INCLUDES="-I${PY_INCLUDE_DIR}"
-+
-+
-+
- 
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+diff -cr configure configure
+*** configure	2006-11-18 09:53:21.000000000 -0500
+--- configure	2008-07-08 14:33:23.000000000 -0400
+***************
+*** 9303,9310 ****
+  if test "${am_cv_python_pythondir+set}" = set; then
+    echo $ECHO_N "(cached) $ECHO_C" >&6
+  else
+!   am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+!      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+  fi
+  echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+  echo "${ECHO_T}$am_cv_python_pythondir" >&6
+--- 9303,9312 ----
+  if test "${am_cv_python_pythondir+set}" = set; then
+    echo $ECHO_N "(cached) $ECHO_C" >&6
+  else
+! #  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+! #     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+!     am_cv_python_pythondir="$PY_PREFIX/Lib/site-packages"
+!     echo $am_cv_python_pythondir
+  fi
+  echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+  echo "${ECHO_T}$am_cv_python_pythondir" >&6
+***************
+*** 9320,9327 ****
+  if test "${am_cv_python_pyexecdir+set}" = set; then
+    echo $ECHO_N "(cached) $ECHO_C" >&6
+  else
+!   am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+!      echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+  fi
+  echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+  echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
+--- 9322,9331 ----
+  if test "${am_cv_python_pyexecdir+set}" = set; then
+    echo $ECHO_N "(cached) $ECHO_C" >&6
+  else
+! #  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+! #     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+!   am_cv_python_pyexecdir="$PY_PREFIX/Lib/site-packages"
+!      echo "$am_cv_python_pyexecdir"
+  fi
+  echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+  echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
+***************
+*** 9340,9351 ****
+  
+  echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
+  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6
+! py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+! py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+! 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
+  
+  save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+--- 9344,9350 ----
+  
+  echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
+  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6
+! PYTHON_INCLUDES="-I${PY_INCLUDE_DIR}"
+  
+  save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+diff -cr gobject/Makefile.am gobject/Makefile.am
+*** gobject/Makefile.am	2006-10-03 10:03:43.000000000 -0400
+--- gobject/Makefile.am	2008-07-08 14:24:35.000000000 -0400
+***************
+*** 21,27 ****
+  
+  _gobject_la_CFLAGS = $(GLIB_CFLAGS)
+  _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject
+! _gobject_la_LIBADD = $(GLIB_LIBS)
+  _gobject_la_SOURCES = \
+  	gobjectmodule.c \
+  	pygboxed.c \
+--- 21,27 ----
+  
+  _gobject_la_CFLAGS = $(GLIB_CFLAGS)
+  _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject
+! _gobject_la_LIBADD = $(GLIB_LIBS) -lpython25
+  _gobject_la_SOURCES = \
+  	gobjectmodule.c \
+  	pygboxed.c \
+diff -cr tests/Makefile.am tests/Makefile.am
+*** tests/Makefile.am	2006-07-10 10:21:07.000000000 -0400
+--- tests/Makefile.am	2008-07-08 14:24:35.000000000 -0400
+***************
+*** 15,21 ****
+  linked_LIBS = testhelper.la
+  
+  testhelper_la_LDFLAGS = -module -avoid-version
+! testhelper_la_LIBADD = $(GLIB_LIBS)
+  testhelper_la_SOURCES = \
+  	testhelpermodule.c \
+  	test-thread.c \
+--- 15,21 ----
+  linked_LIBS = testhelper.la
+  
+  testhelper_la_LDFLAGS = -module -avoid-version
+! testhelper_la_LIBADD = $(GLIB_LIBS) -lpython25
+  testhelper_la_SOURCES = \
+  	testhelpermodule.c \
+  	test-thread.c \

Added: trunk/tools/win32/patches/zlib.patch
==============================================================================
--- (empty file)
+++ trunk/tools/win32/patches/zlib.patch	Wed Jul  9 02:07:07 2008
@@ -0,0 +1,136 @@
+diff -cNr win32/Makefile.gcc win32/Makefile.gcc
+*** win32/Makefile.gcc	2003-08-01 23:49:00.000000000 -0400
+--- win32/Makefile.gcc	2008-07-06 10:55:58.000000000 -0400
+***************
+*** 24,37 ****
+  # the DLL name should be changed from "zlib1.dll".
+  
+  STATICLIB = libz.a
+! SHAREDLIB = zlib1.dll
+! IMPLIB    = libzdll.a
+  
+  #LOC = -DASMV
+  #LOC = -DDEBUG -g
+  
+! CC = gcc
+! CFLAGS = $(LOC) -O3 -Wall
+  
+  AS = $(CC)
+  ASFLAGS = $(LOC) -Wall
+--- 24,37 ----
+  # the DLL name should be changed from "zlib1.dll".
+  
+  STATICLIB = libz.a
+! SHAREDLIB = libz.dll
+! IMPLIB    = libz.dll.a
+  
+  #LOC = -DASMV
+  #LOC = -DDEBUG -g
+  
+! #CC = gcc
+! #CFLAGS = $(LOC) -O3 -Wall
+  
+  AS = $(CC)
+  ASFLAGS = $(LOC) -Wall
+***************
+*** 42,63 ****
+  AR = ar
+  ARFLAGS = rcs
+  
+! RC = windres
+  RCFLAGS = --define GCC_WINDRES
+  
+  CP = cp -fp
+  # If GNU install is available, replace $(CP) with install.
+  INSTALL = $(CP)
+  RM = rm -f
+  
+! prefix = /usr/local
+! exec_prefix = $(prefix)
+  
+  OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \
+         inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+  OBJA =
+  
+! all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example minigzip example_d minigzip_d
+  
+  test: example minigzip
+  	./example
+--- 42,67 ----
+  AR = ar
+  ARFLAGS = rcs
+  
+! RC =i586-mingw32msvc-windres
+  RCFLAGS = --define GCC_WINDRES
+  
++ #DLLWRAP = dllwrap
++ 
+  CP = cp -fp
+  # If GNU install is available, replace $(CP) with install.
+  INSTALL = $(CP)
+  RM = rm -f
+  
+! #prefix = /usr/local
+! exec_prefix = $(prefix)/bin
+! INCLUDE_PATH= $(prefix)/include
+! LIBRARY_PATH= $(prefix)/lib
+  
+  OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \
+         inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+  OBJA =
+  
+! all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB)
+  
+  test: example minigzip
+  	./example
+***************
+*** 76,87 ****
+  $(STATICLIB): $(OBJS) $(OBJA)
+  	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+  
+- $(IMPLIB): $(SHAREDLIB)
+  
+! $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+! 	dllwrap --driver-name $(CC) --def win32/zlib.def \
+! 	  --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
+! 	strip $@
+  
+  example: example.o $(STATICLIB)
+  	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
+--- 80,90 ----
+  $(STATICLIB): $(OBJS) $(OBJA)
+  	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+  
+  
+! $(SHAREDLIB) $(IMPLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+! 	$(CC) -shared -o $@ $(OBJS) $(OBJA) zlibrc.o
+! 	$(DLLTOOL) --def win32/zlib.def --dllname $(SHAREDLIB) --output-lib $(IMPLIB)
+! 	strip $(SHAREDLIB)
+  
+  example: example.o $(STATICLIB)
+  	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
+***************
+*** 104,115 ****
+  .PHONY: install uninstall clean
+  
+  install: zlib.h zconf.h $(LIB)
+- 	- if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH)
+- 	- if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH)
+  	-$(INSTALL) zlib.h $(INCLUDE_PATH)
+  	-$(INSTALL) zconf.h $(INCLUDE_PATH)
+- 	-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
+  	-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
+  
+  uninstall:
+  	-$(RM) $(INCLUDE_PATH)/zlib.h
+--- 107,116 ----
+  .PHONY: install uninstall clean
+  
+  install: zlib.h zconf.h $(LIB)
+  	-$(INSTALL) zlib.h $(INCLUDE_PATH)
+  	-$(INSTALL) zconf.h $(INCLUDE_PATH)
+  	-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
++ 	-$(INSTALL) $(SHAREDLIB) $(exec_prefix)
+  
+  uninstall:
+  	-$(RM) $(INCLUDE_PATH)/zlib.h
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]