diff --git a/debian/changelog b/debian/changelog
index 8e882c0c5e..55a6849fad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,11 @@
 gtk+2.0 (2.12.2-1) UNRELEASED; urgency=low
 
-  [ Sebastian Dröge ]
   * New upstream stable release; no API change; bug fixes and translation
     updated.
     - Drop patches 034_gtkcupsutils_type_fix, 071_fix_gdk_window_null_crasher
       fixed upstream.
     - Update relibtoolizing patch, 070_mandatory-relibtoolize.
 
-  [ Josselin Mouette ]
-  * 003_gdk.pc_privates.patch: consider x11 as a public dependency and
-    not a private one, because gdkx.h #include's some of its headers and
-    packages can therefore use X11 functions. Closes: #453178.
-  * Refresh other patches; regenerate 070_mandatory-relibtoolize.
-
  -- Sebastian Dröge <slomo@debian.org>  Tue, 27 Nov 2007 05:15:01 +0100
 
 gtk+2.0 (2.12.1-3) unstable; urgency=low
diff --git a/debian/patches/003_gdk.pc_privates.patch b/debian/patches/003_gdk.pc_privates.patch
index 6e4be2afdf..67cbecebce 100644
--- a/debian/patches/003_gdk.pc_privates.patch
+++ b/debian/patches/003_gdk.pc_privates.patch
@@ -1,23 +1,12 @@
-Index: gtk+-2.12.2/configure.in
+Index: gtk+-2.12.1/configure.in
 ===================================================================
---- gtk+-2.12.2.orig/configure.in	2007-11-27 22:53:31.661288266 +0100
-+++ gtk+-2.12.2/configure.in	2007-11-27 23:04:39.479345048 +0100
-@@ -1085,7 +1085,8 @@ if test "x$gdktarget" = "xx11"; then
-   #
-   if $PKG_CONFIG --exists x11 xext xrender; then
-     have_base_x_pc=true
--    X_PACKAGES="$X_PACKAGES x11 xext xrender"
-+    X_BASE_PACKAGES=x11
-+    X_PACKAGES="$X_PACKAGES xext xrender"
-     x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
-     X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
-     
-@@ -1459,21 +1460,25 @@ LDFLAGS="$saved_ldflags"
+--- gtk+-2.12.1.orig/configure.in	2007-11-18 00:51:06.548600130 +0100
++++ gtk+-2.12.1/configure.in	2007-11-18 01:06:06.279872893 +0100
+@@ -1459,21 +1459,23 @@ LDFLAGS="$saved_ldflags"
  
  GDK_PACKAGES="$PANGO_PACKAGES"
  if test "x$gdktarget" = "xx11"; then
 -  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
-+  GDK_PACKAGES="$GDK_PACKAGES $X_BASE_PACKAGES"
 +  GDK_PRIVATE_PACKAGES="$X_PACKAGES"
  fi
 -GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
@@ -34,7 +23,6 @@ Index: gtk+-2.12.2/configure.in
    GDK_EXTRA_LIBS=
 +else
 +  GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
-+  GDK_PRIVATE_PACKAGES=
  fi
  
  AC_SUBST(GDK_PACKAGES)
@@ -42,10 +30,10 @@ Index: gtk+-2.12.2/configure.in
  AC_SUBST(GDK_EXTRA_LIBS)
  AC_SUBST(GDK_EXTRA_CFLAGS)
  AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+-2.12.2/gdk-2.0.pc.in
+Index: gtk+-2.12.1/gdk-2.0.pc.in
 ===================================================================
---- gtk+-2.12.2.orig/gdk-2.0.pc.in	2007-11-26 20:40:52.000000000 +0100
-+++ gtk+-2.12.2/gdk-2.0.pc.in	2007-11-27 22:53:32.877357566 +0100
+--- gtk+-2.12.1.orig/gdk-2.0.pc.in	2007-11-17 23:53:16.038827049 +0100
++++ gtk+-2.12.1/gdk-2.0.pc.in	2007-11-18 01:06:30.821271428 +0100
 @@ -8,5 +8,6 @@ Name: GDK
  Description: GIMP Drawing Kit (${target} target)
  Version: @VERSION@
diff --git a/debian/patches/006_proper-directfb-modules.patch b/debian/patches/006_proper-directfb-modules.patch
index 9f159446eb..951385029e 100644
--- a/debian/patches/006_proper-directfb-modules.patch
+++ b/debian/patches/006_proper-directfb-modules.patch
@@ -1,10 +1,10 @@
 GNOME #447118; related to Debian #381081
 
-Index: gtk+-2.12.2/configure.in
+Index: gtk+-2.12.1/configure.in
 ===================================================================
---- gtk+-2.12.2.orig/configure.in	2007-11-27 23:06:22.533217754 +0100
-+++ gtk+-2.12.2/configure.in	2007-11-27 23:06:23.961299135 +0100
-@@ -1405,8 +1405,18 @@ if test "x$gdktarget" = "xdirectfb"; the
+--- gtk+-2.12.1.orig/configure.in	2007-11-18 00:52:41.125989789 +0100
++++ gtk+-2.12.1/configure.in	2007-11-18 00:53:48.389822936 +0100
+@@ -1404,8 +1404,18 @@ if test "x$gdktarget" = "xdirectfb"; the
  
    if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
        AC_MSG_RESULT(found)
