2007-12-29 Tollef Fog Heen <tfheen@err.no>

	* Update to glib 1.2.10, adjust lots of the glib patches.  Gnome
	#81847.

10 files changed, 81 insertions, 24 deletions

diff --git a/glib-patches/autoconf-warning.diff b/glib-patches/autoconf-warning.diff
index b626a0c..3735b03 100644
--- a/glib-patches/autoconf-warning.diff
+++ b/glib-patches/autoconf-warning.diff
@@ -7,7 +7,7 @@
 diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h.in -x 'config.h.in~' pkg-config-0.21.orig/glib-1.2.8/configure.in pkg-config-0.21/glib-1.2.8/configure.in
 --- glib-1.2.8/configure.in	2006-08-16 20:24:29.000000000 +0200
 +++ glib-1.2.8/configure.in	2007-01-19 15:05:37.000000000 +0100
-@@ -384,11 +384,13 @@
+@@ -405,11 +405,13 @@
  	  return realloc (0, sizeof (int)) == 0;
  	}],
  	glib_cv_sane_realloc=yes
diff --git a/glib-patches/automake-warning.diff b/glib-patches/automake-warning.diff
index 1586c54..42acc83 100644
--- a/glib-patches/automake-warning.diff
+++ b/glib-patches/automake-warning.diff
@@ -17,8 +17,8 @@ diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h
  glib-config: glib-config.in
  
  INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
-@@ -60,8 +60,8 @@
- noinst_HEADERS = \
+@@ -65,8 +65,8 @@
+ glibnoinst_HEADERS =   \
  	glib.h
  
 -noinst_DATA = \
diff --git a/glib-patches/configure.in-auto-magic.diff b/glib-patches/configure.in-auto-magic.diff
index 4662bc5..df3e04e 100644
--- a/glib-patches/configure.in-auto-magic.diff
+++ b/glib-patches/configure.in-auto-magic.diff
@@ -10,7 +10,7 @@
  # The following version number definitions apply to GLib, GModule and GThread
  # as a whole, so if changes occoured in any of them, they are all
 @@ -38,7 +38,7 @@
- GLIB_BINARY_AGE=8
+ GLIB_BINARY_AGE=10
  GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
  dnl
 -AC_DIVERT_POP()dnl
@@ -43,7 +43,7 @@
  
  dnl declare --enable-* args and collect ac_help strings
  AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
-@@ -485,18 +485,20 @@
+@@ -509,18 +509,20 @@
  dnl *** dlopen() and dlsym() in system libraries
  if test -z "$G_MODULE_IMPL"; then
  	AC_CHECK_FUNC(dlopen,
diff --git a/glib-patches/configure.in-fd_set.diff b/glib-patches/configure.in-fd_set.diff
index 16249ca..de05e20 100644
--- a/glib-patches/configure.in-fd_set.diff
+++ b/glib-patches/configure.in-fd_set.diff
@@ -1,7 +1,7 @@
 diff -ru glib-1.2.8.orig/configure.in glib-1.2.8/configure.in
 --- glib-1.2.8.orig/configure.in	2005-06-26 20:38:20.468504000 +0200
 +++ glib-1.2.8/configure.in	2005-06-26 20:40:14.057549097 +0200
-@@ -315,7 +315,7 @@
+@@ -336,7 +336,7 @@
  if test $gtk_ok = yes; then
      AC_MSG_RESULT([yes, found in sys/types.h])
  else
diff --git a/glib-patches/distcheckfix.diff b/glib-patches/distcheckfix.diff
index 01e112c..e0d4d15 100644
--- a/glib-patches/distcheckfix.diff
+++ b/glib-patches/distcheckfix.diff
@@ -8,7 +8,7 @@
 +CLEANFILES = makefile.msc
 --- glib-1.2.8/Makefile.am.old	2005-03-28 13:20:29.053829656 +0200
 +++ glib-1.2.8/Makefile.am	2005-03-28 13:20:47.429836916 +0200
-@@ -120,3 +120,8 @@
+@@ -128,3 +128,8 @@
  	     && cp INSTALL README $(distdir) ; \
  	fi \
  	&& cp glib.spec $(distdir)
diff --git a/glib-patches/gmodule_makefile_am_correct_assignment.diff b/glib-patches/gmodule_makefile_am_correct_assignment.diff
index a4664a2..902bb2e 100644
--- a/glib-patches/gmodule_makefile_am_correct_assignment.diff
+++ b/glib-patches/gmodule_makefile_am_correct_assignment.diff
@@ -1,6 +1,6 @@
 --- glib-1.2.8/gmodule/Makefile.am	2005-02-21 00:33:40.818983432 +0100
 +++ glib-1.2.8-pkgconfig/gmodule/Makefile.am	2005-02-20 23:44:16.122685776 +0100
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
  libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
  
  noinst_PROGRAMS = testgmodule
diff --git a/glib-patches/gstrfuncs_G_GNUC_PRETTY_FUNC_is_a_variable.diff b/glib-patches/gstrfuncs_G_GNUC_PRETTY_FUNC_is_a_variable.diff
new file mode 100644
index 0000000..5fa7203
--- /dev/null
+++ b/glib-patches/gstrfuncs_G_GNUC_PRETTY_FUNC_is_a_variable.diff
@@ -0,0 +1,59 @@
+
+Patch stolen from glib1.2_1.2.10-17 in Debian.  G_GNUC_PRETTY_FUNCTION
+is a variable now, not a string constant.
+
+--- glib1.2-1.2.10.orig/gstrfuncs.c
++++ glib1.2-1.2.10/gstrfuncs.c
+@@ -867,8 +867,8 @@
+                   /* beware of positional parameters
+                    */
+                 case '$':
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
+-                             "(): unable to handle positional parameters (%%n$)");
++                  g_warning ("%s(): unable to handle positional parameters (%%n$)", 
++                             G_GNUC_PRETTY_FUNCTION );
+                   len += 1024; /* try adding some safety padding */
+                   break;
+ 
+@@ -1034,8 +1034,8 @@
+                   /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
+                   conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
+                   if (spec.mod_extra_long)
+-                    g_warning (G_GNUC_PRETTY_FUNCTION
+-                               "(): unable to handle long double, collecting double only");
++                    g_warning ("%s(): unable to handle long double, collecting double only", 
++                               G_GNUC_PRETTY_FUNCTION);
+ #ifdef HAVE_LONG_DOUBLE
+ #error need to implement special handling for long double
+ #endif
+@@ -1047,7 +1047,7 @@
+                       gint exp = u_double.mpn.biased_exponent;
+ 
+                       exp -= G_IEEE754_DOUBLE_BIAS;
+-                      exp = exp * G_LOG_2_BASE_10 + 1;
++                      exp = abs(exp * G_LOG_2_BASE_10) + 1;
+                       conv_len += exp;
+                     }
+                   /* some printf() implementations require extra padding for rounding */
+@@ -1077,8 +1077,8 @@
+                   conv_done = TRUE;
+                   if (spec.mod_long)
+                     {
+-                      g_warning (G_GNUC_PRETTY_FUNCTION
+-                                 "(): unable to handle wide char strings");
++                      g_warning ("%s(): unable to handle wide char strings", 
++                                 G_GNUC_PRETTY_FUNCTION);
+                       len += 1024; /* try adding some safety padding */
+                     }
+                   break;
+@@ -1108,8 +1108,8 @@
+                   conv_len += format - spec_start;
+                   break;
+                 default:
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
+-                             "(): unable to handle `%c' while parsing format",
++                  g_warning ("%s(): unable to handle `%c' while parsing format",
++                             G_GNUC_PRETTY_FUNCTION,
+                              c);
+                   break;
+                 }
diff --git a/glib-patches/no-dist-distclean-files.diff b/glib-patches/no-dist-distclean-files.diff
index be32e5e..71bf5a6 100644
--- a/glib-patches/no-dist-distclean-files.diff
+++ b/glib-patches/no-dist-distclean-files.diff
@@ -13,6 +13,6 @@ diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h
 -	glibconfig.h.win32	\
  	glibconfig.h.win32.in	\
 -	config.h.win32		\
