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

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

diff --git a/ChangeLog b/ChangeLog
index e9cdfbd171330b00c502f698cdb65a1add4fca18..edc6965065269eb503be2d1ae9dd06af148d3a34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-29  Tollef Fog Heen  <tfheen@err.no>
+
+       * Update to glib 1.2.10, adjust lots of the glib patches.  Gnome
+       #81847.
+
 2007-06-19  Tollef Fog Heen  <tfheen@err.no>
 
        * pkg.m4: Fix bug so it's possible to override variables in case

diff --git a/Makefile.am b/Makefile.am
index bb7db28ad51460591dd6c51f05c1571276c7c64d..89f5039f8b904731a8ba141f60edcddcd12026c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ if USE_INSTALLED_GLIB
 included_glib_includes = @GLIB_CFLAGS@
 pkg_config_LDADD=@GLIB_LIBS@
 else
-GLIB_SUBDIR = glib-1.2.8
-included_glib_includes = -I./glib-1.2.8
-pkg_config_LDADD=glib-1.2.8/libglib.la
+GLIB_SUBDIR = glib-1.2.10
+included_glib_includes = -I./glib-1.2.10
+pkg_config_LDADD=glib-1.2.10/libglib.la
 endif
 SUBDIRS = $(GLIB_SUBDIR) check
 

diff --git a/autogen.sh b/autogen.sh
index d1e6dfe15637d6a6259d048fb45d78f54b30f38f..da5958b644068102df89be59922c94f2529711b3 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -55,29 +55,30 @@ test $TEST_TYPE $FILE || {
        exit 1
 }
 
