update gtk2 from 2.24.22 to 2.24.29

Rebase all patches.

fix #1112

1 files changed, 27 insertions, 27 deletions

diff --git a/src/gtk2-1-fixes.patch b/src/gtk2-1-fixes.patch
index 1f1acf8..0f93413 100644
--- a/src/gtk2-1-fixes.patch
+++ b/src/gtk2-1-fixes.patch
@@ -182,15 +182,15 @@ diff --git a/gtk/Makefile.in b/gtk/Makefile.in
 index 1111111..2222222 100644
 --- a/gtk/Makefile.in
 +++ b/gtk/Makefile.in
-@@ -5693,7 +5693,7 @@ stamp-icons: $(STOCK_ICONS)
+@@ -5713,7 +5713,7 @@ stamp-icons: $(STOCK_ICONS)
  	) done 								\
  	&& touch stamp-icons
  
 -gtkbuiltincache.h: @REBUILD@ stamp-icons
 +_disabled_gtkbuiltincache.h: @REBUILD@ stamp-icons
- 	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+ 	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
  	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
- 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	   --include-image-data							\
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
@@ -202,7 +202,7 @@ diff --git a/demos/Makefile.in b/demos/Makefile.in
 index 1111111..2222222 100644
 --- a/demos/Makefile.in
 +++ b/demos/Makefile.in
-@@ -516,7 +516,7 @@ LDADDS = \
+@@ -529,7 +529,7 @@ LDADDS = \
  	$(GTK_DEP_LIBS)							\
  	$(MATH_LIB)
  
@@ -222,7 +222,7 @@ diff --git a/configure b/configure
 index 1111111..2222222 100755
 --- a/configure
 +++ b/configure
-@@ -4537,9 +4537,9 @@ if test "${enable_static+set}" = set; then :
+@@ -4649,9 +4649,9 @@ if test "${enable_static+set}" = set; then :
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
@@ -232,9 +232,9 @@ index 1111111..2222222 100755
 -     enable_static=no
 +     enable_static=yes
        # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
        for pkg in $enableval; do
-@@ -4552,7 +4552,7 @@ if test "${enable_static+set}" = set; then :
+@@ -4664,7 +4664,7 @@ if test "${enable_static+set}" = set; then :
        ;;
      esac
  else
@@ -243,7 +243,7 @@ index 1111111..2222222 100755
  fi
  
  
-@@ -5121,15 +5121,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5233,15 +5233,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  if test "$os_win32" = "yes"; then
    if test x$enable_static = xyes -o x$enable_static = x; then
@@ -265,7 +265,7 @@ index 1111111..2222222 100755
  fi
  
  enable_win32_dll=yes
-@@ -8958,7 +8958,7 @@ func_stripname_cnf ()
+@@ -9265,7 +9265,7 @@ func_stripname_cnf ()
  if test "${enable_shared+set}" = set; then :
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
@@ -274,15 +274,15 @@ index 1111111..2222222 100755
      no) enable_shared=no ;;
      *)
        enable_shared=no
-@@ -8967,14 +8967,14 @@ if test "${enable_shared+set}" = set; then :
+@@ -9274,14 +9274,14 @@ if test "${enable_shared+set}" = set; then :
        for pkg in $enableval; do
- 	IFS="$lt_save_ifs"
+ 	IFS=$lt_save_ifs
  	if test "X$pkg" = "X$p"; then
 -	  enable_shared=yes
 +	  enable_shared=no
  	fi
        done
-       IFS="$lt_save_ifs"
+       IFS=$lt_save_ifs
        ;;
      esac
  else
@@ -291,24 +291,24 @@ index 1111111..2222222 100755
  fi
  
  
-@@ -12861,7 +12861,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
+@@ -13455,7 +13455,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
    # are all built from PIC.
    case $host_os in
    aix3*)
--    test "$enable_shared" = yes && enable_static=no
-+    test "$enable_shared" = yes && enable_static=yes
+-    test yes = "$enable_shared" && enable_static=no
++    test yes = "$enable_shared" && enable_static=yes
      if test -n "$RANLIB"; then
        archive_cmds="$archive_cmds~\$RANLIB \$lib"
        postinstall_cmds='$RANLIB $lib'
-@@ -12870,7 +12870,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
- 
-   aix[4-9]*)
-     if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--      test "$enable_shared" = yes && enable_static=no
-+      test "$enable_shared" = yes && enable_static=yes
+@@ -13467,7 +13467,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
+       case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+       yes,aix,yes) ;;			# shared object as lib.so file only
+       yes,svr4,*) ;;			# shared object as lib.so archive member only
+-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++      yes,*) enable_static=yes ;;	# shared object in lib.a archive as well
+       esac
      fi
      ;;
-   esac
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
@@ -320,7 +320,7 @@ diff --git a/configure b/configure
 index 1111111..2222222 100755
 --- a/configure
 +++ b/configure
-@@ -23459,7 +23459,7 @@ fi
+@@ -24018,7 +24018,7 @@ fi
  fi
  
  if test "x$gdktarget" = "xwin32"; then
@@ -340,7 +340,7 @@ diff --git a/configure b/configure
 index 1111111..2222222 100755
 --- a/configure
 +++ b/configure
-@@ -23691,9 +23691,9 @@ fi
+@@ -24250,9 +24250,9 @@ fi
  CFLAGS="$saved_cflags"
  LDFLAGS="$saved_ldflags"
  
@@ -378,9 +378,9 @@ index 1111111..2222222 100644
 -{
 -  typedef GObject* (*GMarshalFunc_OBJECT__VOID) (gpointer     data1,
 -                                                 gpointer     data2);
--  register GMarshalFunc_OBJECT__VOID callback;
--  register GCClosure *cc = (GCClosure*) closure;
--  register gpointer data1, data2;
+-  GMarshalFunc_OBJECT__VOID callback;
+-  GCClosure *cc = (GCClosure*) closure;
+-  gpointer data1, data2;
 -  GObject* v_return;
 -
 -  g_return_if_fail (return_value != NULL);