@@ -25,12 +25,12 @@ Index: gtk+-2.12.2/configure.in
    else
        AC_MSG_ERROR([
  *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend 
-@@ -1458,7 +1468,7 @@ fi
+@@ -1457,7 +1467,7 @@ fi
  CFLAGS="$saved_cflags"
  LDFLAGS="$saved_ldflags"
  
 -GDK_PACKAGES="$PANGO_PACKAGES"
 +GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES"
  if test "x$gdktarget" = "xx11"; then
-   GDK_PACKAGES="$GDK_PACKAGES $X_BASE_PACKAGES"
    GDK_PRIVATE_PACKAGES="$X_PACKAGES"
+ fi
diff --git a/debian/patches/010_gdkpixbuf_-lm.patch b/debian/patches/010_gdkpixbuf_-lm.patch
index f04e636d33..58e05a6bc5 100644
--- a/debian/patches/010_gdkpixbuf_-lm.patch
+++ b/debian/patches/010_gdkpixbuf_-lm.patch
@@ -1,8 +1,8 @@
-Index: gtk+-2.12.2/configure.in
+Index: gtk+-2.12.1/configure.in
 ===================================================================
---- gtk+-2.12.2.orig/configure.in	2007-11-27 23:06:23.961299135 +0100
-+++ gtk+-2.12.2/configure.in	2007-11-27 23:06:56.411148347 +0100
-@@ -1540,7 +1540,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr
+--- gtk+-2.12.1.orig/configure.in	2007-11-18 01:23:24.599043331 +0100
++++ gtk+-2.12.1/configure.in	2007-11-18 01:23:24.695048802 +0100
+@@ -1537,7 +1537,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr
  CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
  
  if test $enable_explicit_deps != yes ; then
diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch
index 97a81e72f1..5004ef2e14 100644
--- a/debian/patches/070_mandatory-relibtoolize.patch
+++ b/debian/patches/070_mandatory-relibtoolize.patch
@@ -9,11 +9,10 @@ exclude config.guess and sub with diff -urN -x config.guess -x config.sub
 This is required because of patches touching autotools files, but also because
 of upstream using an older libtool; see GNOME #484426; Debian #445001.
 
-Index: gtk+-2.12.2/aclocal.m4
-===================================================================
---- gtk+-2.12.2.orig/aclocal.m4	2007-11-26 20:44:10.000000000 +0100
-+++ gtk+-2.12.2/aclocal.m4	2007-11-27 23:07:13.340113074 +0100
-@@ -941,7 +941,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/aclocal.m4 gtk+2.0-2.12.2/aclocal.m4
+--- gtk+2.0-2.12.2.old/aclocal.m4	2007-11-26 20:44:10.000000000 +0100
++++ gtk+2.0-2.12.2/aclocal.m4	2007-11-27 05:24:42.000000000 +0100
+@@ -941,7 +941,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
@@ -22,7 +21,7 @@ Index: gtk+-2.12.2/aclocal.m4
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1493,7 +1493,6 @@ s390*-*linux*|sparc*-*linux*)
+@@ -1493,7 +1493,6 @@
        esac
        ;;
      *64-bit*)
@@ -30,7 +29,7 @@ Index: gtk+-2.12.2/aclocal.m4
        case $host in
          x86_64-*kfreebsd*-gnu)
            LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -2552,13 +2551,11 @@ linux* | k*bsd*-gnu)
+@@ -2552,13 +2551,11 @@
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -45,7 +44,7 @@ Index: gtk+-2.12.2/aclocal.m4
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2570,6 +2567,18 @@ linux* | k*bsd*-gnu)
+@@ -2570,6 +2567,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -64,7 +63,7 @@ Index: gtk+-2.12.2/aclocal.m4
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -3344,7 +3353,7 @@ linux* | k*bsd*-gnu)
+@@ -3344,7 +3353,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -73,7 +72,7 @@ Index: gtk+-2.12.2/aclocal.m4
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -4378,7 +4387,7 @@ case $host_os in
+@@ -4378,7 +4387,7 @@
  	;;
      esac
      ;;
@@ -82,7 +81,7 @@ Index: gtk+-2.12.2/aclocal.m4
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -6059,7 +6068,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6059,7 +6068,7 @@
  	    ;;
  	esac
  	;;
@@ -91,7 +90,7 @@ Index: gtk+-2.12.2/aclocal.m4
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -6434,6 +6443,9 @@ ifelse([$1],[CXX],[
+@@ -6434,6 +6443,9 @@
    cygwin* | mingw*)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
    ;;
@@ -101,7 +100,7 @@ Index: gtk+-2.12.2/aclocal.m4
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -6639,12 +6651,13 @@ EOF
+@@ -6639,12 +6651,13 @@
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -116,7 +115,7 @@ Index: gtk+-2.12.2/aclocal.m4
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -7076,7 +7089,7 @@ _LT_EOF
+@@ -7076,7 +7089,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -125,7 +124,7 @@ Index: gtk+-2.12.2/aclocal.m4
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -8311,7 +8324,7 @@ AC_ARG_ENABLE(glibtest, [  --disable-gli
+@@ -8311,7 +8324,7 @@
        esac
    done
  
@@ -134,11 +133,10 @@ Index: gtk+-2.12.2/aclocal.m4
  
    no_glib=""
  
-Index: gtk+-2.12.2/configure
-===================================================================
---- gtk+-2.12.2.orig/configure	2007-11-26 20:44:23.000000000 +0100
-+++ gtk+-2.12.2/configure	2007-11-27 23:07:22.448632139 +0100
-@@ -863,6 +863,8 @@ AMDEPBACKSLASH
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/configure gtk+2.0-2.12.2/configure
+--- gtk+2.0-2.12.2.old/configure	2007-11-26 20:44:23.000000000 +0100
++++ gtk+2.0-2.12.2/configure	2007-11-27 05:24:48.000000000 +0100
+@@ -863,6 +863,8 @@
  CCDEPMODE
  am__fastdepCC_TRUE
  am__fastdepCC_FALSE
@@ -147,7 +145,7 @@ Index: gtk+-2.12.2/configure
  CXX
  CXXFLAGS
  ac_ct_CXX
-@@ -1016,6 +1018,7 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS
+@@ -1016,6 +1018,7 @@
  USE_DIRECTFB_TRUE
  USE_DIRECTFB_FALSE
  GDK_PACKAGES
@@ -155,7 +153,7 @@ Index: gtk+-2.12.2/configure
  GDK_EXTRA_LIBS
  GDK_EXTRA_CFLAGS
  GDK_DEP_LIBS
-@@ -3872,6 +3875,16 @@ fi
+@@ -3872,6 +3875,16 @@
  
  
  
@@ -172,7 +170,7 @@ Index: gtk+-2.12.2/configure
  for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -5098,7 +5111,7 @@ linux* | k*bsd*-gnu)
+@@ -5098,7 +5111,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -181,7 +179,7 @@ Index: gtk+-2.12.2/configure
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -5219,7 +5232,7 @@ ia64-*-hpux*)
+@@ -5219,7 +5232,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -190,7 +188,7 @@ Index: gtk+-2.12.2/configure
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -5284,7 +5297,6 @@ s390*-*linux*|sparc*-*linux*)
+@@ -5284,7 +5297,6 @@
        esac
        ;;
      *64-bit*)
