GNOME.org
 

[gnumeric] some patches for win32

commit 2ab4b76ea0b1f7a51bbd0edd0cd928c3b8512115
Author: Jody Goldberg <jody gnome org>
Date:   Sun Jun 28 21:09:15 2009 -0400

    some patches for win32

 src/style.c                             |    4 +
 tools/win32/jhbuildrc-debug             |    3 +-
 tools/win32/jhbuildrc-release           |    3 +-
 tools/win32/moduleset                   |   77 ++++++++----------------
 tools/win32/patches/fontconfig-CC.patch |   95 ++++++++++++-------------------
 5 files changed, 68 insertions(+), 114 deletions(-)
---
diff --git a/src/style.c b/src/style.c
index a36de40..91d0a69 100644
--- a/src/style.c
+++ b/src/style.c
@@ -404,9 +404,13 @@ gnm_font_shutdown (void)
 
 	if (fontmap) {
 		/* Do this late -- see bugs 558100 and 558254.  */
+		/* and not at all on win32, where the life cycle is different */
+#ifndef	G_OS_WIN32
 		g_object_unref (fontmap);
+#endif
 		fontmap = NULL;
 	}
+
 }
 
 /**
diff --git a/tools/win32/jhbuildrc-debug b/tools/win32/jhbuildrc-debug
index b0978e3..daf4db3 100644
--- a/tools/win32/jhbuildrc-debug
+++ b/tools/win32/jhbuildrc-debug
@@ -7,7 +7,6 @@
 #
 # Author: Alberto Ruiz <aruiz gnome org>
 
-#moduleset = 'http://osl.ulpgc.es/~arc/gnome/gtk/gtk+-win32.moduleset'
 moduleset = '/gnome/src/gnumeric/tools/win32/moduleset'
 modules = ['gnumeric', 'evince']
 
@@ -131,4 +130,4 @@ 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['evince']	= autogenargs + """ --without-keyring"""
+module_autogenargs['evince']	= autogenargs + """ --without-gconf --without-keyring"""
diff --git a/tools/win32/jhbuildrc-release b/tools/win32/jhbuildrc-release
index 1194fe5..25934fa 100644
--- a/tools/win32/jhbuildrc-release
+++ b/tools/win32/jhbuildrc-release
@@ -7,7 +7,6 @@
 #
 # Author: Alberto Ruiz <aruiz gnome org>
 
-#moduleset = 'http://osl.ulpgc.es/~arc/gnome/gtk/gtk+-win32.moduleset'
 moduleset = '/gnome/src/gnumeric/tools/win32/moduleset'
 modules = ['gnumeric', 'evince']
 
@@ -131,4 +130,4 @@ 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['evince']	= autogenargs + """ --without-keyring"""
+module_autogenargs['evince']	= autogenargs + """ --without-gconf --without-keyring"""
diff --git a/tools/win32/moduleset b/tools/win32/moduleset
index fb32922..cc54486 100644
--- a/tools/win32/moduleset
+++ b/tools/win32/moduleset
@@ -12,6 +12,8 @@
 		href="http://www.zlib.net"/>
     <repository type="tarball" name="savannah"
 		href="http://savannah.nongnu.org/download/"/>
+    <repository type="tarball" name="fontconfig"
+		href="http://fontconfig.org/release/"/>
 
     <repository type="git" name="freedesktop.org"
 		href="git://cgit.freedesktop.org/git"/>
@@ -41,11 +43,9 @@
     </autotools>
 
     <autotools id="glib">
-	<branch repo="gnome.org" module="sources/glib/2.20/glib-2.20.1.tar.bz2" version="2.20.1">
-	    <patches>
-		<patch file="&patch_dir;glib-win32-cachefile.patch.gz"/>
-		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
-	    </patches>
+	<branch repo="gnome.org" module="sources/glib/2.20/glib-2.20.4.tar.bz2" version="2.20.4">
+	    <patch file="&patch_dir;glib-win32-cachefile.patch.gz"/>
+	    <patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	</branch>
 	<dependencies>
 	    <dep package="gettext"/>
@@ -79,8 +79,8 @@
 	    <patch file="http://gnome.org/~aruiz/gtk+/patches/jpeg_mingwport.patch"; strip="1"/>
 	</patches>
     </tarball>
-    <tarball id="png" version="1.2.36">
-	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.36.tar.bz2"/>
+    <tarball id="png" version="1.2.37">
+	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.37.tar.bz2"/>
 	<dependencies>
 	    <dep package="zlib"/>
 	</dependencies>
@@ -104,9 +104,8 @@
     <autotools id="cairo">
 	<branch repo="cairographics"
 		module="cairo-1.8.2.tar.gz"
-		version="1.8.2"/>
-	<patches>
-	</patches>
+		version="1.8.2">
+	</branch>
 	<dependencies>
 	    <dep package="zlib"/>
 	    <dep package="png"/>
@@ -133,13 +132,12 @@
     <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"/>
+		version="0.1.11" checkoutdir="libthai-0.1.11">
+	    <patch file="&patch_dir;libthai.patch"/>
+	</branch>
 	<dependencies>
 	    <dep package="libdatrie"/>
 	</dependencies>
-	<patches>
-	    <patch file="&patch_dir;libthai.patch"/>
-	</patches>
     </autotools>
 
     <autotools id="gnome-common">
@@ -155,17 +153,15 @@
 	</dependencies>
     </autotools>
 
-    <tarball id="fontconfig" version="2.4.2"
-	autogen-sh="autoreconf" skip-autogen="never">
-	<source href="http://fontconfig.org/release/fontconfig-2.4.2.tar.gz"/>
+    <autotools id="fontconfig"
+	autogen-sh="autoreconf"  skip-autogen="never">
+	<branch repo="fontconfig" module="fontconfig-2.7.0.tar.gz" version="2.7.0">
+	    <patch file="&patch_dir;fontconfig-CC.patch"/>
+	</branch>
 	<dependencies>
 	    <dep package="freetype"/>
 	</dependencies>
-	<patches>
-	    <patch file="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig-2.4.2-tml-20071015.diff"/>
-            <patch file="&patch_dir;fontconfig-CC.patch"/>
-	</patches>
-    </tarball>
+    </autotools>
 
 <!--
     <tarball id="pango" version="1.16.4">
@@ -189,27 +185,16 @@
 	</dependencies>
     </autotools>
 
-    <tarball id="atk" version="1.26.0">
-	<source href="http://ftp.acc.umu.se/pub/gnome/sources/atk/1.26/atk-1.26.0.tar.bz2"/>
-	<dependencies>
-	    <dep package="glib"/>
-	</dependencies>
-    </tarball>
-<!--
-    <autotools id="gtk+">
-	<branch/>
+    <autotools id="atk">
+	<branch repo="gnome.org" module="sources/atk/2.26/atk-1.26.0.tar.bz2" version="1.26.0"/>
 	<dependencies>
 	    <dep package="glib"/>
-	    <dep package="cairo"/>
-	    <dep package="atk"/>
-	    <dep package="pango"/>
 	</dependencies>
     </autotools>
-    -->
 
     <autotools id="gtk+">
-	<branch repo="gnome.org" module="sources/gtk+/2.16/gtk+-2.16.1.tar.bz2"
-		version="2.16.1">
+	<branch repo="gnome.org" module="sources/gtk+/2.16/gtk+-2.16.2.tar.bz2"
+		version="2.16.2">
 	    <patch file="&patch_dir;gtk-disable-demo.patch"/>
 	</branch>
 	<dependencies>
@@ -272,20 +257,14 @@
     <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>
-	</patches>
     </tarball>
+
     <autotools id="psiconv">
 	<branch repo="debian"
 		module="p/psiconv/psiconv_0.9.8.orig.gz"
-		version="0.9.8" checkoutdir="psiconv-0.9.8"/>
-<!-- 
-	<source href="http://software.frodo.looijaard.name/psiconv/files/psiconv-0.9.8.tar.gz";
-		md5sum="8d7548e3c6b9cd408544736133728acd"/>
--->
-	<patches>
+		version="0.9.8" checkoutdir="psiconv-0.9.8">
 	    <patch file="&patch_dir;psiconv.patch"/>
-	</patches>
+	</branch>
     </autotools>
 
 <!-- print preview -->
@@ -304,8 +283,7 @@
       <dep package="gtk+"/>
     </after>
   </tarball>
-  <autotools id="evince"
-    autogenargs="--without-keyring">
+  <autotools id="evince">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -319,9 +297,6 @@
     <suggests>
       <dep package="gnome-keyring"/>
     </suggests>
-    <after>
-      <dep package="nautilus"/>
-    </after>
   </autotools>
 <!-- Gnumeric stack -->
     <autotools id="libgsf">
diff --git a/tools/win32/patches/fontconfig-CC.patch b/tools/win32/patches/fontconfig-CC.patch
index 7711d3d..71299dc 100644
--- a/tools/win32/patches/fontconfig-CC.patch
+++ b/tools/win32/patches/fontconfig-CC.patch
@@ -1,60 +1,37 @@
-*** doc/Makefile.in	Sat Dec  2 18:27:32 2006
---- doc/Makefile.in	Thu May  7 18:11:12 2009
+Index: configure.in
+===================================================================
+--- configure.in	2009-06-24 15:04:11.000000000 -0400
++++ configure.in	2009-06-28 16:10:11.000000000 -0400
+@@ -100,11 +100,7 @@
+ 
+ # Setup for compiling build tools (fc-glyphname, etc)
+ AC_MSG_CHECKING([for a C compiler for build tools])
+-if test $cross_compiling = yes; then
+-  AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+-else
+   CC_FOR_BUILD=$CC
+-fi
+ AC_MSG_RESULT([$CC_FOR_BUILD])
+ AC_SUBST(CC_FOR_BUILD)
+ 
+Index: src/fcint.h
+===================================================================
+*** src/fcint.h	Wed Jun 24 13:52:13 2009
+--- src/fcint.h	Sun Jun 28 16:25:38 2009
 ***************
-*** 115,121 ****
-  AUTOHEADER = @AUTOHEADER@
-  AUTOMAKE = @AUTOMAKE@
-  AWK = @AWK@
-- CC = @CC_FOR_BUILD@
-  CCDEPMODE = @CCDEPMODE@
-  CC_FOR_BUILD = @CC_FOR_BUILD@
-  CFLAGS = @CFLAGS@
---- 115,120 ----
-*** fc-arch/Makefile.in	Sat Dec  2 18:27:32 2006
---- fc-arch/Makefile.in	Thu May  7 18:11:15 2009
-***************
-*** 102,108 ****
-  AUTOHEADER = @AUTOHEADER@
-  AUTOMAKE = @AUTOMAKE@
-  AWK = @AWK@
-- CC = @CC_FOR_BUILD@
-  CCDEPMODE = @CCDEPMODE@
-  CC_FOR_BUILD = @CC_FOR_BUILD@
-  CFLAGS = @CFLAGS@
---- 102,107 ----
-*** fc-case/Makefile.in	Sat Dec  2 18:27:32 2006
---- fc-case/Makefile.in	Thu May  7 18:11:18 2009
-***************
-*** 102,108 ****
-  AUTOHEADER = @AUTOHEADER@
-  AUTOMAKE = @AUTOMAKE@
-  AWK = @AWK@
-- CC = @CC_FOR_BUILD@
-  CCDEPMODE = @CCDEPMODE@
-  CC_FOR_BUILD = @CC_FOR_BUILD@
-  CFLAGS = @CFLAGS@
---- 102,107 ----
-*** fc-glyphname/Makefile.in	Sat Dec  2 18:27:33 2006
---- fc-glyphname/Makefile.in	Thu May  7 18:11:22 2009
-***************
-*** 102,108 ****
-  AUTOHEADER = @AUTOHEADER@
-  AUTOMAKE = @AUTOMAKE@
-  AWK = @AWK@
-- CC = @CC_FOR_BUILD@
-  CCDEPMODE = @CCDEPMODE@
-  CC_FOR_BUILD = @CC_FOR_BUILD@
-  CFLAGS = @CFLAGS@
---- 102,107 ----
-*** fc-lang/Makefile.in	Sat Dec  2 18:27:33 2006
---- fc-lang/Makefile.in	Thu May  7 18:11:24 2009
-***************
-*** 102,108 ****
-  AUTOHEADER = @AUTOHEADER@
-  AUTOMAKE = @AUTOMAKE@
-  AWK = @AWK@
-- CC = @CC_FOR_BUILD@
-  CCDEPMODE = @CCDEPMODE@
-  CC_FOR_BUILD = @CC_FOR_BUILD@
-  CFLAGS = @CFLAGS@
---- 102,107 ----
+*** 538,544 ****
+  
+  #ifdef _WIN32
+  FcPrivate int
+! FcStat (const char *file, struct stat *statb)
+  #else
+  #define FcStat stat
+  #endif
+--- 538,544 ----
+  
+  #ifdef _WIN32
+  FcPrivate int
+! FcStat (const char *file, struct stat *statb);
+  #else
+  #define FcStat stat
+  #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]