- 	config.h.win32.in
- 
- noinst_LTLIBRARIES = libglib.la
+ 	config.h.win32.in	\
+ 	glib.pc.in 		\
+ 	gmodule.pc.in		\
diff --git a/glib-patches/pthread-config-fix.diff b/glib-patches/pthread-config-fix.diff
index cc42455..d9eba3e 100644
--- a/glib-patches/pthread-config-fix.diff
+++ b/glib-patches/pthread-config-fix.diff
@@ -1,6 +1,6 @@
 --- glib-1.2.8/configure.in	2000-05-25 02:29:09.000000000 +0200
 +++ glib-1.2.8/configure.in	2004-10-13 09:45:16.965305752 +0200
-@@ -833,6 +833,7 @@
+@@ -888,6 +888,7 @@
  		AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
  		# DCE Threads return -1 as failure, posix ETIMEDOUT.
  		AC_TRY_RUN([#include <pthread.h>
@@ -8,7 +8,7 @@
  			int main () { 
  			pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
  			pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-@@ -841,6 +842,7 @@
+@@ -896,6 +897,7 @@
  			gettimeofday (&tval, NULL);
  			tspec.tv_sec = tval.tv_sec;
  			tspec.tv_nsec = 0;
diff --git a/glib-patches/remove-strsignal-prototype.diff b/glib-patches/remove-strsignal-prototype.diff
index 014b9e7..c152b80 100644
--- a/glib-patches/remove-strsignal-prototype.diff
+++ b/glib-patches/remove-strsignal-prototype.diff
@@ -1,17 +1,15 @@
 --- glib-1.2.8/gstrfuncs.c	2000-04-17 17:05:16.000000000 +0200
 +++ glib-1.2.8/gstrfuncs.c.new	2005-04-02 16:39:10.627002672 +0200
-@@ -38,9 +38,10 @@
- #include <string.h>
- #include <locale.h>
- #include <ctype.h>		/* For tolower() */
- #if !defined (HAVE_STRSIGNAL) || !defined(NO_SYS_SIGLIST_DECL)
-+#define _GNU_SOURCE
- #include <signal.h>
+@@ -31,7 +31,8 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
  #endif
- #include "glib.h"
- /* do not include <unistd.h> in this place since it
-  * inteferes with g_strsignal() on some OSes
-@@ -671,7 +671,6 @@
++#define _GNU_SOURCE
+ 
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -702,7 +703,6 @@
    char *msg;
  
  #ifdef HAVE_STRSIGNAL