gnumeric r16548 - in trunk: doc/C src src/tools tools/win32 tools/win32/patches

From: jody svn gnome org
To: svn-commits-list gnome org
Subject: gnumeric r16548 - in trunk: doc/C src src/tools tools/win32 tools/win32/patches
Date: Sat, 3 May 2008 16:14:19 +0100 (BST)
Author: jody
Date: Sat May  3 15:14:18 2008
New Revision: 16548
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16548&view=rev

Log:
    - memory leak in ssgrep
    - ACLOCAL_AMFLAGS for libgnomedb
    - add ssgrep and gsf-vba-dump to .nsi
    - move to svn trunk of glib and gtk for now


Added:
   trunk/tools/win32/patches/glib-goption-disable-localization.patch
   trunk/tools/win32/patches/goffice-remove-gtk-doc-test.patch
   trunk/tools/win32/patches/libgda.patch
   trunk/tools/win32/patches/pango-ignore-native-fontconfig.patch
Removed:
   trunk/tools/win32/patches/fontconfig-2.4.2-jeg.patch
   trunk/tools/win32/patches/fontconfig-2.4.2-tml-20070301.diff
Modified:
   trunk/doc/C/gnumeric-docbook-2-htmlhelp.xsl
   trunk/doc/C/gnumeric.xml
   trunk/doc/C/workbooks.xml
   trunk/src/ssgrep.c
   trunk/src/tools/dao.c
   trunk/tools/win32/gnumeric.nsi.in
   trunk/tools/win32/jhbuildrc
   trunk/tools/win32/moduleset

Modified: trunk/doc/C/gnumeric-docbook-2-htmlhelp.xsl
==============================================================================
--- trunk/doc/C/gnumeric-docbook-2-htmlhelp.xsl	(original)
+++ trunk/doc/C/gnumeric-docbook-2-htmlhelp.xsl	Sat May  3 15:14:18 2008
@@ -34,6 +34,7 @@
   <!--If one, adds forward/back arrows at top and bottom. -->
   <xsl:param name="suppress.navigation" select="1"/>
 
+  <xsl:param name="htmlhelp.force.map.and.alias" select="1"/>
 
   <!-- The name of the .chm compiled help file -->
   <xsl:param name="htmlhelp.chm" select="'gnumeric.chm'"/>

Modified: trunk/doc/C/gnumeric.xml
==============================================================================
--- trunk/doc/C/gnumeric.xml	(original)
+++ trunk/doc/C/gnumeric.xml	Sat May  3 15:14:18 2008
@@ -145,6 +145,7 @@
 -->
 
 <!-- =============Document Header ============================= -->
+<?dbhh topicname="BARF" topicid="4200"?>
 <book id="index" lang="en">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->

Modified: trunk/doc/C/workbooks.xml
==============================================================================
--- trunk/doc/C/workbooks.xml	(original)
+++ trunk/doc/C/workbooks.xml	Sat May  3 15:14:18 2008
@@ -125,6 +125,7 @@
 
 
 <sect1 id="sect-workbooks-names">
+  <?dbhh topicname="FOOBAR" topicid="4242"?>
   <title>Document Named Elements</title>
 
   <para>

Modified: trunk/src/ssgrep.c
==============================================================================
--- trunk/src/ssgrep.c	(original)
+++ trunk/src/ssgrep.c	Sat May  3 15:14:18 2008
@@ -71,6 +71,8 @@
 		}
 		g_print ("\t%s : %d (string)\n", target, ((GnmString *)str)->ref_count);
 	}
+
+	g_free (clean);
 }
 
 static void
@@ -157,7 +159,7 @@
 		return 0;
 	} 
 
-	targets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	targets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	if (ssgrep_keyword_file) {
 		GsfInput     	 *input;
 		GsfInputTextline *textline;

Modified: trunk/src/tools/dao.c
==============================================================================
--- trunk/src/tools/dao.c	(original)
+++ trunk/src/tools/dao.c	Sat May  3 15:14:18 2008
@@ -233,6 +233,8 @@
 		workbook_sheet_attach (wb, dao->sheet);
 		dao->wbc = wb_control_wrapper_new (dao->wbc, NULL, wb, NULL);
 	}