@@ -198,7 +196,7 @@ Index: gtk+-2.12.2/configure
        case $host in
          x86_64-*kfreebsd*-gnu)
            LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -7779,11 +7791,11 @@ else
+@@ -7779,11 +7791,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -212,7 +210,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -8069,11 +8081,11 @@ else
+@@ -8069,11 +8081,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -226,7 +224,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -8173,11 +8185,11 @@ else
+@@ -8173,11 +8185,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -240,7 +238,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -8437,12 +8449,13 @@ EOF
+@@ -8437,12 +8449,13 @@
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -255,7 +253,7 @@ Index: gtk+-2.12.2/configure
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -8986,7 +8999,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8986,7 +8999,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -264,7 +262,7 @@ Index: gtk+-2.12.2/configure
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -9681,13 +9694,11 @@ linux* | k*bsd*-gnu)
+@@ -9681,13 +9694,11 @@
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -279,7 +277,7 @@ Index: gtk+-2.12.2/configure
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9699,6 +9710,18 @@ linux* | k*bsd*-gnu)
+@@ -9699,6 +9710,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -298,7 +296,7 @@ Index: gtk+-2.12.2/configure
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10524,7 +10547,7 @@ else
+@@ -10524,7 +10547,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
@@ -307,7 +305,7 @@ Index: gtk+-2.12.2/configure
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -10624,7 +10647,7 @@ else
+@@ -10624,7 +10647,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
@@ -316,7 +314,7 @@ Index: gtk+-2.12.2/configure
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12234,7 +12257,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12234,7 +12257,7 @@
  	;;
      esac
      ;;
@@ -325,7 +323,7 @@ Index: gtk+-2.12.2/configure
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -12935,7 +12958,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12935,7 +12958,7 @@
  	    ;;
  	esac
  	;;
@@ -334,7 +332,7 @@ Index: gtk+-2.12.2/configure
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -13044,11 +13067,11 @@ else
+@@ -13044,11 +13067,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -348,7 +346,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -13148,11 +13171,11 @@ else
+@@ -13148,11 +13171,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -362,7 +360,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -13220,6 +13243,9 @@ echo $ECHO_N "checking whether the $comp
+@@ -13220,6 +13243,9 @@
    cygwin* | mingw*)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
    ;;
@@ -372,7 +370,7 @@ Index: gtk+-2.12.2/configure
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -13649,13 +13675,11 @@ linux* | k*bsd*-gnu)
+@@ -13649,13 +13675,11 @@
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -387,7 +385,7 @@ Index: gtk+-2.12.2/configure
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -13667,6 +13691,18 @@ linux* | k*bsd*-gnu)
+@@ -13667,6 +13691,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -406,7 +404,7 @@ Index: gtk+-2.12.2/configure
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14712,11 +14748,11 @@ else
+@@ -14712,11 +14748,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -420,7 +418,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14816,11 +14852,11 @@ else
+@@ -14816,11 +14852,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -434,7 +432,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -15080,12 +15116,13 @@ EOF
+@@ -15080,12 +15116,13 @@
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -449,7 +447,7 @@ Index: gtk+-2.12.2/configure
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -15609,7 +15646,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15609,7 +15646,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -458,7 +456,7 @@ Index: gtk+-2.12.2/configure
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -16252,13 +16289,11 @@ linux* | k*bsd*-gnu)
+@@ -16252,13 +16289,11 @@
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -473,7 +471,7 @@ Index: gtk+-2.12.2/configure
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16270,6 +16305,18 @@ linux* | k*bsd*-gnu)
+@@ -16270,6 +16305,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -492,7 +490,7 @@ Index: gtk+-2.12.2/configure
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17005,11 +17052,11 @@ else
+@@ -17005,11 +17052,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -506,7 +504,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -17295,11 +17342,11 @@ else
+@@ -17295,11 +17342,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -520,7 +518,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -17399,11 +17446,11 @@ else
+@@ -17399,11 +17446,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -534,7 +532,7 @@ Index: gtk+-2.12.2/configure
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -17663,12 +17710,13 @@ EOF
+@@ -17663,12 +17710,13 @@
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -549,7 +547,7 @@ Index: gtk+-2.12.2/configure
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -18212,7 +18260,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18212,7 +18260,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -558,7 +556,7 @@ Index: gtk+-2.12.2/configure
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -18855,13 +18903,11 @@ linux* | k*bsd*-gnu)
+@@ -18855,13 +18903,11 @@
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -573,7 +571,7 @@ Index: gtk+-2.12.2/configure
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18873,6 +18919,18 @@ linux* | k*bsd*-gnu)
+@@ -18873,6 +18919,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -592,7 +590,7 @@ Index: gtk+-2.12.2/configure
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -23999,7 +24057,7 @@ fi
+@@ -23999,7 +24057,7 @@
  
  fi
  if test -n "$PKG_CONFIG"; then
