diff --git a/debian/changelog b/debian/changelog index 12723b0394..99ff19c0a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,32 @@ -gtk+2.0 (2.10.14-1) unstable; urgency=low +gtk+2.0 (2.12.0-2) UNRELEASED; urgency=low + + * Add a conflict against openoffice.org-core (<< 2.2.1-8). + Closes: #439256. + + -- Josselin Mouette Wed, 19 Sep 2007 13:23:14 +0200 + +gtk+2.0 (2.12.0-1) experimental; urgency=low + + [ Alan Baghumian ] + * New upstream stable release + - Regenerated 070_mandatory-relibtoolize.patch + * Added 081_icon-cache-validate.patch, GNOME #476342 + + [ Loic Minier ] + * Refresh patches 033_treeview_resizing and 040_filechooser_single-click to + apply cleanly. + * Drop patch 080_from_svn_fix_dangling_tooltip, merged upstream. + * Bump shlibs to 2.12.0 in the new upstream release for the addition of + gdk_window_thaw_toplevel_updates_libgtk_only() and + gdk_window_freeze_toplevel_updates_libgtk_only() to the ABI. + * Add disabled patch 091_workaround_no_gtk_init_incorrect_display, taken + from the Ubuntu package; it works around broken applications missing a + call to gtk_init() but the breakage should better be exposed now so that + applications can be fixed in time for release. + + -- Loic Minier Tue, 18 Sep 2007 22:30:39 +0200 + +gtk+2.0 (2.11.6-1) experimental; urgency=low [ Loic Minier ] * Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch @@ -13,16 +41,111 @@ gtk+2.0 (2.10.14-1) unstable; urgency=low created if they don't already exist. * Install this script and its manual page in libgtk2.0-bin. - [ Alan Baghumian ] - * New upstream release - - Regenerated 070_mandatory-relibtoolize.patch - [ Loic Minier ] * Call dh_shlibdeps separately for the udeb and add a -l/usr/lib/libcairo-directfb/lib/ flag to ensure libcairo-directfb2 is found. + * New upstream development release, with API additions. + - Bump up shlibs to >= 2.11.6. + - Refresh patches 006_proper-directfb-modules, + 015_default-fallback-icon-theme, 040_filechooser_single-click to apply + cleanly. + - Update patches 009_gtk-export-filechooser, 033_treeview_resizing to + apply; update relibtoolizing patch, 070_mandatory-relibtoolize. + * Update patch 009_gtk-export-filechooser: + - gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources): + export gtkquery.h and gtksearchengine.h as semi-private. + - gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard. + - gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef + guard. - -- Loic Minier Tue, 31 Jul 2007 13:20:59 +0200 + -- Loic Minier Tue, 24 Jul 2007 10:43:23 +0200 + +gtk+2.0 (2.11.5-1) experimental; urgency=low + + * New upstream development release, with API additions; the new API may + still change incompatibly, especially the tooltips API. + - Bump shlibs to >= 2.11.5. + - Bump up libpango1.0-dev build-dep to >= 1.17.3. + - Ship the new gtk-builder-convert Python script to convert Glade files to + GtkBuilder syntax in libgtk2.0-dev; don't call dh_py* to generate a + ${python:Depends} but Recommend python (>= 2.4) to avoid pulling python + on buildds; the script requires python >= 2.4, but this is not enforced + in the dependencies. + - Refresh patches 001_static-linking-dont-query-immodules, + 006_proper-directfb-modules, 040_filechooser_single-click to apply + cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Use -s instead of -a in arch-specific dh_* calls. + + -- Loic Minier Tue, 03 Jul 2007 13:01:25 +0200 + +gtk+2.0 (2.11.4-1) experimental; urgency=low + + [ Josselin Mouette ] + * 040_filechooser_single-click.patch: fix the patch to apply cleanly + again, and enable it. + + [ Loic Minier ] + * Pass -mminimal-toc in CFLAGS for ppc64 support; thanks Andreas Jochens; + closes: #386815. + * New upstream development release, with API additions; the new API may + still change incompatibly. + - Bump shlibs to >= 2.11.3. + - Refresh patches 006_proper-directfb-modules, + 008_implicit_pointer_conversion_gdkgc_directfb, + 009_gtk-export-filechooser, 030_gtkentry_password-char-circle, + 033_treeview_resizing, 040_filechooser_single-click, and 041_ia32-libs + to apply cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Add a debian/dh_listmissing.pl script based on dh_install snippets but + customized to handle multiple source installation dirs which can report + files which were not installed to a package. + * New list-missing rule to list files which were not installed to a package + calling debian/dh_listmissing.pl. + * Also depend on libxcomposite-dev, libxdamage-dev; thanks Sébastien Bacher. + * Ship etc/gtk-2.0/im-multipress.conf in the shared library. + * New upstream development release, with incompatible API changes; the new + API may still change incompatibly. + - Bump shlibs to >= 2.11.4. + - Refresh relibtoolizing patch, 070_mandatory-relibtoolize. + - Bump up libglib2.0-dev build-dep to >= 2.11.5. + + -- Loic Minier Wed, 20 Jun 2007 10:47:42 +0200 + +gtk+2.0 (2.11.2-1) experimental; urgency=low + + * New upstream release series; these are development releases, the new API + may still change incompatibly. + - Target at experimental; include check-dist. + - Bump shlibs to >= 2.11.2. + - Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico, + 009_gtk-export-filechooser, 015_default-fallback-icon-theme, + 033_treeview_resizing, 041_ia32-libs to apply cleanly. + - Update patch 021_loader-files-d to apply with the upstream G_MODULE + changes and the support for included modules. + - Update patch 030_gtkentry_password-char-circle to apply. + - Drop patch 031_cursor-blinking-timeout, merged upstream. + - Disable 040_filechooser_single-click for now as it doesn't apply cleanly + and doesn't seem critical; add a description and cross-refs. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + - Bump up build-deps to libglib2.0-dev >= 2.13.1, libpango1.0-dev >= + 1.15.3, gtk-doc-tools >= 1.6. + - Build-dep on libxcomposite-dev for composite support. + - Build-dep on libxdamage-dev for damage support. + - Enable test print backend by passing --enable-test-print-backend to + configure. + * Update 007_implicit_pointer_conversion_gdkdrawable_directfb to include + cairo.h instead of defining the directfb feature manually. + * New patch, 006_proper-directfb-modules, fixes pkg-config modules included + to build directfb stuff, uncovered by the change in + 007_implicit_pointer_conversion_gdkdrawable_directfb; refresh + relibtoolizing patch. + * Add cross-refs to patch headers. + * Clean up CFLAGS. + * Prepare passing -z defs via LDFLAGS in the future. + + -- Loic Minier Wed, 13 Jun 2007 16:57:47 +0200 gtk+2.0 (2.10.13-1) unstable; urgency=low diff --git a/debian/control b/debian/control index dd1455ac65..77fa0b23de 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Debian GNOME Maintainers = 5.0.22), gettext, pkg-config, - libglib2.0-dev (>= 2.12.0), - libpango1.0-dev (>= 1.12.1-2), + libglib2.0-dev (>= 2.13.5), + libpango1.0-dev (>= 1.17.3), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, @@ -17,6 +17,8 @@ Build-Depends: debhelper (>= 5.0.22), libxrender-dev, libxft-dev, libxcursor-dev, + libxcomposite-dev, + libxdamage-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, @@ -32,7 +34,7 @@ Build-Depends: debhelper (>= 5.0.22), libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt -Build-Depends-Indep: gtk-doc-tools, +Build-Depends-Indep: gtk-doc-tools (>= 1.6), docbook-xml Standards-Version: 3.7.2 @@ -52,6 +54,7 @@ Conflicts: libgtk2.0-0png3, libgnomeui-0 (<= 2.14.1-3), gtk2.0-examples (<< 2.2.0), libgdkxft0, + openoffice.org-core (<< 2.2.1-8), gtk2-engines-wonderland (<< 1.0-4), gtk2-engines-cleanice (<< 2.4.0-1.1), gtk2-engines-thinice (<< 2.6), @@ -186,7 +189,10 @@ Depends: libgtk2.0-0 (= ${binary:Version}), libxrandr-dev, libxcursor-dev, libxfixes-dev, + libxcomposite-dev, + libxdamage-dev, pkg-config +Recommends: python (>= 2.4) Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev, gtk2-engines-pixbuf (<< 2.8.18-5) diff --git a/debian/control.in b/debian/control.in index c7f350514e..db219f10ee 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,8 +6,8 @@ Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, - libglib2.0-dev (>= 2.12.0), - libpango1.0-dev (>= 1.12.1-2), + libglib2.0-dev (>= 2.13.5), + libpango1.0-dev (>= 1.17.3), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, @@ -17,6 +17,8 @@ Build-Depends: debhelper (>= 5.0.22), libxrender-dev, libxft-dev, libxcursor-dev, + libxcomposite-dev, + libxdamage-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, @@ -32,7 +34,7 @@ Build-Depends: debhelper (>= 5.0.22), libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt -Build-Depends-Indep: gtk-doc-tools, +Build-Depends-Indep: gtk-doc-tools (>= 1.6), docbook-xml Standards-Version: 3.7.2 @@ -52,6 +54,7 @@ Conflicts: libgtk2.0-0png3, libgnomeui-0 (<= 2.14.1-3), gtk2.0-examples (<< 2.2.0), libgdkxft0, + openoffice.org-core (<< 2.2.1-8), gtk2-engines-wonderland (<< 1.0-4), gtk2-engines-cleanice (<< 2.4.0-1.1), gtk2-engines-thinice (<< 2.6), @@ -186,7 +189,10 @@ Depends: @SHARED_PKG@ (= ${binary:Version}), libxrandr-dev, libxcursor-dev, libxfixes-dev, + libxcomposite-dev, + libxdamage-dev, pkg-config +Recommends: python (>= 2.4) Suggests: @DOC_PKG@ Replaces: libgtk1.3-dev, gtk2-engines-pixbuf (<< 2.8.18-5) diff --git a/debian/dh_listmissing.pl b/debian/dh_listmissing.pl new file mode 100644 index 0000000000..33939d38cb --- /dev/null +++ b/debian/dh_listmissing.pl @@ -0,0 +1,79 @@ +#!/bin/false /usr/bin/perl -w +# shebang disabled while this script resides in debian/ + +# similar to dh_install; needs some documentation + +use strict; +use File::Find; +use Debian::Debhelper::Dh_Lib; + +init(); + +# list of sourcedirs +my @sourcedirs = @ARGV; + +my @installed; + +my $srcdir = '.'; + +# dh_install code, but not doing any installation, just building @installed +# and stripping sourcedirs from these +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp=tmpdir($package); + my $file=pkgfile($package,"install"); + + my @install; + if ($file) { + @install=filedoublearray($file); # no globbing yet + } + + # Support for -X flag. + my $exclude = ''; + if ($dh{EXCLUDE_FIND}) { + $exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)'; + } + + foreach my $set (@install) { + if (! defined $dh{AUTODEST} && @$set > 1) { + pop @$set; + } + foreach my $src (map { glob "$srcdir/$_" } @$set) { + next if excludefile($src); + + # strip source dir + foreach my $d (@sourcedirs) { + $src=~s/^\Q$srcdir\E\/\Q$d\E\///; + } + + # Keep track of what's installed. + # Kill any extra slashes. Makes the @installed stuff more robust. + $src=~y:/:/:s; + $src=~s:/+$::; + $src=~s:^(\./)*::; + push @installed, "\Q$src\E\/.*|\Q$src\E"; + } + } +} + +# dh_install code, but stripping sourcedirs +my @missing; +my $installed=join("|", @installed); +$installed=qr{^($installed)$}; +find(sub { + -f || -l || return; + $_="$File::Find::dir/$_"; + foreach my $d (@sourcedirs) { + s/^\Q$d\E\///; + } + if (! /$installed/ && ! excludefile($_)) { + my $file=$_; + push @missing, $file; + } +}, @sourcedirs); +if (@missing) { + warning "$_ has been installed upstream but is not in any package" foreach @missing; + if ($dh{FAIL_MISSING}) { + error("missing files, aborting"); + } +} + diff --git a/debian/libgtk2.0-0.install.in b/debian/libgtk2.0-0.install.in index 098b726722..0946594703 100644 --- a/debian/libgtk2.0-0.install.in +++ b/debian/libgtk2.0-0.install.in @@ -2,6 +2,7 @@ debian/update-gdkpixbuf-loaders usr/lib/@SHARED_PKG@ debian/update-gtk-immodules usr/lib/@SHARED_PKG@ # from the shared flavor +debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@ debian/install/shared/usr/bin/gdk-pixbuf-query-loaders usr/lib/@SHARED_PKG@ debian/install/shared/usr/bin/gtk-query-immodules-2.0 usr/lib/@SHARED_PKG@ debian/install/shared/usr/bin/gtk-update-icon-cache usr/lib/@SHARED_PKG@ diff --git a/debian/libgtk2.0-dev.install.in b/debian/libgtk2.0-dev.install.in index 91710fd0dc..b9b70ffe4f 100644 --- a/debian/libgtk2.0-dev.install.in +++ b/debian/libgtk2.0-dev.install.in @@ -1,7 +1,8 @@ # from Debian debian/dh_gtkmodules usr/bin # from the shared flavor -debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin +debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin +debian/install/shared/usr/bin/gtk-builder-convert usr/bin debian/install/shared/usr/include usr debian/install/shared/usr/lib/*.la usr/lib debian/install/shared/usr/lib/*.so usr/lib diff --git a/debian/patches/001_static-linking-dont-query-immodules.patch b/debian/patches/001_static-linking-dont-query-immodules.patch index 991b1b9295..4c58919244 100644 --- a/debian/patches/001_static-linking-dont-query-immodules.patch +++ b/debian/patches/001_static-linking-dont-query-immodules.patch @@ -1,20 +1,20 @@ -Index: gtk+2.0-2.10.10/configure.in +Index: gtk+2.0-2.11.5/configure.in =================================================================== ---- gtk+2.0-2.10.10.orig/configure.in 2007-03-13 14:10:00.000000000 +0100 -+++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:04.000000000 +0100 +--- gtk+2.0-2.11.5.orig/configure.in 2007-07-02 17:04:27.000000000 +0200 ++++ gtk+2.0-2.11.5/configure.in 2007-07-03 11:34:03.000000000 +0200 @@ -134,6 +134,7 @@ dnl Initialize libtool AC_PROG_CC AM_DISABLE_STATIC +AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) - if test "$os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then -Index: gtk+2.0-2.10.10/modules/input/Makefile.am + dnl + dnl Check for a working C++ compiler, but do not bail out, if none is found. +Index: gtk+2.0-2.11.5/modules/input/Makefile.am =================================================================== ---- gtk+2.0-2.10.10.orig/modules/input/Makefile.am 2007-03-12 14:58:52.000000000 +0100 -+++ gtk+2.0-2.10.10/modules/input/Makefile.am 2007-03-13 14:10:04.000000000 +0100 -@@ -94,8 +94,12 @@ +--- gtk+2.0-2.11.5.orig/modules/input/Makefile.am 2007-07-02 17:04:10.000000000 +0200 ++++ gtk+2.0-2.11.5/modules/input/Makefile.am 2007-07-03 11:34:03.000000000 +0200 +@@ -106,8 +106,12 @@ if CROSS_COMPILING RUN_QUERY_IMMODULES_TEST=false else @@ -27,7 +27,7 @@ Index: gtk+2.0-2.10.10/modules/input/Makefile.am # Running this if cross compiling or if DESTDIR is set is going to # not work at all, so skip it. -@@ -135,7 +139,18 @@ +@@ -148,7 +152,18 @@ $(IM_IME_MODULE) gtk.immodules: Makefile.am $(module_LTLIBRARIES) diff --git a/debian/patches/005_xpmico.patch b/debian/patches/005_xpmico.patch index abe68b498c..330f353ad2 100644 --- a/debian/patches/005_xpmico.patch +++ b/debian/patches/005_xpmico.patch @@ -1,8 +1,8 @@ -Index: gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c +Index: gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c =================================================================== ---- gtk+2.0-2.10.10.orig/gdk-pixbuf/io-ico.c 2007-03-12 14:57:04.000000000 +0100 -+++ gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c 2007-03-13 14:10:18.000000000 +0100 -@@ -210,6 +210,14 @@ +--- gtk+2.0-2.11.2.orig/gdk-pixbuf/io-ico.c 2007-06-06 13:43:15.000000000 +0200 ++++ gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c 2007-06-13 11:07:11.000000000 +0200 +@@ -208,6 +208,14 @@ State->HeaderSize = 6 + IconCount*16; diff --git a/debian/patches/006_proper-directfb-modules.patch b/debian/patches/006_proper-directfb-modules.patch new file mode 100644 index 0000000000..e487d91c93 --- /dev/null +++ b/debian/patches/006_proper-directfb-modules.patch @@ -0,0 +1,34 @@ +GNOME #447118; related to Debian #381081 + +--- gtk+2.0-2.11.6.orig/configure.in 2007-07-23 21:59:10.000000000 +0200 ++++ gtk+2.0-2.11.6/configure.in 2007-07-23 21:59:13.000000000 +0200 +@@ -1404,8 +1404,18 @@ + + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then + AC_MSG_RESULT(found) +- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" +- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" ++ # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before ++ # cairo's if both are available (cairo is required by pango); this is ++ # enough to build gdk/ ++ GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES" ++ # you'd think this isn't needed, but as soon as cairo-directfb or ++ # directfb requires a "rpath" and you want to build binaries (for ++ # example gtk-query-immodules), you need the CFLAGS and LDFLAGS ++ # everywhere; this trick abuses the fact that GTK_DEP_LIBS and ++ # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the ++ # necessary rpath flags ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS" + else + AC_MSG_ERROR([ + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend +@@ -1457,7 +1467,7 @@ + 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_PACKAGES" + fi diff --git a/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch b/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch index 1922a32569..090c3b0471 100644 --- a/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch +++ b/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch @@ -1,3 +1,5 @@ +Debian #381081; GNOME #447118 + Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c =================================================================== --- gtk+2.0-2.10.10.orig/gdk/directfb/gdkdrawable-directfb.c 2007-03-12 15:06:54.000000000 +0100 @@ -6,7 +8,7 @@ Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c #include "gdkregion-generic.h" #include "gdkalias.h" -+#define CAIRO_HAS_DIRECTFB_SURFACE ++#include #include "cairo-directfb.h" #define WARN_UNIMPLEMENTED(func)\ diff --git a/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch b/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch index d2c8a43511..f516e2590b 100644 --- a/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch +++ b/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch @@ -1,9 +1,11 @@ -Index: gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c +GNOME #447163; Debian 381082 + +Index: gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c =================================================================== ---- gtk+2.0-2.10.10.orig/gdk/directfb/gdkgc-directfb.c 2007-03-12 15:06:51.000000000 +0100 -+++ gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c 2007-03-13 14:10:26.000000000 +0100 -@@ -31,6 +31,7 @@ - */ +--- gtk+2.0-2.11.3.orig/gdk/directfb/gdkgc-directfb.c 2007-06-15 20:08:17.000000000 +0200 ++++ gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c 2007-06-16 14:25:00.000000000 +0200 +@@ -33,6 +33,7 @@ + #undef GDK_DISABLE_DEPRECATED #include +#undef GDK_DISABLE_DEPRECATED diff --git a/debian/patches/009_gtk-export-filechooser.patch b/debian/patches/009_gtk-export-filechooser.patch index 87a7f6629f..df747f1f7b 100644 --- a/debian/patches/009_gtk-export-filechooser.patch +++ b/debian/patches/009_gtk-export-filechooser.patch @@ -1,3 +1,11 @@ +2007-06-24 Loic Minier + + * gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources): + export gtkquery.h and gtksearchengine.h as semi-private + * gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard + * gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef + guard + 2007-02-07 Kristian Rietveld * gtk/gtkfilechooserutils.[ch] @@ -26,10 +34,8 @@ * tests/autotestfilechooser.c: build with GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED -Index: gtk+2.0-2.10.12/gtk/Makefile.am -=================================================================== ---- gtk+2.0-2.10.12.orig/gtk/Makefile.am 2007-05-02 18:41:42.000000000 +0200 -+++ gtk+2.0-2.10.12/gtk/Makefile.am 2007-05-30 15:24:54.000000000 +0200 +--- gtk+2.0-2.11.6.orig/gtk/Makefile.am 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/Makefile.am 2007-07-24 10:31:52.000000000 +0200 @@ -33,6 +33,8 @@ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ @@ -39,7 +45,7 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(GTK_DEBUG_FLAGS) \ -@@ -329,7 +331,10 @@ +@@ -335,12 +337,15 @@ # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ gtktextlayout.h \ @@ -47,11 +53,18 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am + gtkfilesystem.h \ + gtkfilesystemmodel.h \ + gtkfilechooserprivate.h \ -+ gtkfilechooserutils.h ++ gtkfilechooserutils.h \ ++ gtkquery.h \ ++ gtksearchengine.h # GTK+ header files that don't get installed gtk_private_h_sources = \ -@@ -338,10 +343,7 @@ +- gtkquery.h \ +- gtksearchengine.h \ + gtksearchenginebeagle.h \ + gtksearchenginetracker.h\ + gtksearchenginesimple.h \ +@@ -350,10 +355,7 @@ gtkfilechooserdefault.h \ gtkfilechooserembed.h \ gtkfilechooserentry.h \ @@ -62,11 +75,9 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am gtkfilesystemunix.h \ gtkhsv.h \ gtkiconcache.h \ -Index: gtk+2.0-2.10.12/gtk/gtk.symbols -=================================================================== ---- gtk+2.0-2.10.12.orig/gtk/gtk.symbols 2007-05-02 18:26:59.000000000 +0200 -+++ gtk+2.0-2.10.12/gtk/gtk.symbols 2007-05-30 15:24:16.000000000 +0200 -@@ -1363,6 +1363,12 @@ +--- gtk+2.0-2.11.6.orig/gtk/gtk.symbols 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtk.symbols 2007-07-24 09:09:13.000000000 +0200 +@@ -1416,6 +1416,12 @@ #endif #endif @@ -79,10 +90,8 @@ Index: gtk+2.0-2.10.12/gtk/gtk.symbols #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) gtk_file_chooser_widget_get_type G_GNUC_CONST -Index: gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h -=================================================================== ---- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserprivate.h 2007-05-02 18:26:59.000000000 +0200 -+++ gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h 2007-05-30 15:24:16.000000000 +0200 +--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserprivate.h 2007-07-20 22:12:28.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h 2007-07-24 09:09:14.000000000 +0200 @@ -21,6 +21,14 @@ #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ #define __GTK_FILE_CHOOSER_PRIVATE_H__ @@ -98,10 +107,8 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h #include "gtkfilechooser.h" #include "gtkfilesystem.h" #include "gtkfilesystemmodel.h" -Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c -=================================================================== ---- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.c 2007-05-02 18:26:59.000000000 +0200 -+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c 2007-05-30 15:24:16.000000000 +0200 +--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.c 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c 2007-07-24 09:09:14.000000000 +0200 @@ -119,6 +119,22 @@ "do-overwrite-confirmation"); } @@ -132,10 +139,8 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c + +#define __GTK_FILE_CHOOSER_UTILS_C__ +#include "gtkaliasdef.c" -Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h -=================================================================== ---- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.h 2007-05-02 18:26:59.000000000 +0200 -+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h 2007-05-30 15:24:16.000000000 +0200 +--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.h 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h 2007-07-24 09:09:14.000000000 +0200 @@ -22,6 +22,14 @@ #ifndef __GTK_FILE_CHOOSER_UTILS_H__ #define __GTK_FILE_CHOOSER_UTILS_H__ @@ -161,10 +166,8 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface); void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, -Index: gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h -=================================================================== ---- gtk+2.0-2.10.12.orig/gtk/gtkfilesystemmodel.h 2007-05-02 18:26:59.000000000 +0200 -+++ gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h 2007-05-30 15:24:16.000000000 +0200 +--- gtk+2.0-2.11.6.orig/gtk/gtkfilesystemmodel.h 2007-07-20 22:12:28.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h 2007-07-24 09:09:14.000000000 +0200 @@ -21,6 +21,10 @@ #ifndef __GTK_FILE_SYSTEM_MODEL_H__ #define __GTK_FILE_SYSTEM_MODEL_H__ @@ -176,15 +179,47 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h #include #include "gtkfilesystem.h" #include -Index: gtk+2.0-2.10.12/tests/autotestfilechooser.c -=================================================================== ---- gtk+2.0-2.10.12.orig/tests/autotestfilechooser.c 2007-05-02 18:27:12.000000000 +0200 -+++ gtk+2.0-2.10.12/tests/autotestfilechooser.c 2007-05-30 15:24:16.000000000 +0200 +--- gtk+2.0-2.11.6.orig/tests/autotestfilechooser.c 2007-07-20 22:13:57.000000000 +0200 ++++ gtk+2.0-2.11.6/tests/autotestfilechooser.c 2007-07-24 09:09:14.000000000 +0200 @@ -30,6 +30,7 @@ */ #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED +#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + #undef GTK_DISABLE_DEPRECATED #include - #include +--- gtk+2.0-2.11.6.orig/gtk/gtkquery.h 2007-07-24 10:31:23.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkquery.h 2007-07-24 10:31:26.000000000 +0200 +@@ -23,6 +23,14 @@ + #ifndef __GTK_QUERY_H__ + #define __GTK_QUERY_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include + + G_BEGIN_DECLS +--- gtk+2.0-2.11.6.orig/gtk/gtksearchengine.h 2007-07-24 10:30:25.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtksearchengine.h 2007-07-24 10:30:55.000000000 +0200 +@@ -23,6 +23,14 @@ + #ifndef __GTK_SEARCH_ENGINE_H__ + #define __GTK_SEARCH_ENGINE_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include + #include "gtkquery.h" + diff --git a/debian/patches/015_default-fallback-icon-theme.patch b/debian/patches/015_default-fallback-icon-theme.patch index 37941f32dd..a70472c128 100644 --- a/debian/patches/015_default-fallback-icon-theme.patch +++ b/debian/patches/015_default-fallback-icon-theme.patch @@ -1,8 +1,6 @@ -Index: gtk+2.0-2.10.12/gtk/gtksettings.c -=================================================================== ---- gtk+2.0-2.10.12.orig/gtk/gtksettings.c 2007-05-03 21:26:35.000000000 +0200 -+++ gtk+2.0-2.10.12/gtk/gtksettings.c 2007-05-03 21:26:40.000000000 +0200 -@@ -247,7 +247,7 @@ +--- gtk+2.0-2.11.6.orig/gtk/gtksettings.c 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtksettings.c 2007-07-23 22:00:25.000000000 +0200 +@@ -290,7 +290,7 @@ g_param_spec_string ("gtk-fallback-icon-theme", P_("Fallback Icon Theme Name"), P_("Name of a icon theme to fall back to"), diff --git a/debian/patches/021_loader-files-d.patch b/debian/patches/021_loader-files-d.patch index 4e74c15ac5..59f9b90914 100644 --- a/debian/patches/021_loader-files-d.patch +++ b/debian/patches/021_loader-files-d.patch @@ -1,7 +1,7 @@ -Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c +Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c =================================================================== ---- gtk+2.0-2.10.10.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-12 14:57:01.000000000 +0100 -+++ gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-13 14:10:35.000000000 +0100 +--- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-06 13:43:15.000000000 +0200 ++++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:57:45.000000000 +0200 @@ -45,6 +45,9 @@ #undef STRICT #endif @@ -12,9 +12,9 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c static gint format_check (GdkPixbufModule *module, guchar *buffer, int size) { -@@ -282,28 +285,93 @@ - return result; - } +@@ -284,87 +287,93 @@ + + #endif /* USE_GMODULE */ +/* FIXME this is a static copy of a public pango function which should really + * livein glib */ @@ -95,6 +95,7 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c -gdk_pixbuf_io_init (void) +process_module_file (const gchar *filename, GIOChannel *channel) { +-#ifdef USE_GMODULE - GIOChannel *channel; gchar *line_buf; gsize term; @@ -106,18 +107,76 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c int n_patterns = 0; GdkPixbufModulePattern *pattern; - GError *error = NULL; +-#endif +- GdkPixbufModule *builtin_module = NULL; +- +-#define load_one_builtin_module(format) \ +- builtin_module = g_new0 (GdkPixbufModule, 1); \ +- builtin_module->module_name = #format; \ +- if (_gdk_pixbuf_load_module (builtin_module, NULL)) \ +- file_formats = g_slist_prepend (file_formats, builtin_module);\ +- else \ +- g_free (builtin_module) +- +-#ifdef INCLUDE_ani +- load_one_builtin_module (ani); +-#endif +-#ifdef INCLUDE_png +- load_one_builtin_module (png); +-#endif +-#ifdef INCLUDE_bmp +- load_one_builtin_module (bmp); +-#endif +-#ifdef INCLUDE_wbmp +- load_one_builtin_module (wbmp); +-#endif +-#ifdef INCLUDE_gif +- load_one_builtin_module (gif); +-#endif +-#ifdef INCLUDE_ico +- load_one_builtin_module (ico); +-#endif +-#ifdef INCLUDE_jpeg +- load_one_builtin_module (jpeg); +-#endif +-#ifdef INCLUDE_pnm +- load_one_builtin_module (pnm); +-#endif +-#ifdef INCLUDE_ras +- load_one_builtin_module (ras); +-#endif +-#ifdef INCLUDE_tiff +- load_one_builtin_module (tiff); +-#endif +-#ifdef INCLUDE_xpm +- load_one_builtin_module (xpm); +-#endif +-#ifdef INCLUDE_xbm +- load_one_builtin_module (xbm); +-#endif +-#ifdef INCLUDE_tga +- load_one_builtin_module (tga); +-#endif +-#ifdef INCLUDE_pcx +- load_one_builtin_module (pcx); +-#endif +- +-#undef load_one_builtin_module +-#ifdef USE_GMODULE - channel = g_io_channel_new_file (filename, "r", &error); - if (!channel) { -- g_warning ("Cannot open pixbuf loader module file '%s': %s", -- filename, error->message); +- /* Don't bother warning if we have some built-in loaders */ +- if (file_formats == NULL) +- g_warning ("Cannot open pixbuf loader module file '%s': %s", +- filename, error->message); - return; - } - while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { const char *p; -@@ -436,8 +504,81 @@ +@@ -497,8 +506,138 @@ g_free (line_buf); } g_string_free (tmp_buf, TRUE); @@ -128,6 +187,7 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c +static void +gdk_pixbuf_io_init (void) +{ ++#ifdef USE_GMODULE + GIOChannel *channel; + gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file (); + /* FIXME: using an absolute path requires patching Makefile.am */ @@ -139,7 +199,63 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c + char **files; + GError *error = NULL; + int n; ++#endif ++ GdkPixbufModule *builtin_module = NULL; + ++#define load_one_builtin_module(format) \ ++ builtin_module = g_new0 (GdkPixbufModule, 1); \ ++ builtin_module->module_name = #format; \ ++ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \ ++ file_formats = g_slist_prepend (file_formats, builtin_module);\ ++ else \ ++ g_free (builtin_module) ++ ++#ifdef INCLUDE_ani ++ load_one_builtin_module (ani); ++#endif ++#ifdef INCLUDE_png ++ load_one_builtin_module (png); ++#endif ++#ifdef INCLUDE_bmp ++ load_one_builtin_module (bmp); ++#endif ++#ifdef INCLUDE_wbmp ++ load_one_builtin_module (wbmp); ++#endif ++#ifdef INCLUDE_gif ++ load_one_builtin_module (gif); ++#endif ++#ifdef INCLUDE_ico ++ load_one_builtin_module (ico); ++#endif ++#ifdef INCLUDE_jpeg ++ load_one_builtin_module (jpeg); ++#endif ++#ifdef INCLUDE_pnm ++ load_one_builtin_module (pnm); ++#endif ++#ifdef INCLUDE_ras ++ load_one_builtin_module (ras); ++#endif ++#ifdef INCLUDE_tiff ++ load_one_builtin_module (tiff); ++#endif ++#ifdef INCLUDE_xpm ++ load_one_builtin_module (xpm); ++#endif ++#ifdef INCLUDE_xbm ++ load_one_builtin_module (xbm); ++#endif ++#ifdef INCLUDE_tga ++ load_one_builtin_module (tga); ++#endif ++#ifdef INCLUDE_pcx ++ load_one_builtin_module (pcx); ++#endif ++ ++#undef load_one_builtin_module ++ ++#ifdef USE_GMODULE + list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, + gdkpixbuf_module_file_str, + gdkpixbuf_module_files_d_str, @@ -198,6 +314,6 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c + g_free (list_str); + g_free (gdkpixbuf_module_files_d_str); + g_free (gdkpixbuf_module_file_str); + #endif } - /* actually load the image handler - gdk_pixbuf_get_module only get a */ diff --git a/debian/patches/030_gtkentry_password-char-circle.patch b/debian/patches/030_gtkentry_password-char-circle.patch index 8cf3b26acc..5b1aa28f7d 100644 --- a/debian/patches/030_gtkentry_password-char-circle.patch +++ b/debian/patches/030_gtkentry_password-char-circle.patch @@ -1,8 +1,8 @@ -Index: gtk+2.0-2.10.10/gtk/gtkentry.c +Index: gtk+2.0-2.11.3/gtk/gtkentry.c =================================================================== ---- gtk+2.0-2.10.10.orig/gtk/gtkentry.c 2007-03-12 14:51:19.000000000 +0100 -+++ gtk+2.0-2.10.10/gtk/gtkentry.c 2007-03-13 14:10:39.000000000 +0100 -@@ -526,7 +526,7 @@ +--- gtk+2.0-2.11.3.orig/gtk/gtkentry.c 2007-06-15 20:07:37.000000000 +0200 ++++ gtk+2.0-2.11.3/gtk/gtkentry.c 2007-06-16 14:25:47.000000000 +0200 +@@ -537,7 +537,7 @@ g_param_spec_unichar ("invisible-char", P_("Invisible character"), P_("The character to use when masking entry contents (in \"password mode\")"), @@ -11,7 +11,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, -@@ -1064,7 +1064,7 @@ +@@ -1101,7 +1101,7 @@ entry->editable = TRUE; entry->visible = TRUE; @@ -20,7 +20,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c entry->dnd_position = -1; entry->width_chars = -1; entry->is_cell_renderer = FALSE; -@@ -4325,9 +4325,9 @@ +@@ -4550,9 +4550,9 @@ * gtk_entry_set_visibility() has been called to set text visibility * to %FALSE. i.e. this is the character used in "password mode" to * show the user how many characters have been typed. The default @@ -30,6 +30,6 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c + * invisible char is a black circle (Unicode character 25CF). If + * you set the invisible char to 0, then the user will get no + * feedback at all; there will be no text on the screen as they type. - * **/ void + gtk_entry_set_invisible_char (GtkEntry *entry, diff --git a/debian/patches/033_treeview_resizing.patch b/debian/patches/033_treeview_resizing.patch index 3e753182a7..92cece6270 100644 --- a/debian/patches/033_treeview_resizing.patch +++ b/debian/patches/033_treeview_resizing.patch @@ -1,8 +1,6 @@ -Index: gtk+-2.10.12/gtk/gtktreeviewcolumn.c -=================================================================== ---- gtk+-2.10.12.orig/gtk/gtktreeviewcolumn.c 2007-05-18 19:06:21.720534000 +0200 -+++ gtk+-2.10.12/gtk/gtktreeviewcolumn.c 2007-05-18 19:36:28.845472250 +0200 -@@ -2115,6 +2115,7 @@ +--- gtk+2.0-2.12.0.orig/gtk/gtktreeviewcolumn.c 2007-09-13 22:35:40.000000000 +0200 ++++ gtk+2.0-2.12.0/gtk/gtktreeviewcolumn.c 2007-09-16 18:24:32.000000000 +0200 +@@ -2142,6 +2142,7 @@ tree_column->tree_view != NULL && GTK_WIDGET_REALIZED (tree_column->tree_view)) { @@ -10,11 +8,9 @@ Index: gtk+-2.10.12/gtk/gtktreeviewcolumn.c gtk_widget_queue_resize (tree_column->tree_view); } -Index: gtk+-2.10.12/gtk/gtktreeview.c -=================================================================== ---- gtk+-2.10.12.orig/gtk/gtktreeview.c 2007-05-18 19:06:21.696532500 +0200 -+++ gtk+-2.10.12/gtk/gtktreeview.c 2007-05-18 20:30:24.331677500 +0200 -@@ -2093,18 +2093,20 @@ +--- gtk+2.0-2.12.0.orig/gtk/gtktreeview.c 2007-09-14 00:43:35.000000000 +0200 ++++ gtk+2.0-2.12.0/gtk/gtktreeview.c 2007-09-16 18:24:32.000000000 +0200 +@@ -2159,18 +2159,20 @@ /* GtkWidget::size_allocate helper */ static void @@ -37,7 +33,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c tree_view = GTK_TREE_VIEW (widget); -@@ -2139,12 +2141,38 @@ +@@ -2205,12 +2207,38 @@ number_of_expand_columns++; } @@ -77,7 +73,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c for (list = (rtl ? last_column : first_column); list != (rtl ? first_column->prev : last_column->next); list = (rtl ? list->prev : list->next)) -@@ -2199,6 +2227,10 @@ +@@ -2265,6 +2293,10 @@ { column->width += extra; } @@ -88,7 +84,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c g_object_notify (G_OBJECT (column), "width"); -@@ -2233,13 +2265,13 @@ +@@ -2299,13 +2331,13 @@ g_return_if_fail (GTK_IS_TREE_VIEW (widget)); @@ -105,7 +101,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c tmp_list = tree_view->priv->children; while (tmp_list) -@@ -2326,7 +2358,7 @@ +@@ -2392,7 +2424,7 @@ allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)); } @@ -114,7 +110,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c if (tree_view->priv->tree == NULL) invalidate_empty_focus (tree_view); -@@ -2737,7 +2769,7 @@ +@@ -2837,7 +2869,7 @@ gtk_grab_add (widget); GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE); @@ -123,7 +119,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c /* block attached dnd signal handler */ drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data"); -@@ -3450,6 +3482,8 @@ +@@ -3546,6 +3578,8 @@ { column->use_resized_width = TRUE; column->resized_width = new_width; @@ -132,7 +128,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c gtk_widget_queue_resize (widget); } -@@ -11192,7 +11226,7 @@ +@@ -11472,7 +11506,7 @@ if (GTK_WIDGET_REALIZED (tree_view)) { gtk_widget_queue_resize (GTK_WIDGET (tree_view)); @@ -141,18 +137,16 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c } g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0); -Index: gtk+-2.10.12/gtk/gtktreeprivate.h -=================================================================== ---- gtk+-2.10.12.orig/gtk/gtktreeprivate.h 2007-05-18 19:06:21.648529500 +0200 -+++ gtk+-2.10.12/gtk/gtktreeprivate.h 2007-05-18 19:36:28.869473750 +0200 -@@ -263,6 +263,10 @@ - +--- gtk+2.0-2.12.0.orig/gtk/gtktreeprivate.h 2007-09-13 22:35:41.000000000 +0200 ++++ gtk+2.0-2.12.0/gtk/gtktreeprivate.h 2007-09-16 18:24:32.000000000 +0200 +@@ -265,6 +265,10 @@ gboolean tree_lines_enabled; GdkGC *tree_line_gc; -+ + + gint last_extra_space; + gint last_extra_space_per_column; + gint last_number_of_expand_columns; ++ + gint tooltip_column; }; - #ifdef __GNUC__ diff --git a/debian/patches/040_filechooser_single-click.patch b/debian/patches/040_filechooser_single-click.patch index faf3132a4b..d86970c0ed 100644 --- a/debian/patches/040_filechooser_single-click.patch +++ b/debian/patches/040_filechooser_single-click.patch @@ -1,8 +1,20 @@ -Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c -=================================================================== ---- gtk+-2.10.12.orig/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:08.711978750 +0200 -+++ gtk+-2.10.12/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:18.636599000 +0200 -@@ -3250,8 +3250,22 @@ +Debian #405296; GNOME #148828; permit single click in filechooser instead of +requiring double-click. + +--- gtk+2.0-2.12.0.orig/gtk/gtkfilechooserdefault.c 2007-09-13 22:35:40.000000000 +0200 ++++ gtk+2.0-2.12.0/gtk/gtkfilechooserdefault.c 2007-09-16 18:24:40.000000000 +0200 +@@ -390,10 +390,6 @@ + + static void filter_combo_changed (GtkComboBox *combo_box, + GtkFileChooserDefault *impl); +-static void shortcuts_row_activated_cb (GtkTreeView *tree_view, +- GtkTreePath *path, +- GtkTreeViewColumn *column, +- GtkFileChooserDefault *impl); + + static gboolean shortcuts_key_press_event_cb (GtkWidget *widget, + GdkEventKey *event, +@@ -3657,8 +3653,22 @@ shortcuts_selection_changed_cb (GtkTreeSelection *selection, GtkFileChooserDefault *impl) { @@ -17,7 +29,7 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c + + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) + { -+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model), ++ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model), + &child_iter, + &iter); + shortcuts_activate_iter (impl, &child_iter); @@ -25,7 +37,17 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c } static gboolean -@@ -7920,25 +7934,6 @@ +@@ -3938,9 +3948,6 @@ + g_signal_connect (selection, "changed", + G_CALLBACK (shortcuts_selection_changed_cb), impl); + +- g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated", +- G_CALLBACK (shortcuts_row_activated_cb), impl); +- + g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event", + G_CALLBACK (shortcuts_key_press_event_cb), impl); + +@@ -8593,25 +8600,6 @@ gtk_file_path_free (path); return retval; } @@ -41,7 +63,7 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c - { - shortcuts_activate_iter (impl, &iter); - -- gtk_widget_grab_focus (impl->browse_files_tree_view); +- focus_browse_tree_view_if_possible (impl); - } - else - goto file_list; @@ -51,21 +73,29 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view) { /* The focus is on a dialog's action area button, *and* the widget that -@@ -8267,17 +8262,6 @@ - GtkTreeViewColumn *column, - GtkFileChooserDefault *impl) - { +@@ -10469,25 +10457,6 @@ + } + } + +-/* Callback used when a row in the shortcuts list is activated */ +-static void +-shortcuts_row_activated_cb (GtkTreeView *tree_view, +- GtkTreePath *path, +- GtkTreeViewColumn *column, +- GtkFileChooserDefault *impl) +-{ - GtkTreeIter iter; - GtkTreeIter child_iter; - -- if (!gtk_tree_model_get_iter (impl->shortcuts_filter_model, &iter, path)) +- if (!gtk_tree_model_get_iter (impl->shortcuts_pane_filter_model, &iter, path)) - return; - -- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model), +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model), - &child_iter, - &iter); - shortcuts_activate_iter (impl, &child_iter); +-} - - gtk_widget_grab_focus (impl->browse_files_tree_view); - } - + /* Handler for GtkWidget::key-press-event on the shortcuts list */ + static gboolean + shortcuts_key_press_event_cb (GtkWidget *widget, diff --git a/debian/patches/041_ia32-libs.patch b/debian/patches/041_ia32-libs.patch index 5da38629cc..ac57c30304 100644 --- a/debian/patches/041_ia32-libs.patch +++ b/debian/patches/041_ia32-libs.patch @@ -1,7 +1,7 @@ -Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c +Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c =================================================================== ---- gtk+2.0-2.10.11.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:36.000000000 +0200 -+++ gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:40.000000000 +0200 +--- gtk+2.0-2.11.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:25:47.000000000 +0200 ++++ gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:26:24.000000000 +0200 @@ -280,8 +280,20 @@ gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE")); @@ -25,11 +25,11 @@ Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c return result; } -Index: gtk+2.0-2.10.11/gtk/gtkrc.c +Index: gtk+2.0-2.11.3/gtk/gtkrc.c =================================================================== ---- gtk+2.0-2.10.11.orig/gtk/gtkrc.c 2007-04-13 10:56:36.000000000 +0200 -+++ gtk+2.0-2.10.11/gtk/gtkrc.c 2007-04-13 10:56:40.000000000 +0200 -@@ -447,7 +447,20 @@ +--- gtk+2.0-2.11.3.orig/gtk/gtkrc.c 2007-06-15 20:07:37.000000000 +0200 ++++ gtk+2.0-2.11.3/gtk/gtkrc.c 2007-06-16 14:26:24.000000000 +0200 +@@ -450,7 +450,20 @@ if (im_module_file) result = g_strdup (im_module_file); else @@ -51,7 +51,7 @@ Index: gtk+2.0-2.10.11/gtk/gtkrc.c } return result; -@@ -519,7 +532,21 @@ +@@ -522,7 +535,21 @@ else { const gchar *home; @@ -74,7 +74,7 @@ Index: gtk+2.0-2.10.11/gtk/gtkrc.c gtk_rc_add_default_file (str); g_free (str); -@@ -527,7 +554,21 @@ +@@ -530,7 +557,21 @@ home = g_get_home_dir (); if (home) { diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 8f09ca2832..e138fe2472 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -6,9 +6,9 @@ automake-1.7 rm -rf autom4te.cache exclude config.guess and sub with diff -urN -x config.guess -x config.sub -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/aclocal.m4 gtk+-2.10.14/aclocal.m4 ---- gtk+-2.10.14.orig/aclocal.m4 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/aclocal.m4 2007-07-17 12:50:00.000000000 +0330 +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/aclocal.m4 gtk+-2.12.0/aclocal.m4 +--- gtk+-2.12.0.orig/aclocal.m4 2007-09-14 00:17:30.000000000 +0330 ++++ gtk+-2.12.0/aclocal.m4 2007-09-16 18:42:52.000000000 +0330 @@ -941,7 +941,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -259,67 +259,66 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/aclocal.m4 gtk+-2.10.1 [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -@@ -8323,22 +8299,22 @@ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory -- AC_ARG_WITH(html-dir, -- AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, -+ AC_ARG_WITH([html-dir], -+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" -- AC_SUBST(HTML_DIR) -+ AC_SUBST([HTML_DIR]) +@@ -7879,7 +7855,7 @@ + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([msgfmt -c -o /dev/null],[ ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ + msgid "" + msgstr "" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -8335,18 +8311,32 @@ + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) - dnl enable/disable documentation building -- AC_ARG_ENABLE(gtk-doc, -- AC_HELP_STRING([--enable-gtk-doc], -- [use gtk-doc to build documentation [default=no]]),, -- enable_gtk_doc=no) -+ AC_ARG_ENABLE([gtk-doc], -+ AS_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [[default=no]]]),, -+ [enable_gtk_doc=no]) - - have_gtk_doc=no ++ have_gtk_doc=no if test x$enable_gtk_doc = xyes; then - if test -z "$PKG_CONFIG"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- ifelse([$1],[], +- [PKG_CHECK_EXISTS([gtk-doc],, +- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], +- [PKG_CHECK_EXISTS([gtk-doc >= $1],, +- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) +- fi +- +- AC_MSG_CHECKING([whether to build gtk-doc documentation]) +- AC_MSG_RESULT($enable_gtk_doc) ++ if test -z "$PKG_CONFIG"; then + AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes -@@ -8350,9 +8326,9 @@ - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then -- AC_MSG_RESULT(yes) ++ fi ++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ++ have_gtk_doc=yes ++ fi + +- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ dnl do we want to do a version check? ++ifelse([$1],[],, ++ [gtk_doc_min_version=$1 ++ if test "$have_gtk_doc" = yes; then ++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) ++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT([yes]) - else -- AC_MSG_RESULT(no) ++ else + AC_MSG_RESULT([no]) - have_gtk_doc=no - fi - fi -@@ -8362,7 +8338,7 @@ - fi - fi ++ have_gtk_doc=no ++ fi ++ fi ++]) ++ if test "$have_gtk_doc" != yes; then ++ enable_gtk_doc=no ++ fi ++ fi -- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - ]) - -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14/configure ---- gtk+-2.10.14.orig/configure 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/configure 2007-07-17 12:50:06.000000000 +0330 + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/configure gtk+-2.12.0/configure +--- gtk+-2.12.0.orig/configure 2007-09-14 00:17:55.000000000 +0330 ++++ gtk+-2.12.0/configure 2007-09-16 18:43:03.000000000 +0330 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.60 for gtk+ 2.10.14. -+# Generated by GNU Autoconf 2.61 for gtk+ 2.10.14. +-# Generated by GNU Autoconf 2.60 for gtk+ 2.12.0. ++# Generated by GNU Autoconf 2.61 for gtk+ 2.12.0. # # Report bugs to . # @@ -500,18 +499,26 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 am__fastdepCC_FALSE +ENABLE_STATIC_TRUE +ENABLE_STATIC_FALSE - GREP - EGREP - LN_S -@@ -1020,6 +1037,7 @@ + CXX + CXXFLAGS + ac_ct_CXX +@@ -1031,7 +1048,6 @@ + TEST_PRINT_BACKEND_TRUE + TEST_PRINT_BACKEND_FALSE + HTML_DIR +-GTKDOC_CHECK + ENABLE_GTK_DOC_TRUE + ENABLE_GTK_DOC_FALSE + GTK_DOC_USE_LIBTOOL_TRUE +@@ -1053,6 +1069,7 @@ CC CFLAGS LDFLAGS +LIBS CPPFLAGS - CPP CXX -@@ -1137,10 +1155,10 @@ + CXXFLAGS +@@ -1170,10 +1187,10 @@ -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. @@ -524,7 +531,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) -@@ -1156,10 +1174,10 @@ +@@ -1189,10 +1206,10 @@ -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. @@ -537,7 +544,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -@@ -1353,19 +1371,19 @@ +@@ -1386,19 +1403,19 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. @@ -561,42 +568,33 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval with_$ac_package=no ;; --x) -@@ -1638,7 +1656,7 @@ - [default=auto] - --disable-glibtest do not try to compile and run a test GLIB program - --disable-modules disable dynamic module loading -- --enable-gtk-doc use gtk-doc to build documentation default=no -+ --enable-gtk-doc use gtk-doc to build documentation [default=no] - --enable-man regenerate man pages from Docbook [default=no] - - Optional Packages: -@@ -1668,6 +1686,7 @@ +@@ -1700,6 +1717,7 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor -@@ -1748,7 +1767,7 @@ + CXX C++ compiler command +@@ -1780,7 +1798,7 @@ if $ac_init_version; then cat <<\_ACEOF - gtk+ configure 2.10.14 + gtk+ configure 2.12.0 -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -@@ -1762,7 +1781,7 @@ +@@ -1794,7 +1812,7 @@ running configure, to aid debugging if configure makes a mistake. - It was created by gtk+ $as_me 2.10.14, which was + It was created by gtk+ $as_me 2.12.0, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ -@@ -2188,7 +2207,7 @@ +@@ -2220,7 +2238,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do @@ -605,7 +603,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. -@@ -2322,7 +2341,7 @@ +@@ -2354,7 +2372,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -614,7 +612,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -2451,7 +2470,7 @@ +@@ -2483,7 +2501,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -623,7 +621,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -2491,7 +2510,7 @@ +@@ -2523,7 +2541,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -632,7 +630,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -2732,7 +2751,7 @@ +@@ -2764,7 +2782,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -641,7 +639,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -2772,7 +2791,7 @@ +@@ -2804,7 +2822,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -650,7 +648,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -2829,7 +2848,7 @@ +@@ -2861,7 +2879,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -659,7 +657,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -2870,7 +2889,7 @@ +@@ -2902,7 +2920,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -668,7 +666,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue -@@ -2928,7 +2947,7 @@ +@@ -2960,7 +2978,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -677,7 +675,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -2972,7 +2991,7 @@ +@@ -3004,7 +3022,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -686,7 +684,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -3113,7 +3132,7 @@ +@@ -3145,7 +3163,7 @@ # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -695,7 +693,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 do test -f "$ac_file" || continue case $ac_file in -@@ -3141,6 +3160,12 @@ +@@ -3173,6 +3191,12 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else @@ -708,7 +706,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -3152,8 +3177,6 @@ +@@ -3184,8 +3208,6 @@ fi ac_exeext=$ac_cv_exeext @@ -717,7 +715,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -@@ -3331,27 +3354,10 @@ +@@ -3363,27 +3385,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -749,7 +747,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -@@ -3406,27 +3412,10 @@ +@@ -3438,27 +3443,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -781,7 +779,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -@@ -3461,27 +3450,10 @@ +@@ -3493,27 +3481,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -813,7 +811,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -3517,27 +3489,10 @@ +@@ -3549,27 +3520,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -845,7 +843,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -@@ -3653,27 +3608,10 @@ +@@ -3685,27 +3639,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -877,7 +875,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 -@@ -3903,6 +3841,16 @@ +@@ -3935,6 +3872,16 @@ @@ -891,10 +889,229 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 +fi + + - if test "$os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then - { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 -@@ -4044,7 +3992,7 @@ + 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. +@@ -3953,7 +3900,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4014,7 +3961,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4058,7 +4005,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4171,27 +4118,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4246,27 +4176,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4301,27 +4214,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -4357,27 +4253,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4549,27 +4428,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -4620,27 +4482,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + OBJC=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4809,7 +4654,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" @@ -903,7 +1120,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in -@@ -4126,7 +4074,7 @@ +@@ -4891,7 +4736,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" @@ -912,7 +1129,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in -@@ -4432,7 +4380,7 @@ +@@ -5197,7 +5042,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -921,7 +1138,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) -@@ -4486,11 +4434,11 @@ +@@ -5251,11 +5096,11 @@ ;; # This must be Linux ELF. @@ -935,16 +1152,16 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 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 -@@ -4607,7 +4555,7 @@ +@@ -5372,7 +5217,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 4610 "configure"' > conftest.$ac_ext -+ echo '#line 4558 "configure"' > conftest.$ac_ext +- echo '#line 5375 "configure"' > conftest.$ac_ext ++ echo '#line 5220 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -4731,27 +4679,11 @@ +@@ -5496,27 +5341,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -977,7 +1194,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -@@ -4760,7 +4692,7 @@ +@@ -5525,7 +5354,7 @@ lt_cv_cc_needs_belf=no fi @@ -986,7 +1203,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -4814,7 +4746,7 @@ +@@ -5579,7 +5408,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -995,7 +1212,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -4854,7 +4786,7 @@ +@@ -5619,7 +5448,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1004,7 +1221,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_DLLTOOL="dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -4910,7 +4842,7 @@ +@@ -5675,7 +5504,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1013,7 +1230,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_AS="${ac_tool_prefix}as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -4950,7 +4882,7 @@ +@@ -5715,7 +5544,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1022,7 +1239,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_AS="as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5006,7 +4938,7 @@ +@@ -5771,7 +5600,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1031,7 +1248,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5046,7 +4978,7 @@ +@@ -5811,7 +5640,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1040,7 +1257,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_OBJDUMP="objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5144,17 +5076,10 @@ +@@ -5909,17 +5738,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1062,7 +1279,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -5188,17 +5113,10 @@ +@@ -5953,17 +5775,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1084,7 +1301,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Broken: success on invalid input. continue else -@@ -5263,17 +5181,10 @@ +@@ -6028,17 +5843,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1106,7 +1323,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -5307,17 +5218,10 @@ +@@ -6072,17 +5880,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1128,7 +1345,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Broken: success on invalid input. continue else -@@ -5388,27 +5292,10 @@ +@@ -6153,27 +5954,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1160,7 +1377,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 -@@ -5584,27 +5471,10 @@ +@@ -6349,27 +6133,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1192,7 +1409,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -@@ -5667,27 +5537,10 @@ +@@ -6432,27 +6199,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1224,7 +1441,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -5723,17 +5576,10 @@ +@@ -6488,17 +6238,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1246,153 +1463,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -5825,7 +5671,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5869,7 +5715,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5982,27 +5828,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6057,27 +5886,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6112,27 +5924,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -6168,27 +5963,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6384,17 +6162,10 @@ +@@ -6615,17 +6358,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1414,7 +1485,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -6428,17 +6199,10 @@ +@@ -6659,17 +6395,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1436,7 +1507,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Broken: success on invalid input. continue else -@@ -6503,17 +6267,10 @@ +@@ -6734,17 +6463,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1458,7 +1529,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -6547,17 +6304,10 @@ +@@ -6778,17 +6500,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1480,7 +1551,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Broken: success on invalid input. continue else -@@ -6598,7 +6348,7 @@ +@@ -6828,7 +6543,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then @@ -1489,7 +1560,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -@@ -6616,7 +6366,7 @@ +@@ -6846,7 +6561,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1498,7 +1569,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -6642,7 +6392,7 @@ +@@ -6872,7 +6587,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 @@ -1507,7 +1578,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -6660,7 +6410,7 @@ +@@ -6890,7 +6605,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1516,7 +1587,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -6767,27 +6517,10 @@ +@@ -6997,27 +6712,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1548,7 +1619,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -@@ -6830,27 +6563,10 @@ +@@ -7060,27 +6758,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1580,7 +1651,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 -@@ -7048,7 +6764,7 @@ +@@ -7278,7 +6959,7 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; @@ -1589,7 +1660,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if test "$host_cpu" = ia64; then symcode='[ABCDGIRSTW]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -@@ -7305,7 +7021,7 @@ +@@ -7535,7 +7216,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1598,7 +1669,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7345,7 +7061,7 @@ +@@ -7575,7 +7256,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1607,7 +1678,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7401,7 +7117,7 @@ +@@ -7631,7 +7312,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1616,7 +1687,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7441,7 +7157,7 @@ +@@ -7671,7 +7352,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1625,7 +1696,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7497,7 +7213,7 @@ +@@ -7727,7 +7408,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1634,7 +1705,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7537,7 +7253,7 @@ +@@ -7767,7 +7448,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1643,21 +1714,21 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7854,11 +7570,11 @@ +@@ -8084,11 +7765,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7857: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7573: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8087: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7768: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:7861: \$? = $ac_status" >&5 -+ echo "$as_me:7577: \$? = $ac_status" >&5 +- echo "$as_me:8091: \$? = $ac_status" >&5 ++ echo "$as_me:7772: \$? = $ac_status" >&5 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. -@@ -8016,7 +7732,7 @@ +@@ -8246,7 +7927,7 @@ lt_prog_compiler_static='-Bstatic' ;; @@ -1666,35 +1737,35 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' -@@ -8122,11 +7838,11 @@ +@@ -8352,11 +8033,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8125: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7841: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8355: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8036: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:8129: \$? = $ac_status" >&5 -+ echo "$as_me:7845: \$? = $ac_status" >&5 +- echo "$as_me:8359: \$? = $ac_status" >&5 ++ echo "$as_me:8040: \$? = $ac_status" >&5 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. -@@ -8226,11 +7942,11 @@ +@@ -8456,11 +8137,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8229: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7945: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8459: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8140: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:8233: \$? = $ac_status" >&5 -+ echo "$as_me:7949: \$? = $ac_status" >&5 +- echo "$as_me:8463: \$? = $ac_status" >&5 ++ echo "$as_me:8144: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -8455,7 +8171,7 @@ +@@ -8685,7 +8366,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; @@ -1703,7 +1774,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in -@@ -8481,12 +8197,13 @@ +@@ -8711,12 +8392,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -1718,7 +1789,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -8706,27 +8423,11 @@ +@@ -8936,27 +8618,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1751,7 +1822,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -8740,7 +8441,7 @@ +@@ -8970,7 +8636,7 @@ fi @@ -1760,7 +1831,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -8781,27 +8482,11 @@ +@@ -9011,27 +8677,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1793,7 +1864,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -8815,7 +8500,7 @@ +@@ -9045,7 +8695,7 @@ fi @@ -1802,7 +1873,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -8946,7 +8631,7 @@ +@@ -9176,7 +8826,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. @@ -1811,7 +1882,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes -@@ -9048,7 +8733,7 @@ +@@ -9278,7 +8928,7 @@ link_all_deplibs=yes ;; @@ -1820,7 +1891,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -9538,18 +9223,6 @@ +@@ -9768,18 +9418,6 @@ dynamic_linker=no ;; @@ -1839,7 +1910,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. -@@ -9705,7 +9378,7 @@ +@@ -9935,7 +9573,7 @@ ;; # This must be Linux ELF. @@ -1848,7 +1919,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -9719,31 +9392,10 @@ +@@ -9949,31 +9587,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -1856,7 +1927,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) -- echo '#line 9726 "configure"' > conftest.$ac_ext +- echo '#line 9956 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? @@ -1881,7 +1952,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -9755,7 +9407,7 @@ +@@ -9985,7 +9602,7 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -1890,7 +1961,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -9764,7 +9416,7 @@ +@@ -9994,7 +9611,7 @@ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -1899,7 +1970,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ;; netbsd*) -@@ -10084,27 +9736,11 @@ +@@ -10314,27 +9931,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1932,7 +2003,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -@@ -10113,7 +9749,7 @@ +@@ -10343,7 +9944,7 @@ ac_cv_lib_dl_dlopen=no fi @@ -1941,7 +2012,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -10195,27 +9831,11 @@ +@@ -10425,27 +10026,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -1974,7 +2045,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -@@ -10224,7 +9844,7 @@ +@@ -10454,7 +10039,7 @@ ac_cv_func_shl_load=no fi @@ -1983,7 +2054,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -@@ -10274,27 +9894,11 @@ +@@ -10504,27 +10089,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2016,7 +2087,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -@@ -10303,7 +9907,7 @@ +@@ -10533,7 +10102,7 @@ ac_cv_lib_dld_shl_load=no fi @@ -2025,7 +2096,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -10375,27 +9979,11 @@ +@@ -10605,27 +10174,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2058,7 +2129,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -@@ -10404,7 +9992,7 @@ +@@ -10634,7 +10187,7 @@ ac_cv_func_dlopen=no fi @@ -2067,7 +2138,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -@@ -10454,27 +10042,11 @@ +@@ -10684,27 +10237,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2100,7 +2171,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -@@ -10483,7 +10055,7 @@ +@@ -10713,7 +10250,7 @@ ac_cv_lib_dl_dlopen=no fi @@ -2109,7 +2180,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -10534,27 +10106,11 @@ +@@ -10764,27 +10301,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2142,7 +2213,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -@@ -10563,7 +10119,7 @@ +@@ -10793,7 +10314,7 @@ ac_cv_lib_svld_dlopen=no fi @@ -2151,7 +2222,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -10614,27 +10170,11 @@ +@@ -10844,27 +10365,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2184,7 +2255,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -@@ -10643,7 +10183,7 @@ +@@ -10873,7 +10378,7 @@ ac_cv_lib_dld_dld_link=no fi @@ -2193,25 +2264,25 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -10699,7 +10239,7 @@ +@@ -10929,7 +10434,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2244,7 +2315,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -11920,7 +11444,7 @@ +@@ -12150,7 +11639,7 @@ fi @@ -2253,7 +2324,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -11962,27 +11486,11 @@ +@@ -12192,27 +11681,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2286,7 +2357,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -11996,7 +11504,7 @@ +@@ -12226,7 +11699,7 @@ fi @@ -2295,7 +2366,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -12144,7 +11652,7 @@ +@@ -12374,7 +11847,7 @@ freebsd-elf*) archive_cmds_need_lc_CXX=no ;; @@ -2304,7 +2375,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes -@@ -12303,7 +11811,7 @@ +@@ -12533,7 +12006,7 @@ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; @@ -2313,7 +2384,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler -@@ -12405,7 +11913,7 @@ +@@ -12635,7 +12108,7 @@ ;; esac ;; @@ -2322,7 +2393,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 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= -@@ -12972,7 +12480,7 @@ +@@ -13202,7 +12675,7 @@ ;; esac ;; @@ -2331,7 +2402,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) -@@ -13015,7 +12523,7 @@ +@@ -13245,7 +12718,7 @@ ;; esac ;; @@ -2340,7 +2411,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 case $cc_basename in KCC*) # KAI C++ Compiler -@@ -13058,7 +12566,7 @@ +@@ -13288,7 +12761,7 @@ ;; esac ;; @@ -2349,35 +2420,35 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -13167,11 +12675,11 @@ +@@ -13397,11 +12870,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13170: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12678: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13400: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12873: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:13174: \$? = $ac_status" >&5 -+ echo "$as_me:12682: \$? = $ac_status" >&5 +- echo "$as_me:13404: \$? = $ac_status" >&5 ++ echo "$as_me:12877: \$? = $ac_status" >&5 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. -@@ -13271,11 +12779,11 @@ +@@ -13501,11 +12974,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13274: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12782: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13504: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12977: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:13278: \$? = $ac_status" >&5 -+ echo "$as_me:12786: \$? = $ac_status" >&5 +- echo "$as_me:13508: \$? = $ac_status" >&5 ++ echo "$as_me:12981: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -13343,6 +12851,9 @@ +@@ -13573,6 +13046,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' ;; @@ -2387,7 +2458,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -13622,18 +13133,6 @@ +@@ -13852,18 +13328,6 @@ dynamic_linker=no ;; @@ -2406,7 +2477,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. -@@ -13789,7 +13288,7 @@ +@@ -14019,7 +13483,7 @@ ;; # This must be Linux ELF. @@ -2415,7 +2486,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -13803,31 +13302,10 @@ +@@ -14033,31 +13497,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -2423,7 +2494,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) -- echo '#line 13810 "configure"' > conftest.$ac_ext +- echo '#line 14040 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? @@ -2448,7 +2519,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -13839,7 +13317,7 @@ +@@ -14069,7 +13512,7 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -2457,7 +2528,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -13848,7 +13326,7 @@ +@@ -14078,7 +13521,7 @@ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2466,7 +2537,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ;; netbsd*) -@@ -14756,7 +14234,7 @@ +@@ -14986,7 +14429,7 @@ lt_prog_compiler_static_F77='-Bstatic' ;; @@ -2475,35 +2546,35 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' -@@ -14862,11 +14340,11 @@ +@@ -15092,11 +14535,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14865: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14343: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15095: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14538: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:14869: \$? = $ac_status" >&5 -+ echo "$as_me:14347: \$? = $ac_status" >&5 +- echo "$as_me:15099: \$? = $ac_status" >&5 ++ echo "$as_me:14542: \$? = $ac_status" >&5 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. -@@ -14966,11 +14444,11 @@ +@@ -15196,11 +14639,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14969: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14447: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15199: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14642: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:14973: \$? = $ac_status" >&5 -+ echo "$as_me:14451: \$? = $ac_status" >&5 +- echo "$as_me:15203: \$? = $ac_status" >&5 ++ echo "$as_me:14646: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -15195,7 +14673,7 @@ +@@ -15425,7 +14868,7 @@ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; @@ -2512,7 +2583,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in -@@ -15221,12 +14699,13 @@ +@@ -15451,12 +14894,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -2527,7 +2598,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -15436,27 +14915,11 @@ +@@ -15666,27 +15110,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2560,7 +2631,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -15470,7 +14933,7 @@ +@@ -15700,7 +15128,7 @@ fi @@ -2569,7 +2640,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -15501,27 +14964,11 @@ +@@ -15731,27 +15159,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2602,7 +2673,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -15535,7 +14982,7 @@ +@@ -15765,7 +15177,7 @@ fi @@ -2611,7 +2682,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -15666,7 +15113,7 @@ +@@ -15896,7 +15308,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. @@ -2620,7 +2691,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes -@@ -15768,7 +15215,7 @@ +@@ -15998,7 +15410,7 @@ link_all_deplibs_F77=yes ;; @@ -2629,7 +2700,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -16258,18 +15705,6 @@ +@@ -16488,18 +15900,6 @@ dynamic_linker=no ;; @@ -2648,7 +2719,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. -@@ -16425,7 +15860,7 @@ +@@ -16655,7 +16055,7 @@ ;; # This must be Linux ELF. @@ -2657,7 +2728,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -16439,31 +15874,10 @@ +@@ -16669,31 +16069,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -2665,7 +2736,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) -- echo '#line 16446 "configure"' > conftest.$ac_ext +- echo '#line 16676 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? @@ -2690,7 +2761,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -16475,7 +15889,7 @@ +@@ -16705,7 +16084,7 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -2699,7 +2770,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -16484,7 +15898,7 @@ +@@ -16714,7 +16093,7 @@ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2708,21 +2779,21 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ;; netbsd*) -@@ -17217,11 +16631,11 @@ +@@ -17447,11 +16826,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17220: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16634: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17450: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16829: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:17224: \$? = $ac_status" >&5 -+ echo "$as_me:16638: \$? = $ac_status" >&5 +- echo "$as_me:17454: \$? = $ac_status" >&5 ++ echo "$as_me:16833: \$? = $ac_status" >&5 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. -@@ -17379,7 +16793,7 @@ +@@ -17609,7 +16988,7 @@ lt_prog_compiler_static_GCJ='-Bstatic' ;; @@ -2731,35 +2802,35 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' -@@ -17485,11 +16899,11 @@ +@@ -17715,11 +17094,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17488: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16902: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17718: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17097: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:17492: \$? = $ac_status" >&5 -+ echo "$as_me:16906: \$? = $ac_status" >&5 +- echo "$as_me:17722: \$? = $ac_status" >&5 ++ echo "$as_me:17101: \$? = $ac_status" >&5 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. -@@ -17589,11 +17003,11 @@ +@@ -17819,11 +17198,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17592: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17006: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17822: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17201: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:17596: \$? = $ac_status" >&5 -+ echo "$as_me:17010: \$? = $ac_status" >&5 +- echo "$as_me:17826: \$? = $ac_status" >&5 ++ echo "$as_me:17205: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -17818,7 +17232,7 @@ +@@ -18048,7 +17427,7 @@ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; @@ -2768,7 +2839,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in -@@ -17844,12 +17258,13 @@ +@@ -18074,12 +17453,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -2783,7 +2854,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -18069,27 +17484,11 @@ +@@ -18299,27 +17679,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2816,7 +2887,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -18103,7 +17502,7 @@ +@@ -18333,7 +17697,7 @@ fi @@ -2825,7 +2896,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -18144,27 +17543,11 @@ +@@ -18374,27 +17738,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2858,7 +2929,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` -@@ -18178,7 +17561,7 @@ +@@ -18408,7 +17756,7 @@ fi @@ -2867,7 +2938,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -18309,7 +17692,7 @@ +@@ -18539,7 +17887,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. @@ -2876,7 +2947,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes -@@ -18411,7 +17794,7 @@ +@@ -18641,7 +17989,7 @@ link_all_deplibs_GCJ=yes ;; @@ -2885,7 +2956,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -18901,18 +18284,6 @@ +@@ -19131,18 +18479,6 @@ dynamic_linker=no ;; @@ -2904,7 +2975,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. -@@ -19068,7 +18439,7 @@ +@@ -19298,7 +18634,7 @@ ;; # This must be Linux ELF. @@ -2913,7 +2984,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -19082,31 +18453,10 @@ +@@ -19312,31 +18648,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -2921,7 +2992,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) -- echo '#line 19089 "configure"' > conftest.$ac_ext +- echo '#line 19319 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? @@ -2946,7 +3017,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -19118,7 +18468,7 @@ +@@ -19348,7 +18663,7 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -2955,7 +3026,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 version_type=linux need_lib_prefix=no need_version=no -@@ -19127,7 +18477,7 @@ +@@ -19357,7 +18672,7 @@ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2964,7 +3035,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ;; netbsd*) -@@ -20360,27 +19710,10 @@ +@@ -20590,27 +19905,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2996,7 +3067,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 break else echo "$as_me: failed program was:" >&5 -@@ -20404,27 +19737,10 @@ +@@ -20634,27 +19932,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3028,7 +3099,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_sys_largefile_CC=' -n32'; break else echo "$as_me: failed program was:" >&5 -@@ -20452,7 +19768,6 @@ +@@ -20682,7 +19963,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do @@ -3036,7 +3107,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -20489,28 +19804,11 @@ +@@ -20719,28 +19999,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3070,7 +3141,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20556,27 +19854,10 @@ +@@ -20786,27 +20049,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3102,7 +3173,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 -@@ -20586,26 +19867,28 @@ +@@ -20816,26 +20062,28 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -3137,7 +3208,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -20642,28 +19925,11 @@ +@@ -20872,28 +20120,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3171,7 +3242,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20709,27 +19975,10 @@ +@@ -20939,27 +20170,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3203,7 +3274,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 -@@ -20739,19 +19988,22 @@ +@@ -20969,19 +20183,22 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -3230,7 +3301,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 fi -@@ -20780,7 +20032,7 @@ +@@ -21010,7 +20227,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3239,7 +3310,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -20901,7 +20153,7 @@ +@@ -21131,7 +20348,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3248,7 +3319,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_WINDRES="${ac_tool_prefix}windres" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -20941,7 +20193,7 @@ +@@ -21171,7 +20388,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3257,7 +3328,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ac_ct_WINDRES="windres" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -21001,7 +20253,7 @@ +@@ -21231,7 +20448,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3266,7 +3337,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_ms_librarian="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -21254,27 +20506,11 @@ +@@ -21463,27 +20680,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3299,7 +3370,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_search_strerror=$ac_res else echo "$as_me: failed program was:" >&5 -@@ -21283,7 +20519,7 @@ +@@ -21492,7 +20693,7 @@ fi @@ -3308,7 +3379,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext if test "${ac_cv_search_strerror+set}" = set; then break -@@ -21383,27 +20619,10 @@ +@@ -21592,27 +20793,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3340,7 +3411,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 am_cv_prog_cc_stdc="$ac_arg"; break else echo "$as_me: failed program was:" >&5 -@@ -21466,7 +20685,7 @@ +@@ -21675,7 +20859,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do @@ -3349,7 +3420,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. -@@ -21630,7 +20849,7 @@ +@@ -21839,7 +21023,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3358,7 +3429,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -21673,7 +20892,7 @@ +@@ -21882,7 +21066,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3367,7 +3438,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -21819,7 +21038,7 @@ +@@ -22028,7 +21212,7 @@ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. @@ -3376,7 +3447,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 See \`config.log' for more details." >&5 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -21829,7 +21048,7 @@ +@@ -22038,7 +21222,7 @@ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. @@ -3385,7 +3456,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else -@@ -21843,7 +21062,8 @@ +@@ -22052,7 +21236,8 @@ if test "$os_win32" != yes; then # libtool option to control which symbols are exported # right now, symbols starting with _ are not exported @@ -3395,7 +3466,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 else # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) LIBTOOL_EXPORT_OPTIONS= -@@ -21915,7 +21135,7 @@ +@@ -22124,7 +21309,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3404,7 +3475,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -21958,7 +21178,7 @@ +@@ -22167,7 +21352,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3413,7 +3484,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_INDENT="indent" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -22058,27 +21278,11 @@ +@@ -22267,27 +21452,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3446,7 +3517,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -@@ -22087,7 +21291,7 @@ +@@ -22296,7 +21465,7 @@ eval "$as_ac_var=no" fi @@ -3455,7 +3526,49 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` -@@ -22136,27 +21340,11 @@ +@@ -22377,27 +21546,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -22406,7 +21559,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -22455,27 +21608,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3488,7 +3601,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gtk_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -22165,7 +21353,7 @@ +@@ -22484,7 +21621,7 @@ gtk_ok=no fi @@ -3497,7 +3610,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext { echo "$as_me:$LINENO: result: $gtk_ok" >&5 echo "${ECHO_T}$gtk_ok" >&6; } -@@ -22211,27 +21399,11 @@ +@@ -22530,27 +21667,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3530,7 +3643,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gtk_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -22240,7 +21412,7 @@ +@@ -22559,7 +21680,7 @@ gtk_ok=no fi @@ -3539,7 +3652,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext { echo "$as_me:$LINENO: result: $gtk_ok" >&5 echo "${ECHO_T}$gtk_ok" >&6; } -@@ -22286,27 +21458,11 @@ +@@ -22605,27 +21726,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3572,7 +3685,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gtk_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -22315,7 +21471,7 @@ +@@ -22634,7 +21739,7 @@ gtk_ok=no fi @@ -3581,7 +3694,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext { echo "$as_me:$LINENO: result: $gtk_ok" >&5 echo "${ECHO_T}$gtk_ok" >&6; } -@@ -22361,27 +21517,11 @@ +@@ -22680,27 +21785,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3614,7 +3727,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gtk_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -22390,7 +21530,7 @@ +@@ -22709,7 +21798,7 @@ gtk_ok=no fi @@ -3623,7 +3736,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext { echo "$as_me:$LINENO: result: $gtk_ok" >&5 echo "${ECHO_T}$gtk_ok" >&6; } -@@ -22436,27 +21576,11 @@ +@@ -22755,27 +21844,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3656,7 +3769,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gtk_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -22465,7 +21589,7 @@ +@@ -22784,7 +21857,7 @@ gtk_ok=no fi @@ -3665,7 +3778,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext { echo "$as_me:$LINENO: result: $gtk_ok" >&5 echo "${ECHO_T}$gtk_ok" >&6; } -@@ -22523,27 +21647,10 @@ +@@ -22842,27 +21915,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3697,7 +3810,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -22579,17 +21686,10 @@ +@@ -22898,17 +21954,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3719,7 +3832,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -22687,27 +21787,11 @@ +@@ -23006,27 +22055,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3752,7 +3865,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 -@@ -22716,7 +21800,7 @@ +@@ -23035,7 +22068,7 @@ am_cv_val_LC_MESSAGES=no fi @@ -3761,7 +3874,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -@@ -22772,27 +21856,10 @@ +@@ -23091,27 +22124,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3793,7 +3906,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -22828,17 +21895,10 @@ +@@ -23147,17 +22163,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3815,7 +3928,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -22934,27 +21994,11 @@ +@@ -23253,27 +22262,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3848,7 +3961,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gt_cv_func_ngettext_libc=yes else echo "$as_me: failed program was:" >&5 -@@ -22963,7 +22007,7 @@ +@@ -23282,7 +22275,7 @@ gt_cv_func_ngettext_libc=no fi @@ -3857,7 +3970,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi -@@ -23006,27 +22050,11 @@ +@@ -23325,27 +22318,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3890,7 +4003,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 -@@ -23035,7 +22063,7 @@ +@@ -23354,7 +22331,7 @@ gt_cv_func_dgettext_libc=no fi @@ -3899,7 +4012,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi -@@ -23111,27 +22139,11 @@ +@@ -23430,27 +22407,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3932,7 +4045,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -@@ -23140,7 +22152,7 @@ +@@ -23459,7 +22420,7 @@ eval "$as_ac_var=no" fi @@ -3941,7 +4054,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` -@@ -23205,27 +22217,11 @@ +@@ -23524,27 +22485,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3974,7 +4087,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 -@@ -23234,7 +22230,7 @@ +@@ -23553,7 +22498,7 @@ ac_cv_lib_intl_bindtextdomain=no fi @@ -3983,7 +4096,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -23283,27 +22279,11 @@ +@@ -23602,27 +22547,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4016,7 +4129,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_intl_ngettext=yes else echo "$as_me: failed program was:" >&5 -@@ -23312,7 +22292,7 @@ +@@ -23631,7 +22560,7 @@ ac_cv_lib_intl_ngettext=no fi @@ -4025,7 +4138,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -23361,27 +22341,11 @@ +@@ -23680,27 +22609,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4058,7 +4171,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 -@@ -23390,7 +22354,7 @@ +@@ -23709,7 +22622,7 @@ ac_cv_lib_intl_dgettext=no fi @@ -4067,7 +4180,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -23452,27 +22416,11 @@ +@@ -23771,27 +22684,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4100,7 +4213,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_intl_ngettext=yes else echo "$as_me: failed program was:" >&5 -@@ -23481,7 +22429,7 @@ +@@ -23800,7 +22697,7 @@ ac_cv_lib_intl_ngettext=no fi @@ -4109,7 +4222,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -23530,27 +22478,11 @@ +@@ -23849,27 +22746,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4142,7 +4255,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 -@@ -23559,7 +22491,7 @@ +@@ -23878,7 +22759,7 @@ ac_cv_lib_intl_dcgettext=no fi @@ -4151,7 +4264,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -23654,27 +22586,11 @@ +@@ -23973,27 +22854,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4184,7 +4297,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -@@ -23683,7 +22599,7 @@ +@@ -24002,7 +22867,7 @@ eval "$as_ac_var=no" fi @@ -4193,7 +4306,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` -@@ -23830,27 +22746,11 @@ +@@ -24149,27 +23014,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4226,7 +4339,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -@@ -23859,7 +22759,7 @@ +@@ -24178,7 +23027,7 @@ eval "$as_ac_var=no" fi @@ -4235,7 +4348,18 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` -@@ -23920,7 +22820,7 @@ +@@ -24208,8 +23057,8 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5 +- (msgfmt -c -o /dev/null conftest.foo) 2>&5 ++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -24239,7 +23088,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -4244,7 +4368,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -24008,27 +22908,11 @@ +@@ -24327,27 +23176,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4277,7 +4401,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 CATOBJEXT=.gmo DATADIRNAME=share else -@@ -24100,27 +22984,11 @@ +@@ -24419,27 +23252,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4310,7 +4434,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_bind_textdomain_codeset=yes else echo "$as_me: failed program was:" >&5 -@@ -24129,7 +22997,7 @@ +@@ -24448,7 +23265,7 @@ ac_cv_func_bind_textdomain_codeset=no fi @@ -4319,7 +4443,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -@@ -24150,7 +23018,7 @@ +@@ -24469,7 +23286,7 @@ esac fi @@ -4328,7 +4452,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo -@@ -24458,27 +23326,10 @@ +@@ -24777,27 +23594,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4360,7 +4484,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 { echo "$as_me:$LINENO: result: none needed" >&5 echo "${ECHO_T}none needed" >&6; } else -@@ -24515,27 +23366,10 @@ +@@ -24834,27 +23634,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4392,7 +4516,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 { echo "$as_me:$LINENO: result: -posix" >&5 echo "${ECHO_T}-posix" >&6; } else -@@ -24609,7 +23443,7 @@ +@@ -24928,7 +23711,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -4401,7 +4525,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -24652,7 +23486,7 @@ +@@ -24971,7 +23754,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -4410,7 +4534,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -24921,27 +23755,11 @@ +@@ -25240,27 +24023,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4443,7 +4567,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -@@ -24959,7 +23777,7 @@ +@@ -25278,7 +24045,7 @@ echo "*** exact error that occured. This usually means GLIB is incorrectly installed." fi @@ -4452,7 +4576,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" -@@ -25063,27 +23881,11 @@ +@@ -25382,27 +24149,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4485,7 +4609,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -@@ -25092,7 +23894,7 @@ +@@ -25411,7 +24162,7 @@ eval "$as_ac_var=no" fi @@ -4494,7 +4618,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` -@@ -25147,27 +23949,10 @@ +@@ -25466,27 +24217,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4526,7 +4650,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -25203,17 +23988,10 @@ +@@ -25522,17 +24256,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4548,7 +4672,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -25319,27 +24097,10 @@ +@@ -25638,27 +24365,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4580,7 +4704,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -25375,17 +24136,10 @@ +@@ -25694,17 +24404,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4602,7 +4726,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -25491,27 +24245,10 @@ +@@ -25810,27 +24513,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4634,7 +4758,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -25547,17 +24284,10 @@ +@@ -25866,17 +24552,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4656,206 +4780,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -25671,27 +24401,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking for IE55 uuid.lib" >&5 -@@ -25770,27 +24483,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking for wntab32x.lib" >&5 -@@ -25877,27 +24573,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -26052,10 +24731,10 @@ - #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; -- const charset x; -+ const charset cs; - /* SunOS 4.1.1 cc rejects this. */ -- char const *const *ccp; -- char **p; -+ char const *const *pcpcc; -+ char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; -@@ -26064,11 +24743,11 @@ - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; -- ccp = &g + (g ? g-g : 0); -+ pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ -- ++ccp; -- p = (char**) ccp; -- ccp = (char const *const *) p; -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; -@@ -26095,7 +24774,7 @@ - const int foo = 10; - if (!foo) return 0; - } -- return !x[0] && !zero.x; -+ return !cs[0] && !zero.x; - #endif - - ; -@@ -26115,27 +24794,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes - else - echo "$as_me: failed program was:" >&5 -@@ -26193,27 +24855,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_signal=int - else - echo "$as_me: failed program was:" >&5 -@@ -26272,27 +24917,10 @@ +@@ -25982,27 +24661,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4887,7 +4812,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -26328,17 +24956,10 @@ +@@ -26038,17 +24700,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4909,159 +4834,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -26469,27 +25090,11 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -26498,7 +25103,7 @@ - eval "$as_ac_var=no" - fi - --rm -f core conftest.err conftest.$ac_objext \ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi - ac_res=`eval echo '${'$as_ac_var'}'` -@@ -26555,21 +25160,21 @@ - #include - #include - --#if !STDC_HEADERS && !HAVE_STDLIB_H -+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H - char *malloc (); - #endif - - /* This mess was copied from the GNU getpagesize.h. */ --#if !HAVE_GETPAGESIZE -+#ifndef HAVE_GETPAGESIZE - /* Assume that all systems that can run configure have sys/param.h. */ --# if !HAVE_SYS_PARAM_H -+# ifndef HAVE_SYS_PARAM_H - # define HAVE_SYS_PARAM_H 1 - # endif - - # ifdef _SC_PAGESIZE - # define getpagesize() sysconf(_SC_PAGESIZE) - # else /* no _SC_PAGESIZE */ --# if HAVE_SYS_PARAM_H -+# ifdef HAVE_SYS_PARAM_H - # include - # ifdef EXEC_PAGESIZE - # define getpagesize() EXEC_PAGESIZE -@@ -26766,27 +25371,11 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -26795,7 +25384,7 @@ - eval "$as_ac_var=no" - fi - --rm -f core conftest.err conftest.$ac_objext \ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi - ac_res=`eval echo '${'$as_ac_var'}'` -@@ -26876,27 +25465,11 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -26905,7 +25478,7 @@ - eval "$as_ac_var=no" - fi - --rm -f core conftest.err conftest.$ac_objext \ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi - ac_res=`eval echo '${'$as_ac_var'}'` -@@ -26989,27 +25562,10 @@ +@@ -26148,27 +24803,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5093,7 +4866,380 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gtk_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -27078,17 +25634,10 @@ +@@ -26233,27 +24871,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26408,10 +25029,10 @@ + #ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; +- const charset x; ++ const charset cs; + /* SunOS 4.1.1 cc rejects this. */ +- char const *const *ccp; +- char **p; ++ char const *const *pcpcc; ++ char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; +@@ -26420,11 +25041,11 @@ + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; +- ccp = &g + (g ? g-g : 0); ++ pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ +- ++ccp; +- p = (char**) ccp; +- ccp = (char const *const *) p; ++ ++pcpcc; ++ ppc = (char**) pcpcc; ++ pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; +@@ -26451,7 +25072,7 @@ + const int foo = 10; + if (!foo) return 0; + } +- return !x[0] && !zero.x; ++ return !cs[0] && !zero.x; + #endif + + ; +@@ -26471,27 +25092,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_c_const=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26549,27 +25153,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_type_signal=int + else + echo "$as_me: failed program was:" >&5 +@@ -26628,27 +25215,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26684,17 +25254,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26825,27 +25388,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -26854,7 +25401,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -26911,21 +25458,21 @@ + #include + #include + +-#if !STDC_HEADERS && !HAVE_STDLIB_H ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H + char *malloc (); + #endif + + /* This mess was copied from the GNU getpagesize.h. */ +-#if !HAVE_GETPAGESIZE ++#ifndef HAVE_GETPAGESIZE + /* Assume that all systems that can run configure have sys/param.h. */ +-# if !HAVE_SYS_PARAM_H ++# ifndef HAVE_SYS_PARAM_H + # define HAVE_SYS_PARAM_H 1 + # endif + + # ifdef _SC_PAGESIZE + # define getpagesize() sysconf(_SC_PAGESIZE) + # else /* no _SC_PAGESIZE */ +-# if HAVE_SYS_PARAM_H ++# ifdef HAVE_SYS_PARAM_H + # include + # ifdef EXEC_PAGESIZE + # define getpagesize() EXEC_PAGESIZE +@@ -27122,27 +25669,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -27151,7 +25682,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -27232,27 +25763,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -27261,7 +25776,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -27345,27 +25860,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + gtk_ok=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27434,17 +25932,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5115,7 +5261,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gdk_wchar_h=yes else echo "$as_me: failed program was:" >&5 -@@ -27131,17 +25680,10 @@ +@@ -27487,17 +25978,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5137,7 +5283,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gdk_wctype_h=yes else echo "$as_me: failed program was:" >&5 -@@ -27226,27 +25768,11 @@ +@@ -27582,27 +26066,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5170,7 +5316,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_iswalnum=yes else echo "$as_me: failed program was:" >&5 -@@ -27255,7 +25781,7 @@ +@@ -27611,7 +26079,7 @@ ac_cv_func_iswalnum=no fi @@ -5179,7 +5325,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 -@@ -27305,27 +25831,11 @@ +@@ -27661,27 +26129,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5212,7 +5358,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_w_iswalnum=yes else echo "$as_me: failed program was:" >&5 -@@ -27334,7 +25844,7 @@ +@@ -27690,7 +26142,7 @@ ac_cv_lib_w_iswalnum=no fi @@ -5221,7 +5367,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -27393,27 +25903,11 @@ +@@ -27749,27 +26201,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5254,7 +5400,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gdk_working_wctype=yes else echo "$as_me: failed program was:" >&5 -@@ -27422,7 +25916,7 @@ +@@ -27778,7 +26214,7 @@ gdk_working_wctype=no fi @@ -5263,7 +5409,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS="$oLIBS" -@@ -27461,17 +25955,10 @@ +@@ -27817,17 +26253,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5285,7 +5431,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 gtk_uxtheme_h=yes else echo "$as_me: failed program was:" >&5 -@@ -27532,27 +26019,10 @@ +@@ -27887,27 +26316,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5317,7 +5463,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -27588,17 +26058,10 @@ +@@ -27943,17 +26355,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5339,7 +5485,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -27729,27 +26192,11 @@ +@@ -28084,27 +26489,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5372,7 +5518,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -@@ -27758,7 +26205,7 @@ +@@ -28113,7 +26502,7 @@ eval "$as_ac_var=no" fi @@ -5381,7 +5527,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` -@@ -27905,27 +26352,11 @@ +@@ -28261,27 +26650,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5411,11 +5557,11 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - ac_cv_lib_tiff_TIFFReadScanline=yes + ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes else echo "$as_me: failed program was:" >&5 -@@ -27934,7 +26365,7 @@ - ac_cv_lib_tiff_TIFFReadScanline=no +@@ -28290,7 +26663,7 @@ + ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no fi -rm -f core conftest.err conftest.$ac_objext \ @@ -5423,7 +5569,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -27975,27 +26406,10 @@ +@@ -28331,27 +26704,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5455,7 +5601,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -28031,17 +26445,10 @@ +@@ -28387,17 +26743,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5477,7 +5623,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -28146,27 +26553,11 @@ +@@ -28502,27 +26851,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5510,7 +5656,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_tiff_TIFFWriteScanline=yes else echo "$as_me: failed program was:" >&5 -@@ -28175,7 +26566,7 @@ +@@ -28531,7 +26864,7 @@ ac_cv_lib_tiff_TIFFWriteScanline=no fi @@ -5519,7 +5665,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -28216,27 +26607,10 @@ +@@ -28572,27 +26905,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5551,7 +5697,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -28272,17 +26646,10 @@ +@@ -28628,17 +26944,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5573,7 +5719,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -28387,27 +26754,11 @@ +@@ -28743,27 +27052,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5606,7 +5752,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_tiff34_TIFFFlushData=yes else echo "$as_me: failed program was:" >&5 -@@ -28416,7 +26767,7 @@ +@@ -28772,7 +27065,7 @@ ac_cv_lib_tiff34_TIFFFlushData=no fi @@ -5615,7 +5761,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -28457,27 +26808,10 @@ +@@ -28813,27 +27106,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5647,7 +5793,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -28513,17 +26847,10 @@ +@@ -28869,17 +27145,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5669,7 +5815,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -28651,27 +26978,11 @@ +@@ -29007,27 +27276,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5702,7 +5848,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_jpeg_jpeg_destroy_decompress=yes else echo "$as_me: failed program was:" >&5 -@@ -28680,7 +26991,7 @@ +@@ -29036,7 +27289,7 @@ ac_cv_lib_jpeg_jpeg_destroy_decompress=no fi @@ -5711,7 +5857,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -28721,17 +27032,10 @@ +@@ -29077,17 +27330,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5733,7 +5879,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 jpeg_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -28787,27 +27091,11 @@ +@@ -29143,27 +27389,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5766,7 +5912,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_jpeg_jpeg_simple_progression=yes else echo "$as_me: failed program was:" >&5 -@@ -28816,7 +27104,7 @@ +@@ -29172,7 +27402,7 @@ ac_cv_lib_jpeg_jpeg_simple_progression=no fi @@ -5775,7 +5921,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -28905,27 +27193,11 @@ +@@ -29261,27 +27491,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5808,7 +5954,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_png_png_read_info=yes else echo "$as_me: failed program was:" >&5 -@@ -28934,7 +27206,7 @@ +@@ -29290,7 +27504,7 @@ ac_cv_lib_png_png_read_info=no fi @@ -5817,7 +5963,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -28975,27 +27247,10 @@ +@@ -29331,27 +27545,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5849,7 +5995,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -29031,17 +27286,10 @@ +@@ -29387,17 +27584,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5871,7 +6017,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -29138,27 +27386,10 @@ +@@ -29494,27 +27684,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5903,7 +6049,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 png_ok=yes else echo "$as_me: failed program was:" >&5 -@@ -29309,27 +27540,10 @@ +@@ -29807,27 +27980,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5935,7 +6081,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 -@@ -29386,27 +27600,10 @@ +@@ -29884,27 +28040,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5967,7 +6113,199 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_type_signal=int else echo "$as_me: failed program was:" >&5 -@@ -29569,7 +27766,7 @@ +@@ -30007,27 +28146,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30063,17 +28185,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30169,27 +28284,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30225,17 +28323,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30345,27 +28436,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_ImageSetStruct=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30374,7 +28449,7 @@ + ac_cv_lib_mlib_mlib_ImageSetStruct=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -30439,27 +28514,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes + else + echo "$as_me: failed program was:" >&5 +@@ -30468,7 +28527,7 @@ + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -30605,7 +28664,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -5976,7 +6314,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -29610,7 +27807,7 @@ +@@ -30646,7 +28705,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -5985,7 +6323,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -29840,17 +28037,10 @@ +@@ -30869,17 +28928,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6007,7 +6345,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # We can compile using X headers with no special include directory. ac_x_includes= else -@@ -29873,7 +28063,7 @@ +@@ -30902,7 +28954,7 @@ # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS @@ -6016,7 +6354,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29902,27 +28092,11 @@ +@@ -30931,27 +28983,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6049,7 +6387,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -@@ -29935,7 +28109,7 @@ +@@ -30964,7 +29000,7 @@ do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do @@ -6058,7 +6396,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_x_libraries=$ac_dir break 2 fi -@@ -29943,7 +28117,7 @@ +@@ -30972,7 +29008,7 @@ done fi @@ -6067,7 +6405,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -@@ -29998,12 +28172,12 @@ +@@ -31027,12 +29063,12 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . @@ -6085,7 +6423,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -30031,44 +28205,20 @@ +@@ -31060,44 +29096,20 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6139,7 +6477,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -30096,48 +28246,30 @@ +@@ -31125,48 +29137,30 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6205,7 +6543,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 fi # Check for system-dependent libraries X programs must link with. -@@ -30186,27 +28318,11 @@ +@@ -31215,27 +29209,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6238,7 +6576,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -30254,27 +28370,11 @@ +@@ -31283,27 +29261,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6271,7 +6609,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 -@@ -30283,7 +28383,7 @@ +@@ -31312,7 +29274,7 @@ ac_cv_lib_dnet_dnet_ntoa=no fi @@ -6280,7 +6618,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -30336,27 +28436,11 @@ +@@ -31365,27 +29327,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6313,7 +6651,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 -@@ -30365,7 +28449,7 @@ +@@ -31394,7 +29340,7 @@ ac_cv_lib_dnet_stub_dnet_ntoa=no fi @@ -6322,7 +6660,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -30378,7 +28462,7 @@ +@@ -31407,7 +29353,7 @@ fi fi @@ -6331,7 +6669,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" -@@ -30453,27 +28537,11 @@ +@@ -31482,27 +29428,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6364,7 +6702,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -@@ -30482,7 +28550,7 @@ +@@ -31511,7 +29441,7 @@ ac_cv_func_gethostbyname=no fi @@ -6373,7 +6711,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -@@ -30531,27 +28599,11 @@ +@@ -31560,27 +29490,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6406,7 +6744,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -@@ -30560,7 +28612,7 @@ +@@ -31589,7 +29503,7 @@ ac_cv_lib_nsl_gethostbyname=no fi @@ -6415,7 +6753,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -30613,27 +28665,11 @@ +@@ -31642,27 +29556,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6448,7 +6786,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -@@ -30642,7 +28678,7 @@ +@@ -31671,7 +29569,7 @@ ac_cv_lib_bsd_gethostbyname=no fi @@ -6457,7 +6795,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -30725,27 +28761,11 @@ +@@ -31754,27 +29652,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6490,7 +6828,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 -@@ -30754,7 +28774,7 @@ +@@ -31783,7 +29665,7 @@ ac_cv_func_connect=no fi @@ -6499,7 +6837,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -@@ -30803,27 +28823,11 @@ +@@ -31832,27 +29714,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6532,7 +6870,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 -@@ -30832,7 +28836,7 @@ +@@ -31861,7 +29727,7 @@ ac_cv_lib_socket_connect=no fi @@ -6541,7 +6879,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -30908,27 +28912,11 @@ +@@ -31937,27 +29803,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6574,7 +6912,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 -@@ -30937,7 +28925,7 @@ +@@ -31966,7 +29816,7 @@ ac_cv_func_remove=no fi @@ -6583,7 +6921,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -@@ -30986,27 +28974,11 @@ +@@ -32015,27 +29865,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6616,7 +6954,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 -@@ -31015,7 +28987,7 @@ +@@ -32044,7 +29878,7 @@ ac_cv_lib_posix_remove=no fi @@ -6625,7 +6963,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -31091,27 +29063,11 @@ +@@ -32120,27 +29954,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6658,7 +6996,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 -@@ -31120,7 +29076,7 @@ +@@ -32149,7 +29967,7 @@ ac_cv_func_shmat=no fi @@ -6667,29 +7005,10 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -@@ -31150,46 +29106,30 @@ - char shmat (); - int - main () --{ --return shmat (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -32198,27 +30016,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in @@ -6703,26 +7022,13 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in -+{ -+return shmat (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac - eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || @@ -6732,7 +7038,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 -@@ -31198,7 +29138,7 @@ +@@ -32227,7 +30029,7 @@ ac_cv_lib_ipc_shmat=no fi @@ -6741,7 +7047,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -31262,27 +29202,11 @@ +@@ -32291,27 +30093,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6774,7 +7080,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 -@@ -31291,7 +29215,7 @@ +@@ -32320,7 +30106,7 @@ ac_cv_lib_ICE_IceConnectionNumber=no fi @@ -6783,7 +7089,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -31394,27 +29318,11 @@ +@@ -32423,27 +30209,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6816,7 +7122,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 -@@ -31423,7 +29331,7 @@ +@@ -32452,7 +30222,7 @@ ac_cv_func_XOpenDisplay=no fi @@ -6825,7 +7131,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 -@@ -31499,27 +29407,11 @@ +@@ -32528,27 +30298,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6858,7 +7164,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XextFindDisplay=yes else echo "$as_me: failed program was:" >&5 -@@ -31528,7 +29420,7 @@ +@@ -32557,7 +30311,7 @@ ac_cv_func_XextFindDisplay=no fi @@ -6867,7 +7173,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 -@@ -31604,27 +29496,11 @@ +@@ -32633,27 +30387,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6900,7 +7206,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XRenderQueryExtension=yes else echo "$as_me: failed program was:" >&5 -@@ -31633,7 +29509,7 @@ +@@ -32662,7 +30400,7 @@ ac_cv_func_XRenderQueryExtension=no fi @@ -6909,10 +7215,22 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 -@@ -31679,27 +29555,10 @@ - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -32696,39 +30434,22 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in @@ -6926,13 +7244,19 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || @@ -6941,7 +7265,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } else -@@ -31735,27 +29594,10 @@ +@@ -32764,27 +30485,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -6973,7 +7297,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } -@@ -31849,27 +29691,11 @@ +@@ -32878,27 +30582,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7006,7 +7330,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -@@ -31878,7 +29704,7 @@ +@@ -32907,7 +30595,7 @@ eval "$as_ac_var=no" fi @@ -7015,7 +7339,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` -@@ -31962,27 +29788,11 @@ +@@ -32991,27 +30679,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7048,7 +7372,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XAddConnectionWatch=yes else echo "$as_me: failed program was:" >&5 -@@ -31991,7 +29801,7 @@ +@@ -33020,7 +30692,7 @@ ac_cv_func_XAddConnectionWatch=no fi @@ -7057,7 +7381,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 -@@ -32092,27 +29902,11 @@ +@@ -33121,27 +30793,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7090,7 +7414,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XkbQueryExtension=yes else echo "$as_me: failed program was:" >&5 -@@ -32121,7 +29915,7 @@ +@@ -33150,7 +30806,7 @@ ac_cv_func_XkbQueryExtension=no fi @@ -7099,7 +7423,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 -@@ -32203,27 +29997,11 @@ +@@ -33232,27 +30888,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7132,7 +7456,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XShapeCombineMask=yes else echo "$as_me: failed program was:" >&5 -@@ -32232,7 +30010,7 @@ +@@ -33261,7 +30901,7 @@ ac_cv_func_XShapeCombineMask=no fi @@ -7141,7 +7465,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 -@@ -32312,27 +30090,11 @@ +@@ -33341,27 +30981,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7174,7 +7498,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XSyncQueryExtension=yes else echo "$as_me: failed program was:" >&5 -@@ -32341,7 +30103,7 @@ +@@ -33370,7 +30994,7 @@ ac_cv_func_XSyncQueryExtension=no fi @@ -7183,7 +7507,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 -@@ -32375,27 +30137,10 @@ +@@ -33404,27 +31028,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7215,7 +7539,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_header_X11_extensions_sync_h=yes else echo "$as_me: failed program was:" >&5 -@@ -32491,27 +30236,11 @@ +@@ -33520,27 +31127,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7248,7 +7572,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XShmAttach=yes else echo "$as_me: failed program was:" >&5 -@@ -32520,7 +30249,7 @@ +@@ -33549,7 +31140,7 @@ ac_cv_func_XShmAttach=no fi @@ -7257,7 +7581,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 -@@ -32571,27 +30300,11 @@ +@@ -33600,27 +31191,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7290,7 +7614,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_XextSam_XShmAttach=yes else echo "$as_me: failed program was:" >&5 -@@ -32600,7 +30313,7 @@ +@@ -33629,7 +31204,7 @@ ac_cv_lib_XextSam_XShmAttach=no fi @@ -7299,7 +7623,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -32654,27 +30367,10 @@ +@@ -33683,27 +31258,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7331,7 +7655,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -32710,17 +30406,10 @@ +@@ -33739,17 +31297,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7353,7 +7677,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -32818,27 +30507,10 @@ +@@ -33847,27 +31398,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7385,7 +7709,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -32874,17 +30546,10 @@ +@@ -33903,17 +31437,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7407,7 +7731,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -32994,27 +30659,10 @@ +@@ -34023,27 +31550,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7439,7 +7763,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 have_xshm=yes else echo "$as_me: failed program was:" >&5 -@@ -33111,27 +30759,11 @@ +@@ -34140,27 +31650,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7472,7 +7796,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_func_XineramaGetInfo=yes else echo "$as_me: failed program was:" >&5 -@@ -33140,7 +30772,7 @@ +@@ -34169,7 +31663,7 @@ ac_cv_func_XineramaGetInfo=no fi @@ -7481,7 +7805,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 -@@ -33174,27 +30806,10 @@ +@@ -34203,27 +31697,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7513,7 +7837,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_header_X11_extensions_xinerama_h=yes else echo "$as_me: failed program was:" >&5 -@@ -33285,27 +30900,11 @@ +@@ -34314,27 +31791,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7546,7 +7870,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_Xinerama_XineramaQueryExtension=yes else echo "$as_me: failed program was:" >&5 -@@ -33314,7 +30913,7 @@ +@@ -34343,7 +31804,7 @@ ac_cv_lib_Xinerama_XineramaQueryExtension=no fi @@ -7555,7 +7879,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -33349,27 +30948,10 @@ +@@ -34378,27 +31839,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7587,7 +7911,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_header_X11_extensions_Xinerama_h=yes else echo "$as_me: failed program was:" >&5 -@@ -33500,27 +31082,11 @@ +@@ -34530,27 +31974,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7620,7 +7944,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes else echo "$as_me: failed program was:" >&5 -@@ -33529,7 +31095,7 @@ +@@ -34559,7 +31987,7 @@ ac_cv_lib_Xrandr_XRRUpdateConfiguration=no fi @@ -7629,7 +7953,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -@@ -33564,27 +31130,10 @@ +@@ -34594,27 +32022,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7661,7 +7985,28 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_header_X11_extensions_Xrandr_h=yes else echo "$as_me: failed program was:" >&5 -@@ -33957,27 +31506,11 @@ +@@ -34827,8 +32238,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; } +- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" +- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" ++ # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before ++ # cairo's if both are available (cairo is required by pango); this is ++ # enough to build gdk/ ++ GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES" ++ # you'd think this isn't needed, but as soon as cairo-directfb or ++ # directfb requires a "rpath" and you want to build binaries (for ++ # example gtk-query-immodules), you need the CFLAGS and LDFLAGS ++ # everywhere; this trick abuses the fact that GTK_DEP_LIBS and ++ # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the ++ # necessary rpath flags ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS" + else + { { echo "$as_me:$LINENO: error: + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend +@@ -34937,27 +32358,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7694,7 +8039,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -33992,7 +31525,7 @@ +@@ -34972,7 +32377,7 @@ { (exit 1); exit 1; }; } fi @@ -7703,7 +8048,16 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" fi -@@ -34088,27 +31621,11 @@ +@@ -34980,7 +32385,7 @@ + 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_PACKAGES" + fi +@@ -35068,27 +32473,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7736,7 +8090,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 : else echo "$as_me: failed program was:" >&5 -@@ -34123,7 +31640,7 @@ +@@ -35103,7 +32492,7 @@ { (exit 1); exit 1; }; } fi @@ -7745,7 +8099,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" fi -@@ -34170,7 +31687,7 @@ +@@ -35169,7 +32558,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -7754,7 +8108,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -34262,27 +31779,10 @@ +@@ -35247,27 +32636,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7786,7 +8140,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -34318,17 +31818,10 @@ +@@ -35303,17 +32675,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7808,7 +8162,81 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -34431,27 +31924,10 @@ +@@ -35418,27 +32783,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_HTTP_AUTHSTRING +@@ -35525,27 +32873,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -35554,7 +32886,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -35607,27 +32939,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7840,7 +8268,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -@@ -34487,17 +31963,10 @@ +@@ -35663,17 +32978,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -7862,16 +8290,168 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -@@ -34637,7 +32106,7 @@ +@@ -35776,27 +33084,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -35832,17 +33123,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -35980,38 +33264,19 @@ + fi + + ++ have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.6\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.6") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- : +-else +- { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&5 +-echo "$as_me: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&2;} +- { (exit 1); exit 1; }; } +-fi +- fi +- +- { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 +-echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +-echo "${ECHO_T}$enable_gtk_doc" >&6; } +- +- for ac_prog in gtkdoc-check +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $GTKDOC_CHECK in ++ case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -36020,8 +33285,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -34722,7 +32191,7 @@ + fi +@@ -36029,22 +33294,43 @@ + done + IFS=$as_save_IFS + ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; + esac + fi +-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +-if test -n "$GTKDOC_CHECK"; then +- { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +-echo "${ECHO_T}$GTKDOC_CHECK" >&6; } ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + + +- test -n "$GTKDOC_CHECK" && break +-done ++ fi ++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ++ have_gtk_doc=yes ++ fi ++ ++ gtk_doc_min_version=1.6 ++ if test "$have_gtk_doc" = yes; then ++ { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 ++echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; } ++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ have_gtk_doc=no ++ fi ++ fi + ++ if test "$have_gtk_doc" != yes; then ++ enable_gtk_doc=no ++ fi ++ fi + + + +@@ -36084,7 +33370,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -7880,7 +8460,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_prog_DB2HTML="true" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -34782,7 +32251,7 @@ +@@ -36144,7 +33430,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -7889,7 +8469,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -34851,7 +32320,7 @@ +@@ -36213,7 +33499,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -7898,7 +8478,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -35052,6 +32521,13 @@ +@@ -36414,6 +33700,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -7912,7 +8492,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 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 -@@ -35342,7 +32818,8 @@ +@@ -36788,7 +34081,8 @@ ## M4sh Initialization. ## ## --------------------- ## @@ -7922,7 +8502,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: -@@ -35351,10 +32828,13 @@ +@@ -36797,10 +34091,13 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -7939,7 +8519,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # PATH needs CR -@@ -35578,19 +33058,28 @@ +@@ -37024,19 +34321,28 @@ as_mkdir_p=false fi @@ -7979,16 +8559,16 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -35606,7 +33095,7 @@ +@@ -37052,7 +34358,7 @@ # values after options handling. ac_log=" - This file was extended by gtk+ $as_me 2.10.14, which was + This file was extended by gtk+ $as_me 2.12.0, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -35635,7 +33124,7 @@ +@@ -37081,7 +34387,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit @@ -7997,66 +8577,86 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/configure gtk+-2.10.14 -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions -@@ -35659,7 +33148,7 @@ +@@ -37105,7 +34411,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ - gtk+ config.status 2.10.14 + gtk+ config.status 2.12.0 -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. -@@ -36029,9 +33518,9 @@ +@@ -37471,9 +34777,9 @@ CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim +ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim - GREP!$GREP$ac_delim --EGREP!$EGREP$ac_delim --LN_S!$LN_S$ac_delim + CXX!$CXX$ac_delim +-CXXFLAGS!$CXXFLAGS$ac_delim +-ac_ct_CXX!$ac_ct_CXX$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -36073,6 +33562,8 @@ +@@ -37515,6 +34821,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -+EGREP!$EGREP$ac_delim -+LN_S!$LN_S$ac_delim - ECHO!$ECHO$ac_delim - AR!$AR$ac_delim - RANLIB!$RANLIB$ac_delim -@@ -36168,8 +33659,6 @@ - CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim - GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim - GTK_UPDATE_ICON_CACHE!$GTK_UPDATE_ICON_CACHE$ac_delim --REBUILD_PNGS!$REBUILD_PNGS$ac_delim --GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim + CXXDEPMODE!$CXXDEPMODE$ac_delim + am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim + am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +@@ -37610,8 +34918,6 @@ + INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim + INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim + INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim +-INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim +-INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -36211,6 +33700,8 @@ +@@ -37653,6 +34959,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -+REBUILD_PNGS!$REBUILD_PNGS$ac_delim -+GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim - GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim - GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim - GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim -@@ -36278,7 +33769,7 @@ ++INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim ++INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim + INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim + INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim + INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim +@@ -37736,7 +35044,6 @@ + TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim + TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim + HTML_DIR!$HTML_DIR$ac_delim +-GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim + ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim + ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim + GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim +@@ -37749,7 +35056,6 @@ + XMLCATALOG!$XMLCATALOG$ac_delim + ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim + ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -37791,10 +35097,11 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+-2.10.14/contrib/gdk-pixbuf-xlib/Makefile.in ---- gtk+-2.10.14.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-17 12:50:07.000000000 +0330 +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+-2.12.0/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+-2.12.0.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-09-14 03:10:46.000000000 +0330 ++++ gtk+-2.12.0/contrib/gdk-pixbuf-xlib/Makefile.in 2007-09-16 18:43:07.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8066,9 +8666,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/contrib/gdk-pixbuf-xli EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/contrib/Makefile.in gtk+-2.10.14/contrib/Makefile.in ---- gtk+-2.10.14.orig/contrib/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/contrib/Makefile.in 2007-07-17 12:50:07.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/contrib/Makefile.in gtk+-2.12.0/contrib/Makefile.in +--- gtk+-2.12.0.orig/contrib/Makefile.in 2007-09-14 03:10:46.000000000 +0330 ++++ gtk+-2.12.0/contrib/Makefile.in 2007-09-16 18:43:07.000000000 +0330 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8078,9 +8686,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/contrib/Makefile.in gt EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/demos/gtk-demo/Makefile.in gtk+-2.10.14/demos/gtk-demo/Makefile.in ---- gtk+-2.10.14.orig/demos/gtk-demo/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/demos/gtk-demo/Makefile.in 2007-07-17 12:50:07.000000000 +0330 +@@ -124,7 +126,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/demos/gtk-demo/Makefile.in gtk+-2.12.0/demos/gtk-demo/Makefile.in +--- gtk+-2.12.0.orig/demos/gtk-demo/Makefile.in 2007-09-14 03:10:46.000000000 +0330 ++++ gtk+-2.12.0/demos/gtk-demo/Makefile.in 2007-09-16 18:43:07.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8090,9 +8706,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/demos/gtk-demo/Makefil EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/demos/Makefile.in gtk+-2.10.14/demos/Makefile.in ---- gtk+-2.10.14.orig/demos/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/demos/Makefile.in 2007-07-17 12:50:07.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/demos/Makefile.in gtk+-2.12.0/demos/Makefile.in +--- gtk+-2.12.0.orig/demos/Makefile.in 2007-09-14 03:10:46.000000000 +0330 ++++ gtk+-2.12.0/demos/Makefile.in 2007-09-16 18:43:07.000000000 +0330 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8102,9 +8726,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/demos/Makefile.in gtk+ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/faq/Makefile.in gtk+-2.10.14/docs/faq/Makefile.in ---- gtk+-2.10.14.orig/docs/faq/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/docs/faq/Makefile.in 2007-07-17 12:50:07.000000000 +0330 +@@ -124,7 +126,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/faq/Makefile.in gtk+-2.12.0/docs/faq/Makefile.in +--- gtk+-2.12.0.orig/docs/faq/Makefile.in 2007-09-14 03:10:47.000000000 +0330 ++++ gtk+-2.12.0/docs/faq/Makefile.in 2007-09-16 18:43:08.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8114,9 +8746,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/faq/Makefile.in g EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/Makefile.in gtk+-2.10.14/docs/Makefile.in ---- gtk+-2.10.14.orig/docs/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/docs/Makefile.in 2007-07-17 12:50:07.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/Makefile.in gtk+-2.12.0/docs/Makefile.in +--- gtk+-2.12.0.orig/docs/Makefile.in 2007-09-14 03:10:47.000000000 +0330 ++++ gtk+-2.12.0/docs/Makefile.in 2007-09-16 18:43:08.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8126,9 +8766,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/Makefile.in gtk+- EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/gdk/Makefile.in gtk+-2.10.14/docs/reference/gdk/Makefile.in ---- gtk+-2.10.14.orig/docs/reference/gdk/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/docs/reference/gdk/Makefile.in 2007-07-17 12:50:08.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/gdk/Makefile.in gtk+-2.12.0/docs/reference/gdk/Makefile.in +--- gtk+-2.12.0.orig/docs/reference/gdk/Makefile.in 2007-09-14 03:28:39.000000000 +0330 ++++ gtk+-2.12.0/docs/reference/gdk/Makefile.in 2007-09-16 18:43:08.000000000 +0330 @@ -95,6 +95,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8138,9 +8786,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/gdk/Mak EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+-2.10.14/docs/reference/gdk-pixbuf/Makefile.in ---- gtk+-2.10.14.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/docs/reference/gdk-pixbuf/Makefile.in 2007-07-17 12:50:08.000000000 +0330 +@@ -129,7 +131,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+-2.12.0/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+-2.12.0.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-09-14 03:24:52.000000000 +0330 ++++ gtk+-2.12.0/docs/reference/gdk-pixbuf/Makefile.in 2007-09-16 18:43:08.000000000 +0330 @@ -95,6 +95,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8150,9 +8806,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/gdk-pix EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/gtk/Makefile.in gtk+-2.10.14/docs/reference/gtk/Makefile.in ---- gtk+-2.10.14.orig/docs/reference/gtk/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/docs/reference/gtk/Makefile.in 2007-07-17 12:50:08.000000000 +0330 +@@ -129,7 +131,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/gtk/Makefile.in gtk+-2.12.0/docs/reference/gtk/Makefile.in +--- gtk+-2.12.0.orig/docs/reference/gtk/Makefile.in 2007-09-14 03:29:06.000000000 +0330 ++++ gtk+-2.12.0/docs/reference/gtk/Makefile.in 2007-09-16 18:43:08.000000000 +0330 @@ -95,6 +95,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8162,9 +8826,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/gtk/Mak EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/Makefile.in gtk+-2.10.14/docs/reference/Makefile.in ---- gtk+-2.10.14.orig/docs/reference/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/docs/reference/Makefile.in 2007-07-17 12:50:08.000000000 +0330 +@@ -129,7 +131,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/Makefile.in gtk+-2.12.0/docs/reference/Makefile.in +--- gtk+-2.12.0.orig/docs/reference/Makefile.in 2007-09-14 03:10:47.000000000 +0330 ++++ gtk+-2.12.0/docs/reference/Makefile.in 2007-09-16 18:43:08.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8174,9 +8846,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/reference/Makefil EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/tools/Makefile.in gtk+-2.10.14/docs/tools/Makefile.in ---- gtk+-2.10.14.orig/docs/tools/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/docs/tools/Makefile.in 2007-07-17 12:50:08.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/tools/Makefile.in gtk+-2.12.0/docs/tools/Makefile.in +--- gtk+-2.12.0.orig/docs/tools/Makefile.in 2007-09-14 03:10:47.000000000 +0330 ++++ gtk+-2.12.0/docs/tools/Makefile.in 2007-09-16 18:43:08.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8186,9 +8866,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/tools/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/tutorial/Makefile.in gtk+-2.10.14/docs/tutorial/Makefile.in ---- gtk+-2.10.14.orig/docs/tutorial/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/docs/tutorial/Makefile.in 2007-07-17 12:50:08.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/tutorial/Makefile.in gtk+-2.12.0/docs/tutorial/Makefile.in +--- gtk+-2.12.0.orig/docs/tutorial/Makefile.in 2007-09-14 03:10:47.000000000 +0330 ++++ gtk+-2.12.0/docs/tutorial/Makefile.in 2007-09-16 18:43:09.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8198,9 +8886,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/docs/tutorial/Makefile EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/directfb/Makefile.in gtk+-2.10.14/gdk/directfb/Makefile.in ---- gtk+-2.10.14.orig/gdk/directfb/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gdk/directfb/Makefile.in 2007-07-17 12:50:09.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/directfb/Makefile.in gtk+-2.12.0/gdk/directfb/Makefile.in +--- gtk+-2.12.0.orig/gdk/directfb/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk/directfb/Makefile.in 2007-09-16 18:43:10.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8210,10 +8906,18 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/directfb/Makefile. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/linux-fb/Makefile.in gtk+-2.10.14/gdk/linux-fb/Makefile.in ---- gtk+-2.10.14.orig/gdk/linux-fb/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gdk/linux-fb/Makefile.in 2007-07-17 12:50:10.000000000 +0330 -@@ -90,6 +90,8 @@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/Makefile.in gtk+-2.12.0/gdk/Makefile.in +--- gtk+-2.12.0.orig/gdk/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk/Makefile.in 2007-09-16 18:43:09.000000000 +0330 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -8222,9 +8926,77 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/linux-fb/Makefile. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/Makefile.in gtk+-2.10.14/gdk/Makefile.in ---- gtk+-2.10.14.orig/gdk/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gdk/Makefile.in 2007-07-17 12:50:09.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/quartz/Makefile.in gtk+-2.12.0/gdk/quartz/Makefile.in +--- gtk+-2.12.0.orig/gdk/quartz/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk/quartz/Makefile.in 2007-09-16 18:43:10.000000000 +0330 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/win32/Makefile.in gtk+-2.12.0/gdk/win32/Makefile.in +--- gtk+-2.12.0.orig/gdk/win32/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk/win32/Makefile.in 2007-09-16 18:43:10.000000000 +0330 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/win32/rc/Makefile.in gtk+-2.12.0/gdk/win32/rc/Makefile.in +--- gtk+-2.12.0.orig/gdk/win32/rc/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk/win32/rc/Makefile.in 2007-09-16 18:43:10.000000000 +0330 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/x11/Makefile.in gtk+-2.12.0/gdk/x11/Makefile.in +--- gtk+-2.12.0.orig/gdk/x11/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk/x11/Makefile.in 2007-09-16 18:43:10.000000000 +0330 @@ -91,6 +91,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8234,9 +9006,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/Makefile.in gtk+-2 EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/quartz/Makefile.in gtk+-2.10.14/gdk/quartz/Makefile.in ---- gtk+-2.10.14.orig/gdk/quartz/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gdk/quartz/Makefile.in 2007-07-17 12:50:10.000000000 +0330 +@@ -125,7 +127,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk-pixbuf/Makefile.in gtk+-2.12.0/gdk-pixbuf/Makefile.in +--- gtk+-2.12.0.orig/gdk-pixbuf/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk-pixbuf/Makefile.in 2007-09-16 18:43:09.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8246,9 +9026,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/quartz/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/win32/Makefile.in gtk+-2.10.14/gdk/win32/Makefile.in ---- gtk+-2.10.14.orig/gdk/win32/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gdk/win32/Makefile.in 2007-07-17 12:50:10.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk-pixbuf/pixops/Makefile.in gtk+-2.12.0/gdk-pixbuf/pixops/Makefile.in +--- gtk+-2.12.0.orig/gdk-pixbuf/pixops/Makefile.in 2007-09-14 03:10:48.000000000 +0330 ++++ gtk+-2.12.0/gdk-pixbuf/pixops/Makefile.in 2007-09-16 18:43:09.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8258,10 +9046,18 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/win32/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/win32/rc/Makefile.in gtk+-2.10.14/gdk/win32/rc/Makefile.in ---- gtk+-2.10.14.orig/gdk/win32/rc/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gdk/win32/rc/Makefile.in 2007-07-17 12:50:10.000000000 +0330 -@@ -89,6 +89,8 @@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gtk/Makefile.in gtk+-2.12.0/gtk/Makefile.in +--- gtk+-2.12.0.orig/gtk/Makefile.in 2007-09-14 03:10:49.000000000 +0330 ++++ gtk+-2.12.0/gtk/Makefile.in 2007-09-16 18:43:11.000000000 +0330 +@@ -113,6 +113,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -8270,55 +9066,15 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/win32/rc/Makefile. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk/x11/Makefile.in gtk+-2.10.14/gdk/x11/Makefile.in ---- gtk+-2.10.14.orig/gdk/x11/Makefile.in 2007-07-17 12:49:40.000000000 +0330 -+++ gtk+-2.10.14/gdk/x11/Makefile.in 2007-07-17 12:50:10.000000000 +0330 -@@ -91,6 +91,8 @@ - ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ - ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ - ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ -+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk-pixbuf/Makefile.in gtk+-2.10.14/gdk-pixbuf/Makefile.in ---- gtk+-2.10.14.orig/gdk-pixbuf/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/gdk-pixbuf/Makefile.in 2007-07-17 12:50:09.000000000 +0330 -@@ -89,6 +89,8 @@ - ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ - ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ - ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ -+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gdk-pixbuf/pixops/Makefile.in gtk+-2.10.14/gdk-pixbuf/pixops/Makefile.in ---- gtk+-2.10.14.orig/gdk-pixbuf/pixops/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/gdk-pixbuf/pixops/Makefile.in 2007-07-17 12:50:09.000000000 +0330 -@@ -89,6 +89,8 @@ - ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ - ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ - ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ -+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/Makefile.in gtk+-2.10.14/gtk/Makefile.in ---- gtk+-2.10.14.orig/gtk/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gtk/Makefile.in 2007-07-17 12:50:11.000000000 +0330 -@@ -110,6 +110,8 @@ - ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ - ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ - ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ -+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -342,6 +344,8 @@ +@@ -147,7 +149,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -378,6 +379,8 @@ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ @@ -8327,7 +9083,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/Makefile.in gtk+-2 -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(GTK_DEBUG_FLAGS) \ -@@ -591,7 +595,10 @@ +@@ -633,13 +636,16 @@ # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ gtktextlayout.h \ @@ -8335,11 +9091,19 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/Makefile.in gtk+-2 + gtkfilesystem.h \ + gtkfilesystemmodel.h \ + gtkfilechooserprivate.h \ -+ gtkfilechooserutils.h ++ gtkfilechooserutils.h \ ++ gtkquery.h \ ++ gtksearchengine.h # GTK+ header files that don't get installed -@@ -601,10 +608,7 @@ + gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ + gtksearchenginebeagle.h \ + gtksearchenginetracker.h\ + gtksearchenginesimple.h \ +@@ -649,10 +655,7 @@ gtkfilechooserdefault.h \ gtkfilechooserembed.h \ gtkfilechooserentry.h \ @@ -8350,9 +9114,9 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/Makefile.in gtk+-2 gtkfilesystemunix.h \ gtkhsv.h \ gtkiconcache.h \ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/theme-bits/Makefile.in gtk+-2.10.14/gtk/theme-bits/Makefile.in ---- gtk+-2.10.14.orig/gtk/theme-bits/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gtk/theme-bits/Makefile.in 2007-07-17 12:50:11.000000000 +0330 +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gtk/theme-bits/Makefile.in gtk+-2.12.0/gtk/theme-bits/Makefile.in +--- gtk+-2.12.0.orig/gtk/theme-bits/Makefile.in 2007-09-14 03:10:49.000000000 +0330 ++++ gtk+-2.12.0/gtk/theme-bits/Makefile.in 2007-09-16 18:43:11.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8362,9 +9126,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/theme-bits/Makefil EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/xdgmime/Makefile.in gtk+-2.10.14/gtk/xdgmime/Makefile.in ---- gtk+-2.10.14.orig/gtk/xdgmime/Makefile.in 2007-07-17 12:49:41.000000000 +0330 -+++ gtk+-2.10.14/gtk/xdgmime/Makefile.in 2007-07-17 12:50:11.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gtk/xdgmime/Makefile.in gtk+-2.12.0/gtk/xdgmime/Makefile.in +--- gtk+-2.12.0.orig/gtk/xdgmime/Makefile.in 2007-09-14 03:10:49.000000000 +0330 ++++ gtk+-2.12.0/gtk/xdgmime/Makefile.in 2007-09-16 18:43:11.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8374,9 +9146,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/gtk/xdgmime/Makefile.i EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/ltmain.sh gtk+-2.10.14/ltmain.sh ---- gtk+-2.10.14.orig/ltmain.sh 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/ltmain.sh 2006-03-22 03:36:55.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/ltmain.sh gtk+-2.12.0/ltmain.sh +--- gtk+-2.12.0.orig/ltmain.sh 2007-01-14 07:45:09.000000000 +0330 ++++ gtk+-2.12.0/ltmain.sh 2006-03-22 03:36:55.000000000 +0330 @@ -43,7 +43,7 @@ PROGRAM=ltmain.sh @@ -8410,9 +9190,9 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/ltmain.sh gtk+-2.10.14 esac ;; no) -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/m4macros/Makefile.in gtk+-2.10.14/m4macros/Makefile.in ---- gtk+-2.10.14.orig/m4macros/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/m4macros/Makefile.in 2007-07-17 12:50:11.000000000 +0330 +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/m4macros/Makefile.in gtk+-2.12.0/m4macros/Makefile.in +--- gtk+-2.12.0.orig/m4macros/Makefile.in 2007-09-14 03:10:49.000000000 +0330 ++++ gtk+-2.12.0/m4macros/Makefile.in 2007-09-16 18:43:11.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8422,9 +9202,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/m4macros/Makefile.in g EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/Makefile.in gtk+-2.10.14/Makefile.in ---- gtk+-2.10.14.orig/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/Makefile.in 2007-07-17 12:50:07.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/Makefile.in gtk+-2.12.0/Makefile.in +--- gtk+-2.12.0.orig/Makefile.in 2007-09-14 03:10:46.000000000 +0330 ++++ gtk+-2.12.0/Makefile.in 2007-09-16 18:43:07.000000000 +0330 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8434,7 +9222,15 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/Makefile.in gtk+-2.10. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -296,7 +298,10 @@ +@@ -124,7 +126,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -329,7 +330,10 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -8446,14 +9242,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/Makefile.in gtk+-2.10. SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 -@@ -447,13 +452,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 \ -- config.h.win32.in config.sub configure.in depcomp \ -+ config.h.win32.in config.sub configure configure.in depcomp \ - gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \ - gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \ +@@ -487,7 +491,8 @@ gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \ gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \ missing mkinstalldirs @@ -8463,7 +9252,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/Makefile.in gtk+-2.10. all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -705,7 +711,7 @@ +@@ -739,7 +744,7 @@ || exit 1; \ fi; \ done @@ -8472,9 +9261,9 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/Makefile.in gtk+-2.10. if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/Makefile.in gtk+-2.10.14/modules/engines/Makefile.in ---- gtk+-2.10.14.orig/modules/engines/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/engines/Makefile.in 2007-07-17 12:50:11.000000000 +0330 +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/Makefile.in gtk+-2.12.0/modules/engines/Makefile.in +--- gtk+-2.12.0.orig/modules/engines/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/engines/Makefile.in 2007-09-16 18:43:11.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8484,9 +9273,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/Makefi EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/ms-windows/Makefile.in gtk+-2.10.14/modules/engines/ms-windows/Makefile.in ---- gtk+-2.10.14.orig/modules/engines/ms-windows/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/engines/ms-windows/Makefile.in 2007-07-17 12:50:12.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/ms-windows/Makefile.in gtk+-2.12.0/modules/engines/ms-windows/Makefile.in +--- gtk+-2.12.0.orig/modules/engines/ms-windows/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/engines/ms-windows/Makefile.in 2007-09-16 18:43:11.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8496,9 +9293,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/ms-win EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+-2.10.14/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in ---- gtk+-2.10.14.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-17 12:50:12.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+-2.12.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8508,9 +9313,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/ms-win EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+-2.10.14/modules/engines/ms-windows/Theme/Makefile.in ---- gtk+-2.10.14.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/engines/ms-windows/Theme/Makefile.in 2007-07-17 12:50:12.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+-2.12.0/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/engines/ms-windows/Theme/Makefile.in 2007-09-16 18:43:11.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8520,9 +9333,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/ms-win EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/pixbuf/Makefile.in gtk+-2.10.14/modules/engines/pixbuf/Makefile.in ---- gtk+-2.10.14.orig/modules/engines/pixbuf/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/engines/pixbuf/Makefile.in 2007-07-17 12:50:12.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/pixbuf/Makefile.in gtk+-2.12.0/modules/engines/pixbuf/Makefile.in +--- gtk+-2.12.0.orig/modules/engines/pixbuf/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/engines/pixbuf/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8532,9 +9353,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/engines/pixbuf EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/input/Makefile.in gtk+-2.10.14/modules/input/Makefile.in ---- gtk+-2.10.14.orig/modules/input/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/input/Makefile.in 2007-07-17 12:50:12.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/input/Makefile.in gtk+-2.12.0/modules/input/Makefile.in +--- gtk+-2.12.0.orig/modules/input/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/input/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8544,10 +9373,18 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/input/Makefile EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -384,9 +386,10 @@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -430,9 +431,10 @@ - im_ime_la_LIBADD = -limm32 $(LDADDS) - @USE_WIN32_TRUE@IM_IME_MODULE = im-ime.la + imconffiledir = $(sysconfdir)/gtk-2.0 + dist_imconffile_DATA = im-multipress.conf +@CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false @@ -8556,7 +9393,7 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/input/Makefile module_LTLIBRARIES = \ $(IM_XIM_MODULE) \ -@@ -838,7 +841,18 @@ +@@ -985,7 +987,18 @@ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -8576,9 +9413,9 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/input/Makefile @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/Makefile.in gtk+-2.10.14/modules/Makefile.in ---- gtk+-2.10.14.orig/modules/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/Makefile.in 2007-07-17 12:50:11.000000000 +0330 +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/Makefile.in gtk+-2.12.0/modules/Makefile.in +--- gtk+-2.12.0.orig/modules/Makefile.in 2007-09-14 03:10:49.000000000 +0330 ++++ gtk+-2.12.0/modules/Makefile.in 2007-09-16 18:43:11.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8588,9 +9425,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/Makefile.in gt EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/cups/Makefile.in gtk+-2.10.14/modules/printbackends/cups/Makefile.in ---- gtk+-2.10.14.orig/modules/printbackends/cups/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/printbackends/cups/Makefile.in 2007-07-17 12:50:13.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/cups/Makefile.in gtk+-2.12.0/modules/printbackends/cups/Makefile.in +--- gtk+-2.12.0.orig/modules/printbackends/cups/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/printbackends/cups/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8600,9 +9445,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/file/Makefile.in gtk+-2.10.14/modules/printbackends/file/Makefile.in ---- gtk+-2.10.14.orig/modules/printbackends/file/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/printbackends/file/Makefile.in 2007-07-17 12:50:13.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/file/Makefile.in gtk+-2.12.0/modules/printbackends/file/Makefile.in +--- gtk+-2.12.0.orig/modules/printbackends/file/Makefile.in 2007-09-14 03:10:51.000000000 +0330 ++++ gtk+-2.12.0/modules/printbackends/file/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8612,9 +9465,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/lpr/Makefile.in gtk+-2.10.14/modules/printbackends/lpr/Makefile.in ---- gtk+-2.10.14.orig/modules/printbackends/lpr/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/printbackends/lpr/Makefile.in 2007-07-17 12:50:13.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/lpr/Makefile.in gtk+-2.12.0/modules/printbackends/lpr/Makefile.in +--- gtk+-2.12.0.orig/modules/printbackends/lpr/Makefile.in 2007-09-14 03:10:51.000000000 +0330 ++++ gtk+-2.12.0/modules/printbackends/lpr/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8624,10 +9485,18 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/Makefile.in gtk+-2.10.14/modules/printbackends/Makefile.in ---- gtk+-2.10.14.orig/modules/printbackends/Makefile.in 2007-07-17 12:49:44.000000000 +0330 -+++ gtk+-2.10.14/modules/printbackends/Makefile.in 2007-07-17 12:50:12.000000000 +0330 -@@ -90,6 +90,8 @@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/Makefile.in gtk+-2.12.0/modules/printbackends/Makefile.in +--- gtk+-2.12.0.orig/modules/printbackends/Makefile.in 2007-09-14 03:10:50.000000000 +0330 ++++ gtk+-2.12.0/modules/printbackends/Makefile.in 2007-09-16 18:43:12.000000000 +0330 +@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -8636,9 +9505,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/modules/printbackends/ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/perf/Makefile.in gtk+-2.10.14/perf/Makefile.in ---- gtk+-2.10.14.orig/perf/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/perf/Makefile.in 2007-07-17 12:50:13.000000000 +0330 +@@ -125,7 +127,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/test/Makefile.in gtk+-2.12.0/modules/printbackends/test/Makefile.in +--- gtk+-2.12.0.orig/modules/printbackends/test/Makefile.in 2007-09-14 03:10:51.000000000 +0330 ++++ gtk+-2.12.0/modules/printbackends/test/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8648,9 +9525,17 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/perf/Makefile.in gtk+- EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/tests/Makefile.in gtk+-2.10.14/tests/Makefile.in ---- gtk+-2.10.14.orig/tests/Makefile.in 2007-07-17 12:49:43.000000000 +0330 -+++ gtk+-2.10.14/tests/Makefile.in 2007-07-17 12:50:14.000000000 +0330 +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/perf/Makefile.in gtk+-2.12.0/perf/Makefile.in +--- gtk+-2.12.0.orig/perf/Makefile.in 2007-09-14 03:10:51.000000000 +0330 ++++ gtk+-2.12.0/perf/Makefile.in 2007-09-16 18:43:12.000000000 +0330 @@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ @@ -8660,3 +9545,31 @@ diff -urN -x config.guess -x config.sub gtk+-2.10.14.orig/tests/Makefile.in gtk+ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +@@ -123,7 +125,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/tests/Makefile.in gtk+-2.12.0/tests/Makefile.in +--- gtk+-2.12.0.orig/tests/Makefile.in 2007-09-14 03:10:51.000000000 +0330 ++++ gtk+-2.12.0/tests/Makefile.in 2007-09-16 18:43:13.000000000 +0330 +@@ -92,6 +92,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -126,7 +128,6 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ diff --git a/debian/patches/081_icon-cache-validate.patch b/debian/patches/081_icon-cache-validate.patch new file mode 100644 index 0000000000..610d03bf22 --- /dev/null +++ b/debian/patches/081_icon-cache-validate.patch @@ -0,0 +1,30 @@ +# See: http://bugzilla.gnome.org/show_bug.cgi?id=476342 + +--- trunk/gtk/gtkiconcache.c 2007/09/14 01:01:59 18822 ++++ trunk/gtk/gtkiconcache.c 2007/09/14 02:11:01 18823 +@@ -127,14 +127,19 @@ + info.n_directories = 0; + info.flags = CHECK_OFFSETS|CHECK_STRINGS; + +- if (!_gtk_icon_cache_validate (&info)) ++#ifdef G_ENABLE_DEBUG ++ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME) + { +- g_mapped_file_free (map); +- g_warning ("Icon cache '%s' is invalid\n", cache_filename); ++ if (!_gtk_icon_cache_validate (&info)) ++ { ++ g_mapped_file_free (map); ++ g_warning ("Icon cache '%s' is invalid\n", cache_filename); + +- goto done; ++ goto done; ++ } + } +- ++#endif ++ + GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path)); + + cache = g_new0 (GtkIconCache, 1); + diff --git a/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch b/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch new file mode 100644 index 0000000000..7beccc39c8 --- /dev/null +++ b/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch @@ -0,0 +1,12 @@ +Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c +=================================================================== +--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c 2007-08-31 16:52:48.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkclipboard.c 2007-08-31 16:53:16.000000000 +0200 +@@ -287,6 +287,7 @@ + gtk_clipboard_get_for_display (GdkDisplay *display, + GdkAtom selection) + { ++ g_return_val_if_fail (display != NULL, NULL); + g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + g_return_val_if_fail (!display->closed, NULL); + diff --git a/debian/patches/series b/debian/patches/series index 3c268c35bc..92fe41c04d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ 002_static-linking-dont-build-perf.patch 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch 005_xpmico.patch +006_proper-directfb-modules.patch 007_implicit_pointer_conversion_gdkdrawable_directfb.patch 008_implicit_pointer_conversion_gdkgc_directfb.patch 009_gtk-export-filechooser.patch @@ -9,8 +10,8 @@ 020_immodules-files-d.patch 021_loader-files-d.patch 030_gtkentry_password-char-circle.patch -031_cursor-blinking-timeout.patch 033_treeview_resizing.patch 040_filechooser_single-click.patch 041_ia32-libs.patch 070_mandatory-relibtoolize.patch +081_icon-cache-validate.patch diff --git a/debian/rules b/debian/rules index 63c16881b6..4dc7be7611 100644 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,8 @@ # Debian GNOME Maintainers DISABLE_UPDATE_UPLOADERS := 1 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +# prevent accidental uploads to unstable +include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk # get-orig-source target -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk @@ -26,20 +28,27 @@ MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL)) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) -CFLAGS += -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 +# ppc64 support; see #386815 +# XXX Should probably be fixed in binutils +# XXX Use LDFLAGS instead of CFLAGS? +# XXX shouldn't we check the arch instead of the CPU? +ifeq ($(DEB_BUILD_GNU_CPU),powerpc64) + CFLAGS += -mminimal-toc endif +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +# used to fail in directfb code -- but this might be fixed -- currently fails +# in the cups gtkprint backend +#LDFLAGS += -Wl,-z,defs + DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') APIVER := 2.0 SONAME := 0 -SHVER := 2.10.12-3 +SHVER := 2.12.0 # earliest version that this release has backwards binary compatibility for GTK_BINARY_VERSION := 2.10.0 @@ -104,7 +113,8 @@ common_configure_flags := \ --infodir=\$${prefix}/share/info \ --sysconfdir=/etc \ --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \ - --enable-explicit-deps=yes + --enable-explicit-deps=yes \ + --enable-test-print-backend ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) else @@ -250,7 +260,7 @@ binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1 dh_testdir dh_testroot - dh_install -a + dh_install -s # empty the dependency_libs in the *.la files sed -i "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/usr/lib/*.la # we don't need the rpath in the udeb @@ -261,7 +271,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK done dh_installchangelogs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) ChangeLog ChangeLog.* dh_installdocs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) NEWS NEWS.pre-1-0 README - dh_installman -a + dh_installman -s # fix the permissions of the development package because it ships # dh_gtkmodules which we need to invoke in this build dh_fixperms -p$(DEV_PKG) @@ -281,12 +291,12 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \ -k \ -p$(UDEB_PKG) - dh_installexamples -a - dh_link -a - dh_strip -a --dbg-package=$(DEBUG_PKG) - dh_compress -a - dh_fixperms -a -Xusr/lib/$(SHARED_PKG) - dh_makeshlibs -p$(SHARED_PKG)\ + dh_installexamples -s + dh_link -s + dh_strip -s --dbg-package=$(DEBUG_PKG) + dh_compress -s + dh_fixperms -s -Xusr/lib/$(SHARED_PKG) + dh_makeshlibs -p$(SHARED_PKG) \ -X$(MODULES_BASE_PATH) \ -V"$(SHARED_PKG) (>= $(SHVER))" \ --add-udeb=$(UDEB_PKG) @@ -294,7 +304,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK -X$(MODULES_BASE_PATH) \ -V"$(DIRECTFB_PKG) (>= $(SHVER))" \ --add-udeb=$(UDEB_PKG) - dh_installdeb -a + dh_installdeb -s # override shlibs for libraries from this source before computing # dependencies of packages generated from this source; we already have # inter-dependencies expressed manually in the control file, we do not @@ -302,12 +312,16 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK cat debian/*/DEBIAN/shlibs | \ sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \ > debian/shlibs.local - dh_shlibdeps -a -N$(UDEB_PKG) + dh_shlibdeps -s -N$(UDEB_PKG) dh_shlibdeps -p$(UDEB_PKG) -l/usr/lib/libcairo-directfb/lib/ -rm -f debian/shlibs.local - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +list-missing: + perl -w debian/dh_listmissing.pl $(foreach f,$(FLAVORS),$(subst $(CURDIR)/,,$(installbasedir))/$(f)) 2>&1 | \ + egrep -v '(\.la|usr/lib/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2 binary: binary-indep binary-arch -.PHONY: patch configure build check install clean binary-indep binary-arch binary +.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary