GNOME.org
 

[gnumeric] win32: switch to glib 2.26.0

commit ba2fdadf51869149ad3a33833a398884e5bec37d
Author: Morten Welinder <terra gnome org>
Date:   Wed Oct 6 20:46:38 2010 -0400

    win32: switch to glib 2.26.0

 tools/win32/moduleset.in                           |    5 +-
 tools/win32/patches/glib-appinfo.patch             |   18 ++--
 tools/win32/patches/glib-disable-python.patch      |   49 +++++++-
 tools/win32/patches/glib-dns.patch                 |   10 ++
 .../glib-goption-disable-localization.patch        |  140 +++++++++-----------
 5 files changed, 131 insertions(+), 91 deletions(-)
---
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index d16227e..ec6edf0 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -66,12 +66,13 @@
     </autotools>
 
     <autotools id="glib">
-	<branch repo="gnome.org" module="sources/glib/2.24/glib-2.24.0.tar.bz2" version="2.22.3">
+	<branch repo="gnome.org" module="sources/glib/2.26/glib-2.26.0.tar.bz2" version="2.26.0">
 	    <patch file="&patch_dir;glib-win32-cachefile.patch.gz"/>
-	    <patch file="&patch_dir;glib-goption-disable-localization.patch"/>
+	    <patch file="&patch_dir;glib-goption-disable-localization.patch" strip="1"/>
 	    <patch file="&patch_dir;glib-disable-python.patch" strip="1"/>
 	    <patch file="&patch_dir;glib-gspawn-win32.patch" strip="1"/>
 	    <patch file="&patch_dir;glib-appinfo.patch" strip="1"/>
+	    <patch file="&patch_dir;glib-dns.patch" strip="1"/>
 	</branch>
 	<dependencies>
 	    <dep package="gettext"/>
diff --git a/tools/win32/patches/glib-appinfo.patch b/tools/win32/patches/glib-appinfo.patch
index b3d6e6d..5eabca6 100644
--- a/tools/win32/patches/glib-appinfo.patch
+++ b/tools/win32/patches/glib-appinfo.patch
@@ -256,10 +256,10 @@ diff -ur glib-2.24.0/gio/gwin32appinfo.c glib-2.24.0-fixed/gio/gwin32appinfo.c
 +++ glib-2.24.0-fixed/gio/win32/gwinhttpvfs.c	2010-07-11 20:32:36.000000000 -0400
 @@ -28,6 +28,7 @@
  
- #include "gioerror.h"
- #include "giomodule.h"
-+#include "gdummyfile.h"
- #include "gvfs.h"
+ #include "gio/gioerror.h"
+ #include "gio/giomodule.h"
++#include "gio/gdummyfile.h"
+ #include "gio/gvfs.h"
  
  #include "gwinhttpfile.h"
 @@ -163,6 +164,18 @@
@@ -268,14 +268,14 @@ diff -ur glib-2.24.0/gio/gwin32appinfo.c glib-2.24.0-fixed/gio/gwin32appinfo.c
  
 +  /* The only other kind of URI we handle is file:// and we do that
 +     by shipping it off to the wrapped vfs.  Anything else that looks
-+     plonk:// is turned into a dummy file.  That leaves anything that
-+     looks, more or less, like a filename.  We ship that off to the
++     like plonk:... is turned into a dummy file.  That leaves anything
++     that looks, more or less, like a filename.  We ship that off to the
 +     wrapped vfs because we used to.  */
 +  for (i = 0; g_ascii_isalpha (uri[i]); i++)
 +	  ; /* Nothing */
-+  if (i > 0 &&
-+      uri[i] == ':' && uri[i + 1] == '/' && uri[i + 2] == '/' &&
-+      !(i == 4 && g_ascii_strncasecmp (uri, "file", 4) == 0))
++  if (i > 0 && uri[i] == ':' &&
++      !(i == 4 && uri[i + 1] == '/' && uri[i + 2] == '/' &&
++	g_ascii_strncasecmp (uri, "file", 4) == 0))
 +    return _g_dummy_file_new (uri);
 +
    /* For other URIs fallback to the wrapped GVfs */
diff --git a/tools/win32/patches/glib-disable-python.patch b/tools/win32/patches/glib-disable-python.patch
index 261b153..2e01669 100644
--- a/tools/win32/patches/glib-disable-python.patch
+++ b/tools/win32/patches/glib-disable-python.patch
@@ -1,7 +1,7 @@
 diff --git a/configure.in b/configure.in
 index 812c372..2c0bfd3 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -380,7 +380,7 @@ fi
  AC_SUBST(PERL_PATH)
  
@@ -11,3 +11,48 @@ index 812c372..2c0bfd3 100644
  
  
  dnl ***********************
+@@ -2725,18 +2725,10 @@
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
++GLIB_GENMARSHAL=../gobject/glib-genmarshal.exe
++AC_SUBST(GLIB_GENMARSHAL)
++GLIB_COMPILE_SCHEMAS=../gobject/glib-compile-schemas.exe
++AC_SUBST(GLIB_COMPILE_SCHEMAS)
+ 
+-if test $cross_compiling = yes; then
+-  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
+-  if test x$GLIB_GENMARSHAL = xno; then
+-    AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
+-  fi
+-
+-  AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
+-  if test x$GLIB_COMPILE_SCHEMAS = xno; then
+-    AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
+-  fi
+-fi
+-
+ dnl **************************
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+--- glib-2.26.0/gio/Makefile.am~	2010-09-26 18:54:09.000000000 -0400
++++ glib-2.26.0/gio/Makefile.am	2010-10-05 20:47:52.000000000 -0400
+@@ -264,7 +264,7 @@
+ 
+ endif
+ 
+-SUBDIRS += tests
++#SUBDIRS += tests
+ 
+ libgio_2_0_la_SOURCES =		\
+ 	gappinfo.c 		\
+--- glib-2.26.0/Makefile.am~	2010-08-09 09:34:46.000000000 -0400
++++ glib-2.26.0/Makefile.am	2010-10-05 20:51:24.000000000 -0400
+@@ -3,7 +3,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build
+ 
+ bin_SCRIPTS = glib-gettextize
diff --git a/tools/win32/patches/glib-dns.patch b/tools/win32/patches/glib-dns.patch
new file mode 100644
index 0000000..f5df4fc
--- /dev/null
+++ b/tools/win32/patches/glib-dns.patch
@@ -0,0 +1,10 @@
+--- glib-2.24.0/gio/gnetworkingprivate.h~	2010-03-13 14:22:54.000000000 -0500
++++ glib-2.24.0/gio/gnetworkingprivate.h	2010-10-05 18:53:45.000000000 -0400
+@@ -28,6 +28,7 @@
+ #undef interface
+ #include <ws2tcpip.h>
+ #include <windns.h>
++#define DNS_TYPE_SRV 33 
+ #include <mswsock.h>
+ 
+ #ifdef HAVE_WSPIAPI_H
diff --git a/tools/win32/patches/glib-goption-disable-localization.patch b/tools/win32/patches/glib-goption-disable-localization.patch
index 365eeb2..1a38f81 100644
--- a/tools/win32/patches/glib-goption-disable-localization.patch
+++ b/tools/win32/patches/glib-goption-disable-localization.patch
@@ -1,16 +1,34 @@
-Index: glib/goption.c
-===================================================================
---- glib/goption.c	(revision 6663)
-+++ glib/goption.c	(working copy)
-@@ -86,6 +86,7 @@
+diff -ur glib-2.26.0/glib/glib.symbols glib-2.26.0-new//glib/glib.symbols
+--- glib-2.26.0/glib/glib.symbols	2010-09-27 09:17:56.000000000 -0400
++++ glib-2.26.0-new//glib/glib.symbols	2010-10-05 18:59:03.000000000 -0400
+@@ -901,6 +901,7 @@
+ g_option_context_add_main_entries
+ g_option_error_quark
+ g_option_context_free
++g_option_context_get_delocalize
+ g_option_context_get_description
+ g_option_context_get_help_enabled
+ g_option_context_get_ignore_unknown_options
+@@ -908,6 +909,7 @@
+ g_option_context_get_summary
+ g_option_context_new
+ g_option_context_parse
++g_option_context_set_delocalize
+ g_option_context_set_description
+ g_option_context_set_help_enabled
+ g_option_context_set_ignore_unknown_options
+diff -ur glib-2.26.0/glib/goption.c glib-2.26.0-new//glib/goption.c
+--- glib-2.26.0/glib/goption.c	2010-09-17 13:14:23.000000000 -0400
++++ glib-2.26.0-new//glib/goption.c	2010-10-05 19:04:41.000000000 -0400
+@@ -197,6 +197,7 @@
  
    guint            help_enabled   : 1;
    guint            ignore_unknown : 1;