@@ -601,17 +599,7 @@ Index: gtk+-2.12.2/configure
  	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
  echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
  	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-@@ -28991,7 +29049,8 @@ echo "$as_me: error:
-   #
-   if $PKG_CONFIG --exists x11 xext xrender; then
-     have_base_x_pc=true
--    X_PACKAGES="$X_PACKAGES x11 xext xrender"
-+    X_BASE_PACKAGES=x11
-+    X_PACKAGES="$X_PACKAGES xext xrender"
-     x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
-     X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
- 
-@@ -32441,8 +32500,18 @@ echo $ECHO_N "checking for DirectFB... $
+@@ -32441,8 +32499,18 @@
    if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
        { echo "$as_me:$LINENO: result: found" >&5
  echo "${ECHO_T}found" >&6; }
@@ -632,7 +620,7 @@ Index: gtk+-2.12.2/configure
    else
        { { echo "$as_me:$LINENO: error:
  *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -32578,20 +32647,23 @@ fi
+@@ -32578,20 +32646,21 @@
  CFLAGS="$saved_cflags"
  LDFLAGS="$saved_ldflags"
  
@@ -640,7 +628,6 @@ Index: gtk+-2.12.2/configure
 +GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES"
  if test "x$gdktarget" = "xx11"; then
 -  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
-+  GDK_PACKAGES="$GDK_PACKAGES $X_BASE_PACKAGES"
 +  GDK_PRIVATE_PACKAGES="$X_PACKAGES"
  fi
 -GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
@@ -657,11 +644,10 @@ Index: gtk+-2.12.2/configure
    GDK_EXTRA_LIBS=
 +else
 +  GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
-+  GDK_PRIVATE_PACKAGES=
  fi
  
  
-@@ -32601,6 +32673,7 @@ fi
+@@ -32601,6 +32670,7 @@
  
  
  
@@ -669,7 +655,7 @@ Index: gtk+-2.12.2/configure
  ########################################
  # Check for Accessibility Toolkit flags
  ########################################
-@@ -32706,7 +32779,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr
+@@ -32706,7 +32776,7 @@
  CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
  
  if test $enable_explicit_deps != yes ; then
@@ -678,7 +664,7 @@ Index: gtk+-2.12.2/configure
  fi
  
  
-@@ -33891,6 +33964,13 @@ echo "$as_me: error: conditional \"am__f
+@@ -33891,6 +33961,13 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -692,7 +678,7 @@ Index: gtk+-2.12.2/configure
  if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -34961,9 +35041,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+@@ -34961,9 +35038,9 @@
  CCDEPMODE!$CCDEPMODE$ac_delim
  am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
  am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
@@ -704,7 +690,7 @@ Index: gtk+-2.12.2/configure
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35005,6 +35085,8 @@ _ACEOF
+@@ -35005,6 +35082,8 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -713,7 +699,7 @@ Index: gtk+-2.12.2/configure
  CXXDEPMODE!$CXXDEPMODE$ac_delim
  am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
  am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-@@ -35100,8 +35182,6 @@ INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_
+@@ -35100,8 +35179,6 @@
  INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim
  INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim
  INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim
@@ -722,7 +708,7 @@ Index: gtk+-2.12.2/configure
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35143,6 +35223,8 @@ _ACEOF
+@@ -35143,6 +35220,8 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -731,7 +717,7 @@ Index: gtk+-2.12.2/configure
  INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
  INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim
  INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim
-@@ -35196,6 +35278,7 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_X
+@@ -35196,6 +35275,7 @@
  USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim
  USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim
  GDK_PACKAGES!$GDK_PACKAGES$ac_delim
@@ -739,7 +725,7 @@ Index: gtk+-2.12.2/configure
  GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim
  GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim
  GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim
-@@ -35237,9 +35320,6 @@ HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_
+@@ -35237,9 +35317,6 @@
  HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim
  XSLTPROC!$XSLTPROC$ac_delim
  XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim
@@ -749,7 +735,7 @@ Index: gtk+-2.12.2/configure
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35281,11 +35361,14 @@ _ACEOF
+@@ -35281,11 +35358,14 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -765,11 +751,10 @@ Index: gtk+-2.12.2/configure
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: gtk+-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/contrib/gdk-pixbuf-xlib/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in	2007-11-27 23:07:13.360114213 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.12.2.old/contrib/gdk-pixbuf-xlib/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in	2007-11-27 05:24:49.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -778,7 +763,7 @@ Index: gtk+-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -786,11 +771,10 @@ Index: gtk+-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/contrib/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/contrib/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/contrib/Makefile.in	2007-11-27 23:07:13.360114213 +0100
-@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/contrib/Makefile.in gtk+2.0-2.12.2/contrib/Makefile.in
+--- gtk+2.0-2.12.2.old/contrib/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/contrib/Makefile.in	2007-11-27 05:24:49.000000000 +0100
+@@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -799,7 +783,7 @@ Index: gtk+-2.12.2/contrib/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -113,6 +115,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -807,11 +791,10 @@ Index: gtk+-2.12.2/contrib/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/demos/gtk-demo/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/demos/gtk-demo/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/demos/gtk-demo/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.2/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.12.2.old/demos/gtk-demo/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/demos/gtk-demo/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -820,7 +803,7 @@ Index: gtk+-2.12.2/demos/gtk-demo/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -828,11 +811,10 @@ Index: gtk+-2.12.2/demos/gtk-demo/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/demos/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/demos/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/demos/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/demos/Makefile.in gtk+2.0-2.12.2/demos/Makefile.in
+--- gtk+2.0-2.12.2.old/demos/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/demos/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -841,7 +823,7 @@ Index: gtk+-2.12.2/demos/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -113,6 +115,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -849,11 +831,10 @@ Index: gtk+-2.12.2/demos/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/faq/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/faq/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/docs/faq/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/faq/Makefile.in gtk+2.0-2.12.2/docs/faq/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/faq/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/docs/faq/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -862,7 +843,7 @@ Index: gtk+-2.12.2/docs/faq/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -870,11 +851,10 @@ Index: gtk+-2.12.2/docs/faq/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/docs/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/Makefile.in gtk+2.0-2.12.2/docs/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/docs/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -883,7 +863,7 @@ Index: gtk+-2.12.2/docs/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -891,11 +871,10 @@ Index: gtk+-2.12.2/docs/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/reference/gdk/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/reference/gdk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/docs/reference/gdk/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.2/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/reference/gdk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/docs/reference/gdk/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -904,7 +883,7 @@ Index: gtk+-2.12.2/docs/reference/gdk/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -118,6 +120,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -118,6 +120,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -912,11 +891,10 @@ Index: gtk+-2.12.2/docs/reference/gdk/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/reference/gdk-pixbuf/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/reference/gdk-pixbuf/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/docs/reference/gdk-pixbuf/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.2/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/reference/gdk-pixbuf/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/docs/reference/gdk-pixbuf/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -925,7 +903,7 @@ Index: gtk+-2.12.2/docs/reference/gdk-pixbuf/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -118,6 +120,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -118,6 +120,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -933,11 +911,10 @@ Index: gtk+-2.12.2/docs/reference/gdk-pixbuf/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/reference/gtk/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/reference/gtk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/docs/reference/gtk/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.2/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/reference/gtk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/docs/reference/gtk/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -946,7 +923,7 @@ Index: gtk+-2.12.2/docs/reference/gtk/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -118,6 +120,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -118,6 +120,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -954,11 +931,10 @@ Index: gtk+-2.12.2/docs/reference/gtk/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/reference/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/reference/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/docs/reference/Makefile.in	2007-11-27 23:07:13.364114441 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/Makefile.in gtk+2.0-2.12.2/docs/reference/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/reference/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/docs/reference/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -967,7 +943,7 @@ Index: gtk+-2.12.2/docs/reference/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -975,11 +951,10 @@ Index: gtk+-2.12.2/docs/reference/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/tools/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/tools/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/docs/tools/Makefile.in	2007-11-27 23:07:13.368114669 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/tools/Makefile.in gtk+2.0-2.12.2/docs/tools/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/tools/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/docs/tools/Makefile.in	2007-11-27 05:24:51.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -988,7 +963,7 @@ Index: gtk+-2.12.2/docs/tools/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -996,11 +971,10 @@ Index: gtk+-2.12.2/docs/tools/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/docs/tutorial/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/docs/tutorial/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/docs/tutorial/Makefile.in	2007-11-27 23:07:13.368114669 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/tutorial/Makefile.in gtk+2.0-2.12.2/docs/tutorial/Makefile.in
+--- gtk+2.0-2.12.2.old/docs/tutorial/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/docs/tutorial/Makefile.in	2007-11-27 05:24:51.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1009,7 +983,7 @@ Index: gtk+-2.12.2/docs/tutorial/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1017,11 +991,10 @@ Index: gtk+-2.12.2/docs/tutorial/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk/directfb/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk/directfb/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/gdk/directfb/Makefile.in	2007-11-27 23:07:13.368114669 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/directfb/Makefile.in gtk+2.0-2.12.2/gdk/directfb/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk/directfb/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/gdk/directfb/Makefile.in	2007-11-27 05:24:52.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1030,7 +1003,7 @@ Index: gtk+-2.12.2/gdk/directfb/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1038,11 +1011,10 @@ Index: gtk+-2.12.2/gdk/directfb/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/gdk/Makefile.in	2007-11-27 23:07:13.368114669 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/Makefile.in gtk+2.0-2.12.2/gdk/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/gdk/Makefile.in	2007-11-27 05:24:52.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1051,7 +1023,7 @@ Index: gtk+-2.12.2/gdk/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1059,11 +1031,10 @@ Index: gtk+-2.12.2/gdk/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk/quartz/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk/quartz/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+-2.12.2/gdk/quartz/Makefile.in	2007-11-27 23:07:13.368114669 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/quartz/Makefile.in gtk+2.0-2.12.2/gdk/quartz/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk/quartz/Makefile.in	2007-11-26 20:44:20.000000000 +0100
++++ gtk+2.0-2.12.2/gdk/quartz/Makefile.in	2007-11-27 05:24:52.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1072,7 +1043,7 @@ Index: gtk+-2.12.2/gdk/quartz/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1080,11 +1051,10 @@ Index: gtk+-2.12.2/gdk/quartz/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk/win32/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk/win32/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+-2.12.2/gdk/win32/Makefile.in	2007-11-27 23:07:13.368114669 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/win32/Makefile.in gtk+2.0-2.12.2/gdk/win32/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk/win32/Makefile.in	2007-11-26 20:44:20.000000000 +0100
++++ gtk+2.0-2.12.2/gdk/win32/Makefile.in	2007-11-27 05:24:52.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1093,7 +1063,7 @@ Index: gtk+-2.12.2/gdk/win32/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1101,11 +1071,10 @@ Index: gtk+-2.12.2/gdk/win32/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk/win32/rc/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk/win32/rc/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+-2.12.2/gdk/win32/rc/Makefile.in	2007-11-27 23:07:13.368114669 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.2/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk/win32/rc/Makefile.in	2007-11-26 20:44:20.000000000 +0100
++++ gtk+2.0-2.12.2/gdk/win32/rc/Makefile.in	2007-11-27 05:24:52.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1114,7 +1083,7 @@ Index: gtk+-2.12.2/gdk/win32/rc/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1122,11 +1091,10 @@ Index: gtk+-2.12.2/gdk/win32/rc/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk/x11/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk/x11/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+-2.12.2/gdk/x11/Makefile.in	2007-11-27 23:07:13.372114897 +0100
-@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/x11/Makefile.in gtk+2.0-2.12.2/gdk/x11/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk/x11/Makefile.in	2007-11-26 20:44:20.000000000 +0100
++++ gtk+2.0-2.12.2/gdk/x11/Makefile.in	2007-11-27 05:24:53.000000000 +0100
+@@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1135,7 +1103,7 @@ Index: gtk+-2.12.2/gdk/x11/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -114,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -114,6 +116,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1143,11 +1111,10 @@ Index: gtk+-2.12.2/gdk/x11/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk-pixbuf/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk-pixbuf/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/gdk-pixbuf/Makefile.in	2007-11-27 23:07:13.372114897 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.2/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk-pixbuf/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/gdk-pixbuf/Makefile.in	2007-11-27 05:24:51.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1156,7 +1123,7 @@ Index: gtk+-2.12.2/gdk-pixbuf/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1164,11 +1131,10 @@ Index: gtk+-2.12.2/gdk-pixbuf/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gdk-pixbuf/pixops/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gdk-pixbuf/pixops/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+-2.12.2/gdk-pixbuf/pixops/Makefile.in	2007-11-27 23:07:13.372114897 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.2/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.12.2.old/gdk-pixbuf/pixops/Makefile.in	2007-11-26 20:44:19.000000000 +0100
++++ gtk+2.0-2.12.2/gdk-pixbuf/pixops/Makefile.in	2007-11-27 05:24:51.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1177,7 +1143,7 @@ Index: gtk+-2.12.2/gdk-pixbuf/pixops/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1185,11 +1151,10 @@ Index: gtk+-2.12.2/gdk-pixbuf/pixops/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gtk/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gtk/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+-2.12.2/gtk/Makefile.in	2007-11-27 23:07:13.372114897 +0100
-@@ -113,6 +113,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/Makefile.in gtk+2.0-2.12.2/gtk/Makefile.in
+--- gtk+2.0-2.12.2.old/gtk/Makefile.in	2007-11-26 20:44:20.000000000 +0100
++++ gtk+2.0-2.12.2/gtk/Makefile.in	2007-11-27 05:24:53.000000000 +0100
+@@ -113,6 +113,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1198,7 +1163,7 @@ Index: gtk+-2.12.2/gtk/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -136,6 +138,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -136,6 +138,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1206,7 +1171,7 @@ Index: gtk+-2.12.2/gtk/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -379,6 +382,8 @@ INCLUDES = \
+@@ -379,6 +382,8 @@
  	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
  	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
  	-DGDK_DISABLE_DEPRECATED			\
@@ -1215,7 +1180,7 @@ Index: gtk+-2.12.2/gtk/Makefile.in
  	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
  	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
  	$(GTK_DEBUG_FLAGS)				\
-@@ -634,13 +639,16 @@ gtk_public_h_sources = \
+@@ -634,13 +639,16 @@
  # that are not included in gtk/gtk.h
  gtk_semi_private_h_sources = \
  	gtktextlayout.h		\
@@ -1235,7 +1200,7 @@ Index: gtk+-2.12.2/gtk/Makefile.in
  	gtksearchenginebeagle.h	\
  	gtksearchenginetracker.h\
  	gtksearchenginesimple.h	\
-@@ -650,10 +658,7 @@ gtk_private_h_sources = \
+@@ -650,10 +658,7 @@
  	gtkfilechooserdefault.h	\
  	gtkfilechooserembed.h	\
  	gtkfilechooserentry.h	\
@@ -1246,11 +1211,10 @@ Index: gtk+-2.12.2/gtk/Makefile.in
  	gtkfilesystemunix.h	\
  	gtkhsv.h		\
  	gtkiconcache.h		\
-Index: gtk+-2.12.2/gtk/theme-bits/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gtk/theme-bits/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+-2.12.2/gtk/theme-bits/Makefile.in	2007-11-27 23:07:13.372114897 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.2/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.12.2.old/gtk/theme-bits/Makefile.in	2007-11-26 20:44:20.000000000 +0100
++++ gtk+2.0-2.12.2/gtk/theme-bits/Makefile.in	2007-11-27 05:24:53.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1259,7 +1223,7 @@ Index: gtk+-2.12.2/gtk/theme-bits/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1267,11 +1231,10 @@ Index: gtk+-2.12.2/gtk/theme-bits/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/gtk/xdgmime/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/gtk/xdgmime/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/gtk/xdgmime/Makefile.in	2007-11-27 23:07:13.376115125 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.2/gtk/xdgmime/Makefile.in
+--- gtk+2.0-2.12.2.old/gtk/xdgmime/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/gtk/xdgmime/Makefile.in	2007-11-27 05:24:54.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1280,7 +1243,7 @@ Index: gtk+-2.12.2/gtk/xdgmime/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1288,11 +1251,10 @@ Index: gtk+-2.12.2/gtk/xdgmime/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/ltmain.sh
-===================================================================
---- gtk+-2.12.2.orig/ltmain.sh	2007-08-29 13:52:51.000000000 +0200
-+++ gtk+-2.12.2/ltmain.sh	2007-11-27 23:07:13.376115125 +0100
-@@ -43,7 +43,7 @@ EXIT_FAILURE=1
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/ltmain.sh gtk+2.0-2.12.2/ltmain.sh
+--- gtk+2.0-2.12.2.old/ltmain.sh	2007-08-29 13:52:51.000000000 +0200
++++ gtk+2.0-2.12.2/ltmain.sh	2007-08-14 19:43:36.000000000 +0200
+@@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh
  PACKAGE=libtool
@@ -1301,7 +1263,7 @@ Index: gtk+-2.12.2/ltmain.sh
  TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
  
  # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-@@ -2122,7 +2122,10 @@ EOF
+@@ -2122,7 +2122,10 @@
  	case $pass in
  	dlopen) libs="$dlfiles" ;;
  	dlpreopen) libs="$dlprefiles" ;;