+	wb_view_sheet_focus (wb_control_view (dao->wbc), dao->sheet);
+
 	if (dao->rows == 0 || (dao->rows == 1 && dao->cols == 1))
 		dao->rows = gnm_sheet_get_max_rows (dao->sheet) - dao->start_row;
 	if (dao->cols == 0 || (dao->rows == 1 && dao->cols == 1))

Modified: trunk/tools/win32/gnumeric.nsi.in
==============================================================================
--- trunk/tools/win32/gnumeric.nsi.in	(original)
+++ trunk/tools/win32/gnumeric.nsi.in	Sat May  3 15:14:18 2008
@@ -82,7 +82,9 @@
     File /x "libpython*.dll" "bin\*.dll"
     File "bin\gnumeric.exe"
     File "bin\ssconvert.exe"
+    File "bin\ssgrep.exe"
     File "bin\gsf.exe"
+    File "bin\gsf-vba-dump.exe"
     File "bin\gtk-update-icon-cache.exe"
     File "bin\gdk-pixbuf-query-loaders.exe"
 

Modified: trunk/tools/win32/jhbuildrc
==============================================================================
--- trunk/tools/win32/jhbuildrc	(original)
+++ trunk/tools/win32/jhbuildrc	Sat May  3 15:14:18 2008
@@ -9,12 +9,13 @@
 
 #moduleset = 'http://osl.ulpgc.es/~arc/gnome/gtk/gtk+-win32.moduleset'
 moduleset = '/gnome/src/gnumeric/tools/win32/moduleset'
-modules = ['gtk+','gnumeric']
+modules = ['gnumeric']
 
 # checkoutroot: path to download packages elsewhere
 # prefix:       target path to install the compiled binaries
-checkoutroot = os.path.expanduser('~/checkout/')
-prefix	     = os.path.expanduser("~/target")
+checkoutroot = os.path.expanduser('~/win32/debug/src/')
+prefix	     = os.path.expanduser("~/win32/debug/test")
+os.environ['prefix']	= prefix	# for use in zlib kludge
 
 #The host value is obtained with the result of executing
 #the config.guess script on any of the packages.
@@ -52,6 +53,7 @@
 os.environ['CXXFLAGS']	 = ' -O0 -g -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
 
 os.environ['WINEDEBUG']	 = '-all'
 os.environ['MAKE']	 = 'colormake'
@@ -78,6 +80,7 @@
 	autogenargs += ' '+tool+'="'+os.environ[tool]+'" '
 
 #Module specific configure arguments
+module_autogenargs['zlib']    = autogenargs + ' --prefix='+prefix+' --shared'
 module_autogenargs['pcre']    = autogenargs + ' --enable-utf8' + ' --enable-shared'
 module_autogenargs['gettext'] = autogenargs + """ --without-emacs \
 						  --disable-libasprintf \
@@ -92,9 +95,6 @@
 module_autogenargs['glib'] =    autogenargs + """ --enable-explicit-deps=no \
                                                   --cache-file=win32.cache \
                                                   --disable-gtk-doc"""
-#module_autogenargs['expat']	= autogenargs
-#module_autogenargs['freetype']	= autogenargs + """ --enable=shared"""
-#module_autogenargs['fontconfig']= autogenargs + """ --with-arch=i586-pc-mingw32msvc"""
 module_autogenargs['pango']	= autogenargs + """ --disable-gtk-doc \
                                                   --enable-explicit-deps=no \
                                                   --with-included-modules"""
@@ -111,13 +111,12 @@
 						  --disable-static \
 						  --enable-shared"""
 
-
-module_autogenargs['libxml2']	= autogenargs + """ --disable-scrollkeeper"""
+module_autogenargs['libxml2']	= autogenargs + """ --disable-scrollkeeper --without-iconv"""
 
 autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
 
 module_autogenargs['atk']	= autogenargs + """ --disable-glibtest"""
-module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest"""
+module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --without-libjasper"""
 
 module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda"""
 module_autogenargs['pxlib']	= autogenargs + """ --with-gsf=""" + prefix
@@ -127,6 +126,6 @@
 						    --without-imagemagick"""
 module_autogenargs['libglade']	= autogenargs
 module_autogenargs['pygobject']	= autogenargs
-module_autogenargs['libgsf']	= autogenargs
+module_autogenargs['libgsf']	= autogenargs + """ --without-gnome-vfs --without-bonobo"""
 module_autogenargs['goffice']	= autogenargs
 module_autogenargs['gnumeric']	= autogenargs