-rm -r glib-1.2.8
-gunzip --stdout glib-1.2.8.tar.gz | tar xf - || { 
+rm -r glib-1.2.10
+gunzip --stdout glib-1.2.10.tar.gz | tar xf - || { 
     echo "glib tarball not unpacked"
     exit 1
 }
 
-chmod +w `find glib-1.2.8 -name Makefile.am`
-perl -p -i.bak -e "s/lib_LTLIBRARIES/noinst_LTLIBRARIES/g" `find glib-1.2.8 -name Makefile.am`
-perl -p -i.bak -e "s/bin_SCRIPTS/noinst_SCRIPTS/g" `find glib-1.2.8 -name Makefile.am`
-perl -p -i.bak -e "s/include_HEADERS/noinst_HEADERS/g" `find glib-1.2.8 -name Makefile.am`
-perl -p -i.bak -e "s/[a-zA-Z0-9]+_DATA/noinst_DATA/g" `find glib-1.2.8 -name Makefile.am`
-perl -p -i.bak -e "s/info_TEXINFOS/noinst_TEXINFOS/g" `find glib-1.2.8 -name Makefile.am`
-perl -p -i.bak -e "s/man_MANS/noinst_MANS/g" `find glib-1.2.8 -name Makefile.am`
+chmod +w `find glib-1.2.10 -name Makefile.am`
+perl -p -i.bak -e "s/lib_LTLIBRARIES/noinst_LTLIBRARIES/g" `find glib-1.2.10 -name Makefile.am`
+perl -p -i.bak -e "s/bin_SCRIPTS/noinst_SCRIPTS/g" `find glib-1.2.10 -name Makefile.am`
+perl -p -i.bak -e "s/include_HEADERS/noinst_HEADERS/g" `find glib-1.2.10 -name Makefile.am`
+perl -p -i.bak -e "s/glibnoinst_HEADERS/noinst_HEADERS/g" `find glib-1.2.10 -name Makefile.am`
+perl -p -i.bak -e 's/([a-zA-Z0-9]+)_DATA/noinst_DATA/g' `find glib-1.2.10 -name Makefile.am`
+perl -p -i.bak -e "s/info_TEXINFOS/noinst_TEXINFOS/g" `find glib-1.2.10 -name Makefile.am`
+perl -p -i.bak -e "s/man_MANS/noinst_MANS/g" `find glib-1.2.10 -name Makefile.am`
 
 ## patch gslist.c to have stable sort
-perl -p -w -i.bak -e 's/if \(compare_func\(l1->data,l2->data\) < 0\)/if \(compare_func\(l1->data,l2->data\) <= 0\)/g' glib-1.2.8/gslist.c
+perl -p -w -i.bak -e 's/if \(compare_func\(l1->data,l2->data\) < 0\)/if \(compare_func\(l1->data,l2->data\) <= 0\)/g' glib-1.2.10/gslist.c
 
 # Update random auto* files to actually have something which have a snowball's
 # chance in a hot place of working with modern auto* tools.
 
-(cd glib-1.2.8 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p || exit 1; done ) || exit 1
+(cd glib-1.2.10 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p || exit 1; done ) || exit 1
 
-(cd glib-1.2.8 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && $AUTOCONF) || exit 1
+(cd glib-1.2.10 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && $AUTOCONF) || exit 1
 
 if test -z "$*"; then
        echo "I am going to run ./configure with no arguments - if you wish "

diff --git a/configure.in b/configure.in
index 64b91d5dea12c40baabd4b0ea6172b7d4d61ef2e..cedcff95e6fe601c3efc6ea8c46877e74e7d9eab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -122,7 +122,7 @@ if test x$use_installed_glib = xyes; then
   AC_SUBST(GLIB_CFLAGS)
 
 else
-  AC_CONFIG_SUBDIRS(glib-1.2.8)
+  AC_CONFIG_SUBDIRS(glib-1.2.10)
 fi # !native_win32
 
 AC_FUNC_ALLOCA

diff --git a/glib-1.2.10.tar.gz b/glib-1.2.10.tar.gz
new file mode 100644 (file)
index 0000000..a92fd59
Binary files /dev/null and b/glib-1.2.10.tar.gz differ

diff --git a/glib-1.2.8.tar.gz b/glib-1.2.8.tar.gz
deleted file mode 100644 (file)
index 9f70ce6..0000000
Binary files a/glib-1.2.8.tar.gz and /dev/null differ

diff --git a/glib-patches/autoconf-warning.diff b/glib-patches/autoconf-warning.diff
index b626a0c2860317cc7b4f16c7af9126ac927426e1..3735b03fc5e6c9259ec566ae2bc0892bcc71bff0 100644 (file)
--- 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 1586c5490e1f2264ba0f80da3d2b3704f6445476..42acc83c0faab3cd04de3bf7e951380da63bedc9 100644 (file)
--- 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 4662bc5c48197b546b0ed43290102863f82055df..df3e04efad3d33d8f96ca87c12895d153e97d172 100644 (file)
--- 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 16249ca954386dd4527ce6af04f4125f6acdfe93..de05e20247043988b1a1ddf35d744d6fee4aa3e8 100644 (file)
--- 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 01e112c7fca6e56ebd4b05bfdc8613177460c5e1..e0d4d157293e7790daef26d371ae5c32c2330a4a 100644 (file)
--- 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 a4664a2b7ed1d048fd25b976b84f2ef9eb5ea1ef..902bb2e8534d62a47b4933779dd2bc07d88c1b02 100644 (file)
--- 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 (file)
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 be32e5e4ff8bf72686121a838483c0ca8420fb7c..71bf5a66ccfe01d8722adb90d4e30dc3e39f5daa 100644 (file)
--- 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 cc42455ff43cf0a5cb4ea8c3561bb4213c09e246..d9eba3e1010e99bccff316c89e7f229b46b8f850 100644 (file)
--- 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 014b9e7e06975d8de4e930d4b9252f81e38f3a97..c152b80b51231b1123c919425e9c4c7a82102c25 100644 (file)
--- 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

diff --git a/partial-glib.h b/partial-glib.h
index 0f1fd8169b0833979caab23c72f9ee620d9ba975..56e6b4274983893d681e6a11d57cab492ecf6ef0 100644 (file)
--- a/partial-glib.h
+++ b/partial-glib.h
@@ -1,6 +1,6 @@
 #ifndef PKG_CONFIG_PARTIAL_GLIB_H
 #define PKG_CONFIG_PARTIAL_GLIB_H
 
-#include "glib-1.2.8/glib.h"
+#include "glib-1.2.10/glib.h"
 
 #endif