@@ -1313,7 +1275,7 @@ Index: gtk+-2.12.2/ltmain.sh
  	esac
        fi
        if test "$pass" = dlopen; then
-@@ -3244,6 +3247,11 @@ EOF
+@@ -3244,6 +3247,11 @@
  	    revision="$number_minor"
  	    lt_irix_increment=no
  	    ;;
@@ -1325,11 +1287,10 @@ Index: gtk+-2.12.2/ltmain.sh
  	  esac
  	  ;;
  	no)
-Index: gtk+-2.12.2/m4macros/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/m4macros/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/m4macros/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/m4macros/Makefile.in gtk+2.0-2.12.2/m4macros/Makefile.in
+--- gtk+2.0-2.12.2.old/m4macros/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/m4macros/Makefile.in	2007-11-27 05:24:54.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1338,7 +1299,7 @@ Index: gtk+-2.12.2/m4macros/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1346,11 +1307,10 @@ Index: gtk+-2.12.2/m4macros/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+-2.12.2/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/Makefile.in gtk+2.0-2.12.2/Makefile.in
+--- gtk+2.0-2.12.2.old/Makefile.in	2007-11-26 20:44:18.000000000 +0100
++++ gtk+2.0-2.12.2/Makefile.in	2007-11-27 05:24:49.000000000 +0100
+@@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1359,7 +1319,7 @@ Index: gtk+-2.12.2/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -113,6 +115,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1367,7 +1327,7 @@ Index: gtk+-2.12.2/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -330,7 +333,10 @@ sharedstatedir = @sharedstatedir@
+@@ -330,7 +333,10 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
@@ -1379,7 +1339,7 @@ Index: gtk+-2.12.2/Makefile.in
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
  
  # require automake 1.4