Modified: trunk/tools/win32/moduleset
==============================================================================
--- trunk/tools/win32/moduleset	(original)
+++ trunk/tools/win32/moduleset	Sat May  3 15:14:18 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE doc [
-<!--      <!ENTITY patch_dir "/gnome/src/gnumeric/tools/win32/patches/"> -->
-      <!ENTITY patch_dir "http://svn.gnome.org/svn/gnumeric/trunk/tools/win32/patches/";>
+      <!ENTITY patch_dir "/gnome/src/gnumeric/tools/win32/patches/">
+      <!-- <!ENTITY patch_dir "http://svn.gnome.org/svn/gnumeric/trunk/tools/win32/patches/";> -->
 ]>
 <moduleset>
     <repository type="svn" name="svn.gnome.org" default="yes"
@@ -9,10 +9,12 @@
     <repository type="git" name="freedesktop.org"
 		href="git://cgit.freedesktop.org/git"/>
 
+<!--
     <tarball id="iconv" version="1.12">
 	<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz";
 	    md5sum="c2be282595751535a618ae0edeb8f648"/>
     </tarball>
+    -->
  
     <tarball id="gettext" version="0.17">
 	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz";
@@ -21,7 +23,7 @@
 	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/gettext_0_17_crossbuild_override_tools_fix.patch"/>
 	</patches>
 	<dependencies>
-	    <dep package="iconv"/>
+<!--	    <dep package="iconv"/> -->
 	</dependencies>
     </tarball>
 
@@ -32,18 +34,25 @@
 	    <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>
@@ -51,21 +60,19 @@
 	</patches>
 	<dependencies>
 	    <dep package="gettext"/>
-	    <dep package="iconv"/>
+	    <dep package="gtk-doc"/>
+<!--	    <dep package="iconv"/> -->
 	</dependencies>
     </autotools>
-    -->
 
 <!-- Compression -->
-<!--
-    <tarball id="zlib" version="1.2.3">
+    <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"/>
 	<patches>
-	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/zlib_hardcore_makefile.patch"/>
+	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/zlib_mingw.patch"/>
 	</patches>
     </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"/>
@@ -84,12 +91,12 @@
 	</patches>
     </tarball>
     <tarball id="png" version="1.2.25">
-	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.25.tar.bz2";
-		md5sum="0c1df914de7fd3b6a129af569889c856"/>
+	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.26.tar.bz2"/>
 	<dependencies>
-	    <!--<dep package="zlib"/> -->
+	    <dep package="zlib"/>
 	</dependencies>
     </tarball>
+    <!--
     <tarball id="tiff" version="3.8.2">
 	<source href="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz";
 		md5sum="fbb6f446ea4ed18955e2714934e5b698"/>
@@ -97,6 +104,7 @@
 	    <dep package="jpeg"/>
 	</dependencies>
     </tarball>
+    -->
 
 <!-- Gtk stack -->
     <autotools id="pixman">
@@ -105,7 +113,7 @@
     <autotools id="cairo">
 	<branch repo="freedesktop.org"/>
 	<dependencies>
-	    <!-- <dep package="zlib"/> -->
+	    <dep package="zlib"/>
 	    <dep package="png"/>
 	    <dep package="pixman"/>
 	</dependencies>
@@ -126,6 +134,12 @@
 	</patches>
     </tarball>
 
+    <autotools id="intltool">
+	<branch/>
+	<dependencies>
+	</dependencies>
+    </autotools>
+
 <!--
     <tarball id="pango" version="1.16.4">
 	<source href="http://ftp.gnome.org/pub/gnome/sources/pango/1.16/pango-1.16.4.tar.bz2";
@@ -143,30 +157,31 @@
 	    <dep package="cairo"/>
 	    <dep package="glib"/>
 	    <dep package="libthai"/>
+	    <dep package="gtk-doc"/>
 	</dependencies>
     </autotools>
 
-    <tarball id="atk" version="1.21.5">
-	<source href="http://ftp.acc.umu.se/pub/gnome/sources/atk/1.21/atk-1.21.5.tar.bz2";
-		md5sum="3ac67cf2c1739aca39c3e11284cf247e"/>
+    <tarball id="atk" version="1.22.0">
+	<source href="http://ftp.acc.umu.se/pub/gnome/sources/atk/1.22/atk-1.22.0.tar.bz2"/>
 	<dependencies>
 	    <dep package="glib"/>
 	</dependencies>
     </tarball>