-+  guint		   delocalize : 1;
-   
++  guint            delocalize : 1;
+ 
    GOptionGroup    *main_group;
  
-@@ -225,6 +226,7 @@
+@@ -336,6 +337,7 @@
    context->parameter_string = g_strdup (parameter_string);
    context->help_enabled = TRUE;
    context->ignore_unknown = FALSE;
@@ -18,7 +36,7 @@ Index: glib/goption.c
  
    return context;
  }
-@@ -347,6 +349,23 @@
+@@ -462,6 +464,23 @@
    return context->ignore_unknown;
  }
  
@@ -42,83 +60,70 @@ Index: glib/goption.c
  /**
   * g_option_context_add_group:
   * @context: a #GOptionContext
-@@ -1003,7 +1022,10 @@
+@@ -1151,7 +1170,10 @@
        {
- 	gchar *data;
- 	
--	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+         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 @@
+         if (!data)
+           return FALSE;
+@@ -1170,7 +1192,10 @@
        {
- 	gchar *data;
+         gchar *data;
  
--	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+-        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;
+         if (!data)
+           return FALSE;
+@@ -1203,7 +1228,10 @@
+         gchar *data;
  
  #ifdef G_OS_WIN32
--	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+-        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;
- 	
+ 
+         if (!data)
+           return FALSE;
+@@ -1226,7 +1254,10 @@
+         gchar *data;
+ 
  #ifdef G_OS_WIN32
--	data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+-        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)
- 	  {
+ 
+         if (!data)
+           return FALSE;
+@@ -1283,7 +1314,10 @@
+         else if (entry->flags & G_OPTION_FLAG_FILENAME)
+           {
  #ifdef G_OS_WIN32
--  	    data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+-            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
 +	    if (context->delocalize)
-+		data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
++	      data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
 +	    else
-+		data = g_strdup (value);
++	      data = g_strdup (value);
  #else
- 	    data = g_strdup (value);
+             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 @@
+diff -ur glib-2.26.0/glib/goption.h glib-2.26.0-new//glib/goption.h
+--- glib-2.26.0/glib/goption.h	2010-07-07 16:57:11.000000000 -0400
++++ glib-2.26.0-new//glib/goption.h	2010-10-05 18:59:03.000000000 -0400
+@@ -321,6 +321,9 @@
  void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
  							     gboolean	     ignore_unknown);
  gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
@@ -128,24 +133,3 @@ Index: glib/goption.h
  
  void            g_option_context_add_main_entries (GOptionContext      *context,
  						   const GOptionEntry  *entries,
-Index: glib/glib.symbols
-===================================================================
---- glib/glib.symbols   2008-09-02 11:09:41.000000000 -0400
-+++ glib/glib.symbols   2008-09-04 16:57:16.000000000 -0400
-@@ -809,6 +809,7 @@
- g_option_context_add_main_entries
- g_option_error_quark
- g_option_context_free
-+g_option_context_get_delocalize
- g_option_context_get_description
- g_option_context_get_help_enabled
- g_option_context_get_ignore_unknown_options
-@@ -816,6 +817,7 @@
- g_option_context_get_summary
- g_option_context_new
- g_option_context_parse
-+g_option_context_set_delocalize
- g_option_context_set_description
- g_option_context_set_help_enabled
- g_option_context_set_ignore_unknown_options
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]