-@@ -482,13 +488,14 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -482,13 +488,14 @@
  DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
  	COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
  	acinclude.m4 aclocal.m4 compile config.guess config.h.in \
@@ -1396,7 +1356,7 @@ Index: gtk+-2.12.2/Makefile.in
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -740,7 +747,7 @@ distdir: $(DISTFILES)
+@@ -740,7 +747,7 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -1405,11 +1365,10 @@ Index: gtk+-2.12.2/Makefile.in
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
  	    || mkdir $(distdir)/$$subdir \
-Index: gtk+-2.12.2/modules/engines/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/engines/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/engines/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/Makefile.in gtk+2.0-2.12.2/modules/engines/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/engines/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/engines/Makefile.in	2007-11-27 05:24:54.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1418,7 +1377,7 @@ Index: gtk+-2.12.2/modules/engines/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1426,11 +1385,10 @@ Index: gtk+-2.12.2/modules/engines/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/engines/ms-windows/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/engines/ms-windows/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/engines/ms-windows/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/engines/ms-windows/Makefile.in	2007-11-27 05:24:54.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1439,7 +1397,7 @@ Index: gtk+-2.12.2/modules/engines/ms-windows/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1447,11 +1405,10 @@ Index: gtk+-2.12.2/modules/engines/ms-windows/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-11-27 05:24:54.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1460,7 +1417,7 @@ Index: gtk+-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1468,11 +1425,10 @@ Index: gtk+-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/engines/ms-windows/Theme/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/engines/ms-windows/Theme/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/engines/ms-windows/Theme/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/Makefile.in	2007-11-27 05:24:54.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1481,7 +1437,7 @@ Index: gtk+-2.12.2/modules/engines/ms-windows/Theme/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1489,11 +1445,10 @@ Index: gtk+-2.12.2/modules/engines/ms-windows/Theme/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/engines/pixbuf/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/engines/pixbuf/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/engines/pixbuf/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.2/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/engines/pixbuf/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/engines/pixbuf/Makefile.in	2007-11-27 05:24:55.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1502,7 +1457,7 @@ Index: gtk+-2.12.2/modules/engines/pixbuf/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1510,11 +1465,10 @@ Index: gtk+-2.12.2/modules/engines/pixbuf/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/input/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/input/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/input/Makefile.in	2007-11-27 23:07:13.380115353 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/input/Makefile.in gtk+2.0-2.12.2/modules/input/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/input/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/input/Makefile.in	2007-11-27 05:24:55.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1523,7 +1477,7 @@ Index: gtk+-2.12.2/modules/input/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1531,7 +1485,7 @@ Index: gtk+-2.12.2/modules/input/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -431,9 +434,10 @@ im_multipress_la_LIBADD = $(LDADDS)
+@@ -431,9 +434,10 @@
  
  imconffiledir = $(sysconfdir)/gtk-2.0
  dist_imconffile_DATA = im-multipress.conf