-    <tarball id="gtk+" version="2.12.8">
-	<source href="http://ftp.acc.umu.se/pub/gnome/sources/gtk+/2.12/gtk+-2.12.8.tar.bz2";
-		md5sum="1e0d7db0bfa210881743e1d42ee91a24"/>
+<!--
+    <tarball id="gtk+" version="2.12.9">
+	<source href="http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.9.tar.bz2";
+		md5sum="33499772fdc3bea569c6d5673e5831b4"/>
+	<patches>
+	</patches>
+
 	<dependencies>
 	    <dep package="glib"/>
 	    <dep package="cairo"/>
 	    <dep package="atk"/>
 	    <dep package="pango"/>
-<!-- <dep package="jpeg"/> -->
-	    <dep package="tiff"/>
-	    <dep package="png"/>
 	</dependencies>
     </tarball>
-<!--
+    -->
     <autotools id="gtk+">
 	<branch/>
 	<dependencies>
@@ -174,16 +189,16 @@
 	    <dep package="cairo"/>
 	    <dep package="atk"/>
 	    <dep package="pango"/>
-	    <dep package="tiff"/>
-	    <dep package="png"/>
 	</dependencies>
     </autotools>
     -->
 
 <!-- glade stack -->
-    <tarball id="libxml2" version="2.6.30">
-	<source href="ftp://xmlsoft.org/libxml2/libxml2-2.6.30.tar.gz";
-		md5sum="460e6d853e824da700d698532e57316b"/>
+    <tarball id="libxml2" version="2.6.32">
+	<source href="ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz"/>
+	<dependencies>
+	    <dep package="zlib"/>
+	</dependencies>
     </tarball>
     <tarball id="libglade" version="2.6.0">
 	<source href="http://ftp.gnome.org/pub/gnome/sources/libglade/2.6/libglade-2.6.0.tar.bz2";
@@ -206,67 +221,27 @@
 	</patches>
     </tarball>
 
-    <!--
-  <autotools id="pycairo">
-    <branch repo="cairo.freedesktop.org"/>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-  <autotools id="pygtk">
-    <branch/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+"/>
-      <dep package="pycairo"/>
-      <dep package="libglade"/>
-    </dependencies>
-  </autotools>
-  -->
-
-    <autotools id="librsvg" supports-non-srcdir-builds="no">
-	<branch/>
-	<dependencies>
-	    <dep package="libxml2"/>
-	    <dep package="gtk+"/>
-	    <dep package="libart_lgpl"/>
-	    <dep package="libgsf"/>
-	    <dep package="libcroco"/>
-	</dependencies>
-    </autotools>
-
-    <tarball id="libcroco" supports-non-srcdir-builds="no" version="0.6.1">
-	<source href="http://download.gnome.org/sources/libcroco/0.6/libcroco-0.6.1.tar.bz2";
-		md5sum="b0975bd01eb11964f1b3f254f267a43d" size="381188"/>
-	<dependencies>
-	    <dep package="libxml2"/>
-	    <dep package="pango"/>
-	</dependencies>
-    </tarball>
-
-    <autotools id="intltool">
-	<branch/>
-	<dependencies>
-	</dependencies>
-    </autotools>
-    <autotools id="libgda" version="trunk">
-	<branch/>
+    <tarball id="libgda" version="3.0.2">
+	<source href="http://download.gnome.org/sources/libgda/3.1/libgda-3.1.2.tar.bz2";
+		md5sum="fe299d264ddeb7fbc36276f74f1abfdc"/>
 	<dependencies>
 	    <dep package="intltool"/>
 	    <dep package="glib"/>
 	    <dep package="libxml2"/>
 	</dependencies>
-    </autotools>
-    <autotools id="libgnomedb" version="trunk">
-	<branch/>
+    </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>
 	    <patch file="&patch_dir;libgnomedb.patch"/>
 	</patches>
 	<dependencies>
+	    <dep package="intltool"/>
 	    <dep package="libgda"/>
 	    <dep package="gtk+"/>
 	</dependencies>
-    </autotools>
+    </tarball>
 
     <tarball id="pxlib" version="0.6.3">
 	<source href="http://superb-east.dl.sourceforge.net/sourceforge/pxlib/pxlib-0.6.3.tar.gz";