@@ -1543,7 +1497,7 @@ Index: gtk+-2.12.2/modules/input/Makefile.in
  
  module_LTLIBRARIES = \
  	$(IM_XIM_MODULE)			\
-@@ -986,7 +990,18 @@ uninstall-local:
+@@ -986,7 +990,18 @@
  	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
  
  gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -1563,11 +1517,10 @@ Index: gtk+-2.12.2/modules/input/Makefile.in
  
  @CROSS_COMPILING_FALSE@all-local: gtk.immodules
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-Index: gtk+-2.12.2/modules/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/Makefile.in	2007-11-27 23:07:13.384115581 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/Makefile.in gtk+2.0-2.12.2/modules/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/Makefile.in	2007-11-27 05:24:54.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1576,7 +1529,7 @@ Index: gtk+-2.12.2/modules/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1584,11 +1537,10 @@ Index: gtk+-2.12.2/modules/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/printbackends/cups/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/printbackends/cups/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/printbackends/cups/Makefile.in	2007-11-27 23:07:13.384115581 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.2/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/printbackends/cups/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/printbackends/cups/Makefile.in	2007-11-27 05:24:55.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1597,7 +1549,7 @@ Index: gtk+-2.12.2/modules/printbackends/cups/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1605,11 +1557,10 @@ Index: gtk+-2.12.2/modules/printbackends/cups/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/printbackends/file/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/printbackends/file/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/printbackends/file/Makefile.in	2007-11-27 23:07:13.384115581 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.2/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/printbackends/file/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/printbackends/file/Makefile.in	2007-11-27 05:24:56.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1618,7 +1569,7 @@ Index: gtk+-2.12.2/modules/printbackends/file/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1626,11 +1577,10 @@ Index: gtk+-2.12.2/modules/printbackends/file/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/printbackends/lpr/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/printbackends/lpr/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+-2.12.2/modules/printbackends/lpr/Makefile.in	2007-11-27 23:07:13.384115581 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.2/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/printbackends/lpr/Makefile.in	2007-11-26 20:44:22.000000000 +0100
++++ gtk+2.0-2.12.2/modules/printbackends/lpr/Makefile.in	2007-11-27 05:24:56.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1639,7 +1589,7 @@ Index: gtk+-2.12.2/modules/printbackends/lpr/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1647,11 +1597,10 @@ Index: gtk+-2.12.2/modules/printbackends/lpr/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/printbackends/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/printbackends/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+-2.12.2/modules/printbackends/Makefile.in	2007-11-27 23:07:13.384115581 +0100
-@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/Makefile.in gtk+2.0-2.12.2/modules/printbackends/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/printbackends/Makefile.in	2007-11-26 20:44:21.000000000 +0100
++++ gtk+2.0-2.12.2/modules/printbackends/Makefile.in	2007-11-27 05:24:55.000000000 +0100
+@@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1660,7 +1609,7 @@ Index: gtk+-2.12.2/modules/printbackends/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -114,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -114,6 +116,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1668,11 +1617,10 @@ Index: gtk+-2.12.2/modules/printbackends/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/modules/printbackends/test/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/modules/printbackends/test/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+-2.12.2/modules/printbackends/test/Makefile.in	2007-11-27 23:07:13.384115581 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.2/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.12.2.old/modules/printbackends/test/Makefile.in	2007-11-26 20:44:22.000000000 +0100
++++ gtk+2.0-2.12.2/modules/printbackends/test/Makefile.in	2007-11-27 05:24:56.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1681,7 +1629,7 @@ Index: gtk+-2.12.2/modules/printbackends/test/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1689,11 +1637,10 @@ Index: gtk+-2.12.2/modules/printbackends/test/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/perf/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/perf/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+-2.12.2/perf/Makefile.in	2007-11-27 23:07:13.388115809 +0100
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/perf/Makefile.in gtk+2.0-2.12.2/perf/Makefile.in
+--- gtk+2.0-2.12.2.old/perf/Makefile.in	2007-11-26 20:44:22.000000000 +0100
++++ gtk+2.0-2.12.2/perf/Makefile.in	2007-11-27 05:24:56.000000000 +0100
+@@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1702,7 +1649,7 @@ Index: gtk+-2.12.2/perf/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -112,6 +114,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -1710,11 +1657,10 @@ Index: gtk+-2.12.2/perf/Makefile.in
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-Index: gtk+-2.12.2/tests/Makefile.in
-===================================================================
---- gtk+-2.12.2.orig/tests/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+-2.12.2/tests/Makefile.in	2007-11-27 23:07:13.388115809 +0100
-@@ -92,6 +92,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
+diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/tests/Makefile.in gtk+2.0-2.12.2/tests/Makefile.in
+--- gtk+2.0-2.12.2.old/tests/Makefile.in	2007-11-26 20:44:22.000000000 +0100
++++ gtk+2.0-2.12.2/tests/Makefile.in	2007-11-27 05:24:57.000000000 +0100
+@@ -92,6 +92,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
  ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -1723,7 +1669,7 @@ Index: gtk+-2.12.2/tests/Makefile.in
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -115,6 +117,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X
+@@ -115,6 +117,7 @@
  GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
  GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
  GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@