@@ -287,7 +262,9 @@
 	<dependencies>
 	    <dep package="glib"/>
 	    <dep package="libxml2"/>
-	    <!-- <dep package="zlib"/> -->
+	    <dep package="zlib"/>
+	    <dep package="libbz2"/>
+	    <dep package="intltool"/>
 	</dependencies>
     </autotools>
     <tarball id="libart_lgpl" version="2.3.19">

Added: trunk/tools/win32/patches/glib-goption-disable-localization.patch
==============================================================================
--- (empty file)
+++ trunk/tools/win32/patches/glib-goption-disable-localization.patch	Sat May  3 15:14:18 2008
@@ -0,0 +1,130 @@
+Index: glib/goption.c
+===================================================================
+--- glib/goption.c	(revision 6663)
++++ glib/goption.c	(working copy)
+@@ -86,6 +86,7 @@
+ 
+   guint            help_enabled   : 1;
+   guint            ignore_unknown : 1;
++  guint		   delocalize : 1;
+   
+   GOptionGroup    *main_group;
+ 
+@@ -225,6 +226,7 @@
+   context->parameter_string = g_strdup (parameter_string);
+   context->help_enabled = TRUE;
+   context->ignore_unknown = FALSE;
++  context->delocalize = TRUE;
+ 
+   return context;
+ }
+@@ -347,6 +349,23 @@
+   return context->ignore_unknown;
+ }
+ 
++void
++g_option_context_set_delocalize (GOptionContext *context,
++				 gboolean	 delocalize)
++{
++  g_return_if_fail (context != NULL);
++
++  context->delocalize = delocalize;
++}
++
++gboolean
++g_option_context_get_delocalize (GOptionContext *context)
++{
++  g_return_if_fail (context != NULL);
++
++  return context->delocalize;
++}
++
+ /**
+  * g_option_context_add_group:
+  * @context: a #GOptionContext
+@@ -1003,7 +1022,10 @@
+       {
+ 	gchar *data;
+ 	
+-	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	if (context->delocalize)
++	    data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	else
++	    data = g_strdup (value);
+ 
+ 	if (!data)
+ 	  return FALSE;
+@@ -1022,7 +1044,10 @@
+       {
+ 	gchar *data;
+ 
+-	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	if (context->delocalize)
++	    data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	else
++	    data = g_strdup (value);
+ 
+ 	if (!data)
+ 	  return FALSE;
+@@ -1055,7 +1080,10 @@
+ 	gchar *data;
+ 
+ #ifdef G_OS_WIN32
+-	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	if (context->delocalize)
++	    data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	else
++	    data = g_strdup (value);
+ 	
+ 	if (!data)
+ 	  return FALSE;
+@@ -1078,7 +1106,10 @@
+ 	gchar *data;
+ 	
+ #ifdef G_OS_WIN32
+-	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	if (context->delocalize)
++	    data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	else
++	    data = g_strdup (value);
+ 	
+ 	if (!data)
+ 	  return FALSE;
+@@ -1135,13 +1166,21 @@
+ 	else if (entry->flags & G_OPTION_FLAG_FILENAME)
+ 	  {
+ #ifdef G_OS_WIN32
+-  	    data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	    if (context->delocalize)
++		data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	    else
++		data = g_strdup (value);
+ #else
+ 	    data = g_strdup (value);
+ #endif
+ 	  }
+ 	else
+-	  data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	  {
++	    if (context->delocalize)
++		data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	    else
++		data = g_strdup (value);
++	  }
+ 
+ 	if (!(entry->flags & (G_OPTION_FLAG_NO_ARG|G_OPTION_FLAG_OPTIONAL_ARG)) && 
+ 	    !data)
+Index: glib/goption.h
+===================================================================
+--- glib/goption.h	(revision 6663)
++++ glib/goption.h	(working copy)
+@@ -110,6 +110,9 @@
+ void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
+ 							     gboolean	     ignore_unknown);
+ gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
++void		g_option_context_set_delocalize (GOptionContext *context,
++							     gboolean	     ignore_unknown);
++gboolean        g_option_context_get_delocalize (GOptionContext *context);
+ 
+ void            g_option_context_add_main_entries (GOptionContext      *context,
+ 						   const GOptionEntry  *entries,

Added: trunk/tools/win32/patches/goffice-remove-gtk-doc-test.patch
==============================================================================
--- (empty file)
+++ trunk/tools/win32/patches/goffice-remove-gtk-doc-test.patch	Sat May  3 15:14:18 2008
@@ -0,0 +1,16 @@
+Index: autogen.sh
+===================================================================
+--- autogen.sh	(revision 2045)
++++ autogen.sh	(working copy)
+@@ -61,11 +61,3 @@
+ GNOME_DATADIR="$gnome_datadir"
+ 
+ . $gnome_autogen
+-
+-if grep 'which gtkdoc-rebase >/dev/null &&' $srcdir/gtk-doc.make >/dev/null 2>&1; then
+-    echo '----------------------------------------------------' 1>&2
+-    echo "Your gtk-doc has a dependency problem.  Upgrade." 1>&2
+-    echo "See http://bugzilla.gnome.org/show_bug.cgi?id=506506"; 1>&2
+-    echo '----------------------------------------------------' 1>&2
+-    exit 1
+-fi

Added: trunk/tools/win32/patches/libgda.patch
==============================================================================
--- (empty file)
+++ trunk/tools/win32/patches/libgda.patch	Sat May  3 15:14:18 2008
@@ -0,0 +1,103 @@
+Index: libgda/gtk-doc.make
+===================================================================
+--- libgda/gtk-doc.make	(revision 3059)
++++ libgda/gtk-doc.make	(working copy)
+@@ -5,11 +5,11 @@
+ ####################################
+ 
+ if GTK_DOC_USE_LIBTOOL
+-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ else
+-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ endif
+ 
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -38,8 +38,13 @@
+ 	$(DOC_MODULE).prerequisites \
+ 	$(DOC_MODULE).signals
+ 
+-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
++REPORT_FILES = \
++	$(DOC_MODULE)-undocumented.txt \
++	$(DOC_MODULE)-undeclared.txt \
++	$(DOC_MODULE)-unused.txt
+ 
++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++
+ if ENABLE_GTK_DOC
+ all-local: html-build.stamp
+ else
+@@ -79,6 +84,10 @@
+ tmpl.stamp: tmpl-build.stamp
+ 	@true
+ 
++tmpl/*.sgml:
++	@true
++
++
+ #### xml ####
+ 
+ sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+@@ -96,11 +105,11 @@
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ 	@echo 'gtk-doc: Building HTML'
+ 	@-chmod -R u+w $(srcdir)
+-	rm -rf $(srcdir)/html 
++	rm -rf $(srcdir)/html
+ 	mkdir $(srcdir)/html
+ 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+-	@echo 'gtk-doc: Fixing cross-references' 
++	@echo 'gtk-doc: Fixing cross-references'
+ 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	touch html-build.stamp
+ 
+@@ -110,11 +119,16 @@
+ 	rm -f *~ *.bak
+ 	rm -rf .libs
+ 
++distclean-local:
++	cd $(srcdir) && \
++	  rm -rf xml $(REPORT_FILES) \
++	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++
+ maintainer-clean-local: clean
+-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++	cd $(srcdir) && rm -rf xml html
+ 
+ install-data-local:
+-	installfiles=`echo $(srcdir)/html/*`; \
++	-installfiles=`echo $(srcdir)/html/*`; \
+ 	if test "$$installfiles" = '$(srcdir)/html/*'; \
+ 	then echo '-- Nothing to install' ; \
+ 	else \
+@@ -125,7 +139,10 @@
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+ 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
++	  which gtkdoc-rebase >/dev/null && \
++	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+ 	fi
++	
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(TARGET_DIR)/*
+@@ -148,8 +165,9 @@
+ 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+ 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+ 	cp $(srcdir)/html/* $(distdir)/html
+-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
+-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
+-	fi
++	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
++	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
++	cd $(distdir) && rm -f $(DISTCLEANFILES)
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs

Added: trunk/tools/win32/patches/pango-ignore-native-fontconfig.patch
==============================================================================
--- (empty file)
+++ trunk/tools/win32/patches/pango-ignore-native-fontconfig.patch	Sat May  3 15:14:18 2008
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 2583)
++++ configure.in	(working copy)
+@@ -220,7 +220,7 @@
+ #
+ # Check for fontconfig
+ #
+-PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, AC_MSG_RESULT([no]))
++#PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, AC_MSG_RESULT([no]))
+ 
+ #
+ # Checks for FreeType
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]