diff --git a/debian/changelog b/debian/changelog index ffbe75a0a8..acadbef900 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gtk+2.0 (2.12.2-1) UNRELEASED; urgency=low + + * New upstream stable release; no API change; bug fixes and translation + updated. + - Drop patch 034_gtkcupsutils_type_fix fixed upstream. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + - Update patch 071_fix_gdk_window_null_crasher to apply cleanly. + + -- Sebastian Dröge Tue, 27 Nov 2007 05:15:01 +0100 + gtk+2.0 (2.12.1-3) unstable; urgency=low * Conflict against metacity < 1:2.20.0-1. Closes: #450693. diff --git a/debian/control b/debian/control index 1a3e26e518..eea216c30c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+2.0 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, diff --git a/debian/patches/034_gtkcupsutils_type_fix.patch b/debian/patches/034_gtkcupsutils_type_fix.patch deleted file mode 100644 index 6226e248b2..0000000000 --- a/debian/patches/034_gtkcupsutils_type_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+2.0-2.12.0/modules/printbackends/cups/gtkcupsutils.c.orig 2007-09-13 22:35:49.000000000 +0200 -+++ gtk+2.0-2.12.0/modules/printbackends/cups/gtkcupsutils.c 2007-10-19 12:46:28.000000000 +0200 -@@ -622,7 +622,7 @@ _post_send (GtkCupsRequest *request) - if (request->data_io != NULL) - { - fstat (g_io_channel_unix_get_fd (request->data_io), &data_info); -- sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request) + data_info.st_size); -+ sprintf (length, "%lu", (unsigned long) (ippLength (request->ipp_request) + data_info.st_size)); - } - else - sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request)); diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index cccd0cb023..5004ef2e14 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -9,63 +9,10 @@ exclude config.guess and sub with diff -urN -x config.guess -x config.sub This is required because of patches touching autotools files, but also because of upstream using an older libtool; see GNOME #484426; Debian #445001. -Index: gtk+-2.12.1/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/Makefile.in 2007-11-18 01:23:38.211819079 +0100 -+++ gtk+-2.12.1/Makefile.in 2007-11-18 01:23:43.132099470 +0100 -@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F - 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@ -@@ -124,6 +126,7 @@ GMOFILES = @GMOFILES@ - 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 +332,10 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+# don't build perf measurement tools in static builds -+@ENABLE_STATIC_FALSE@MAYBE_PERF = perf -+ -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 -@@ -487,7 +493,8 @@ DIST_COMMON = README $(srcdir)/Makefile. - 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 --DIST_SUBDIRS = $(SUBDIRS) -+DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \ -+ perf contrib docs m4macros - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -@@ -739,7 +746,7 @@ distdir: $(DISTFILES) - || exit 1; \ - fi; \ - done -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ -Index: gtk+-2.12.1/aclocal.m4 -=================================================================== ---- gtk+-2.12.1.orig/aclocal.m4 2007-11-18 01:23:38.203818623 +0100 -+++ gtk+-2.12.1/aclocal.m4 2007-11-18 01:23:43.140099925 +0100 -@@ -941,7 +941,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/aclocal.m4 gtk+2.0-2.12.2/aclocal.m4 +--- gtk+2.0-2.12.2.old/aclocal.m4 2007-11-26 20:44:10.000000000 +0100 ++++ gtk+2.0-2.12.2/aclocal.m4 2007-11-27 05:24:42.000000000 +0100 +@@ -941,7 +941,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -74,7 +21,7 @@ Index: gtk+-2.12.1/aclocal.m4 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -1493,7 +1493,6 @@ s390*-*linux*|sparc*-*linux*) +@@ -1493,7 +1493,6 @@ esac ;; *64-bit*) @@ -82,7 +29,7 @@ Index: gtk+-2.12.1/aclocal.m4 case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -2552,13 +2551,11 @@ linux* | k*bsd*-gnu) +@@ -2552,13 +2551,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -97,7 +44,7 @@ Index: gtk+-2.12.1/aclocal.m4 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -2570,6 +2567,18 @@ linux* | k*bsd*-gnu) +@@ -2570,6 +2567,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -116,7 +63,7 @@ Index: gtk+-2.12.1/aclocal.m4 netbsd*) version_type=sunos need_lib_prefix=no -@@ -3344,7 +3353,7 @@ linux* | k*bsd*-gnu) +@@ -3344,7 +3353,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -125,7 +72,7 @@ Index: gtk+-2.12.1/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else -@@ -4378,7 +4387,7 @@ case $host_os in +@@ -4378,7 +4387,7 @@ ;; esac ;; @@ -134,7 +81,7 @@ Index: gtk+-2.12.1/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= -@@ -6059,7 +6068,7 @@ AC_MSG_CHECKING([for $compiler option to +@@ -6059,7 +6068,7 @@ ;; esac ;; @@ -143,7 +90,7 @@ Index: gtk+-2.12.1/aclocal.m4 ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -6434,6 +6443,9 @@ ifelse([$1],[CXX],[ +@@ -6434,6 +6443,9 @@ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; @@ -153,7 +100,7 @@ Index: gtk+-2.12.1/aclocal.m4 *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -6639,12 +6651,13 @@ EOF +@@ -6639,12 +6651,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -168,7 +115,7 @@ Index: gtk+-2.12.1/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -7076,7 +7089,7 @@ _LT_EOF +@@ -7076,7 +7089,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -177,77 +124,19 @@ Index: gtk+-2.12.1/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -8498,46 +8511,32 @@ AC_DEFUN([GTK_DOC_CHECK], - 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]) +@@ -8311,7 +8324,7 @@ + esac + done - 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]) +- PKG_PROG_PKG_CONFIG([0.16]) ++ PKG_PROG_PKG_CONFIG([0.7]) -- 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) -- fi -- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then -- have_gtk_doc=yes -- fi -- -- 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) -- have_gtk_doc=no -- fi -- fi --]) -- if test "$have_gtk_doc" != yes; then -- enable_gtk_doc=no -- fi -+ 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 + no_glib="" -- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -+ AC_MSG_CHECKING([whether to build gtk-doc documentation]) -+ AC_MSG_RESULT($enable_gtk_doc) -+ -+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) -+ -+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - ]) - -Index: gtk+-2.12.1/configure -=================================================================== ---- gtk+-2.12.1.orig/configure 2007-11-18 01:23:38.171816799 +0100 -+++ gtk+-2.12.1/configure 2007-11-18 01:23:52.640641330 +0100 -@@ -863,6 +863,8 @@ AMDEPBACKSLASH +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/configure gtk+2.0-2.12.2/configure +--- gtk+2.0-2.12.2.old/configure 2007-11-26 20:44:23.000000000 +0100 ++++ gtk+2.0-2.12.2/configure 2007-11-27 05:24:48.000000000 +0100 +@@ -863,6 +863,8 @@ CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE @@ -256,7 +145,7 @@ Index: gtk+-2.12.1/configure CXX CXXFLAGS ac_ct_CXX -@@ -1016,6 +1018,7 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS +@@ -1016,6 +1018,7 @@ USE_DIRECTFB_TRUE USE_DIRECTFB_FALSE GDK_PACKAGES @@ -264,24 +153,7 @@ Index: gtk+-2.12.1/configure GDK_EXTRA_LIBS GDK_EXTRA_CFLAGS GDK_DEP_LIBS -@@ -1047,6 +1050,7 @@ HAVE_HTTP_AUTHSTRING - 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 -@@ -1689,7 +1693,7 @@ Optional Features: - --disable-modules disable dynamic module loading - --enable-test-print-backend - build test print backend -- --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: -@@ -3871,6 +3875,16 @@ fi +@@ -3872,6 +3875,16 @@ @@ -298,7 +170,7 @@ Index: gtk+-2.12.1/configure for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -5097,7 +5111,7 @@ linux* | k*bsd*-gnu) +@@ -5098,7 +5111,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -307,16 +179,16 @@ Index: gtk+-2.12.1/configure if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else -@@ -5218,7 +5232,7 @@ ia64-*-hpux*) +@@ -5219,7 +5232,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 5221 "configure"' > conftest.$ac_ext +- echo '#line 5222 "configure"' > conftest.$ac_ext + echo '#line 5235 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -5283,7 +5297,6 @@ s390*-*linux*|sparc*-*linux*) +@@ -5284,7 +5297,6 @@ esac ;; *64-bit*) @@ -324,49 +196,49 @@ Index: gtk+-2.12.1/configure case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -7778,11 +7791,11 @@ else +@@ -7779,11 +7791,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7781: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:7782: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:7785: \$? = $ac_status" >&5 +- echo "$as_me:7786: \$? = $ac_status" >&5 + echo "$as_me:7798: \$? = $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. -@@ -8068,11 +8081,11 @@ else +@@ -8069,11 +8081,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8071: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8072: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8084: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:8075: \$? = $ac_status" >&5 +- echo "$as_me:8076: \$? = $ac_status" >&5 + echo "$as_me:8088: \$? = $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. -@@ -8172,11 +8185,11 @@ else +@@ -8173,11 +8185,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8175: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8176: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8188: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:8179: \$? = $ac_status" >&5 +- echo "$as_me:8180: \$? = $ac_status" >&5 + echo "$as_me:8192: \$? = $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 -@@ -8436,12 +8449,13 @@ EOF +@@ -8437,12 +8449,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -381,7 +253,7 @@ Index: gtk+-2.12.1/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -8985,7 +8999,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8986,7 +8999,7 @@ link_all_deplibs=yes ;; @@ -390,7 +262,7 @@ Index: gtk+-2.12.1/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -9680,13 +9694,11 @@ linux* | k*bsd*-gnu) +@@ -9681,13 +9694,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -405,7 +277,7 @@ Index: gtk+-2.12.1/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -9698,6 +9710,18 @@ linux* | k*bsd*-gnu) +@@ -9699,6 +9710,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -424,25 +296,25 @@ Index: gtk+-2.12.1/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -10523,7 +10547,7 @@ else +@@ -10524,7 +10547,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= -@@ -12934,7 +12958,7 @@ echo $ECHO_N "checking for $compiler opt +@@ -12935,7 +12958,7 @@ ;; esac ;; @@ -460,35 +332,35 @@ Index: gtk+-2.12.1/configure ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -13043,11 +13067,11 @@ else +@@ -13044,11 +13067,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13046: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13047: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13070: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:13050: \$? = $ac_status" >&5 +- echo "$as_me:13051: \$? = $ac_status" >&5 + echo "$as_me:13074: \$? = $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. -@@ -13147,11 +13171,11 @@ else +@@ -13148,11 +13171,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13150: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13151: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13174: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:13154: \$? = $ac_status" >&5 +- echo "$as_me:13155: \$? = $ac_status" >&5 + echo "$as_me:13178: \$? = $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 -@@ -13219,6 +13243,9 @@ echo $ECHO_N "checking whether the $comp +@@ -13220,6 +13243,9 @@ cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; @@ -498,7 +370,7 @@ Index: gtk+-2.12.1/configure *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -13648,13 +13675,11 @@ linux* | k*bsd*-gnu) +@@ -13649,13 +13675,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -513,7 +385,7 @@ Index: gtk+-2.12.1/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -13666,6 +13691,18 @@ linux* | k*bsd*-gnu) +@@ -13667,6 +13691,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -532,35 +404,35 @@ Index: gtk+-2.12.1/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -14711,11 +14748,11 @@ else +@@ -14712,11 +14748,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14714: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:14715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14751: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:14718: \$? = $ac_status" >&5 +- echo "$as_me:14719: \$? = $ac_status" >&5 + echo "$as_me:14755: \$? = $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. -@@ -14815,11 +14852,11 @@ else +@@ -14816,11 +14852,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14818: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:14819: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14855: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:14822: \$? = $ac_status" >&5 +- echo "$as_me:14823: \$? = $ac_status" >&5 + echo "$as_me:14859: \$? = $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 -@@ -15079,12 +15116,13 @@ EOF +@@ -15080,12 +15116,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -575,7 +447,7 @@ Index: gtk+-2.12.1/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -15608,7 +15646,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -15609,7 +15646,7 @@ link_all_deplibs_F77=yes ;; @@ -584,7 +456,7 @@ Index: gtk+-2.12.1/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -16251,13 +16289,11 @@ linux* | k*bsd*-gnu) +@@ -16252,13 +16289,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -599,7 +471,7 @@ Index: gtk+-2.12.1/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -16269,6 +16305,18 @@ linux* | k*bsd*-gnu) +@@ -16270,6 +16305,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -618,49 +490,49 @@ Index: gtk+-2.12.1/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -17004,11 +17052,11 @@ else +@@ -17005,11 +17052,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17007: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17008: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17055: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:17011: \$? = $ac_status" >&5 +- echo "$as_me:17012: \$? = $ac_status" >&5 + echo "$as_me:17059: \$? = $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. -@@ -17294,11 +17342,11 @@ else +@@ -17295,11 +17342,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17297: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17298: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17345: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:17301: \$? = $ac_status" >&5 +- echo "$as_me:17302: \$? = $ac_status" >&5 + echo "$as_me:17349: \$? = $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. -@@ -17398,11 +17446,11 @@ else +@@ -17399,11 +17446,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17401: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17402: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17449: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:17405: \$? = $ac_status" >&5 +- echo "$as_me:17406: \$? = $ac_status" >&5 + echo "$as_me:17453: \$? = $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 -@@ -17662,12 +17710,13 @@ EOF +@@ -17663,12 +17710,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -675,7 +547,7 @@ Index: gtk+-2.12.1/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -18211,7 +18260,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -18212,7 +18260,7 @@ link_all_deplibs_GCJ=yes ;; @@ -684,7 +556,7 @@ Index: gtk+-2.12.1/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -18854,13 +18903,11 @@ linux* | k*bsd*-gnu) +@@ -18855,13 +18903,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -699,7 +571,7 @@ Index: gtk+-2.12.1/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -18872,6 +18919,18 @@ linux* | k*bsd*-gnu) +@@ -18873,6 +18919,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -718,7 +590,16 @@ Index: gtk+-2.12.1/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -32440,8 +32499,18 @@ echo $ECHO_N "checking for DirectFB... $ +@@ -23999,7 +24057,7 @@ + + fi + if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.16 ++ _pkg_min_version=0.7 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +@@ -32441,8 +32499,18 @@ if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then { echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6; } @@ -739,7 +620,7 @@ Index: gtk+-2.12.1/configure else { { echo "$as_me:$LINENO: error: *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend -@@ -32577,20 +32646,21 @@ fi +@@ -32578,20 +32646,21 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" @@ -766,7 +647,7 @@ Index: gtk+-2.12.1/configure fi -@@ -32600,6 +32670,7 @@ fi +@@ -32601,6 +32670,7 @@ @@ -774,7 +655,7 @@ Index: gtk+-2.12.1/configure ######################################## # Check for Accessibility Toolkit flags ######################################## -@@ -32705,7 +32776,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr +@@ -32706,7 +32776,7 @@ CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" if test $enable_explicit_deps != yes ; then @@ -783,112 +664,7 @@ Index: gtk+-2.12.1/configure fi -@@ -33456,19 +33527,38 @@ else - fi - - -- have_gtk_doc=no - if test x$enable_gtk_doc = xyes; then -- 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 -+ 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 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } --if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case $PKG_CONFIG in -+ case $GTKDOC_CHECK in - [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -33478,7 +33568,7 @@ do - 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_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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -33486,43 +33576,22 @@ done - done - IFS=$as_save_IFS - -- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; - esac - fi --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; } -+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; } - else - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - fi - - -- 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 -+ test -n "$GTKDOC_CHECK" && break -+done - -- if test "$have_gtk_doc" != yes; then -- enable_gtk_doc=no -- fi -- fi - - - -@@ -33892,6 +33961,13 @@ echo "$as_me: error: conditional \"am__f +@@ -33891,6 +33961,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -902,7 +678,7 @@ Index: gtk+-2.12.1/configure if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -34962,9 +35038,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +@@ -34961,9 +35038,9 @@ CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim @@ -914,7 +690,7 @@ Index: gtk+-2.12.1/configure _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -35006,6 +35082,8 @@ _ACEOF +@@ -35005,6 +35082,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -923,7 +699,7 @@ Index: gtk+-2.12.1/configure CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -@@ -35101,8 +35179,6 @@ INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_ +@@ -35100,8 +35179,6 @@ INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim @@ -932,7 +708,7 @@ Index: gtk+-2.12.1/configure _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -35144,6 +35220,8 @@ _ACEOF +@@ -35143,6 +35220,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -941,7 +717,7 @@ Index: gtk+-2.12.1/configure INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim -@@ -35197,6 +35275,7 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_X +@@ -35196,6 +35275,7 @@ USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim GDK_PACKAGES!$GDK_PACKAGES$ac_delim @@ -949,46 +725,36 @@ Index: gtk+-2.12.1/configure GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim -@@ -35228,6 +35307,7 @@ HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRI - 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 -@@ -35237,10 +35317,6 @@ HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_ +@@ -35237,9 +35317,6 @@ HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim XSLTPROC!$XSLTPROC$ac_delim XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim -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 -@@ -35282,10 +35358,14 @@ _ACEOF +@@ -35281,11 +35358,14 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +XMLCATALOG!$XMLCATALOG$ac_delim +ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim +ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim -+LIBOBJS!$LIBOBJS$ac_delim + LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- 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 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -Index: gtk+-2.12.1/contrib/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/contrib/Makefile.in 2007-11-18 01:23:38.163816343 +0100 -+++ gtk+-2.12.1/contrib/Makefile.in 2007-11-18 01:23:43.184102433 +0100 -@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.12.2.old/contrib/gdk-pixbuf-xlib/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in 2007-11-27 05:24:49.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -997,19 +763,18 @@ Index: gtk+-2.12.1/contrib/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -124,6 +126,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/contrib/gdk-pixbuf-xlib/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-11-18 01:23:38.155815887 +0100 -+++ gtk+-2.12.1/contrib/gdk-pixbuf-xlib/Makefile.in 2007-11-18 01:23:43.184102433 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/contrib/Makefile.in gtk+2.0-2.12.2/contrib/Makefile.in +--- gtk+2.0-2.12.2.old/contrib/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/contrib/Makefile.in 2007-11-27 05:24:49.000000000 +0100 +@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1018,19 +783,18 @@ Index: gtk+-2.12.1/contrib/gdk-pixbuf-xlib/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/demos/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/demos/Makefile.in 2007-11-18 01:23:38.143815203 +0100 -+++ gtk+-2.12.1/demos/Makefile.in 2007-11-18 01:23:43.184102433 +0100 -@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -113,6 +115,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.2/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.12.2.old/demos/gtk-demo/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/demos/gtk-demo/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1039,19 +803,18 @@ Index: gtk+-2.12.1/demos/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -124,6 +126,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/demos/gtk-demo/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/demos/gtk-demo/Makefile.in 2007-11-18 01:23:38.135814747 +0100 -+++ gtk+-2.12.1/demos/gtk-demo/Makefile.in 2007-11-18 01:23:43.184102433 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/demos/Makefile.in gtk+2.0-2.12.2/demos/Makefile.in +--- gtk+2.0-2.12.2.old/demos/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/demos/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1060,19 +823,18 @@ Index: gtk+-2.12.1/demos/gtk-demo/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/Makefile.in 2007-11-18 01:23:38.103812924 +0100 -+++ gtk+-2.12.1/docs/Makefile.in 2007-11-18 01:23:43.184102433 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -113,6 +115,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/faq/Makefile.in gtk+2.0-2.12.2/docs/faq/Makefile.in +--- gtk+2.0-2.12.2.old/docs/faq/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/faq/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1081,19 +843,18 @@ Index: gtk+-2.12.1/docs/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/faq/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/faq/Makefile.in 2007-11-18 01:23:38.071811100 +0100 -+++ gtk+-2.12.1/docs/faq/Makefile.in 2007-11-18 01:23:43.184102433 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/Makefile.in gtk+2.0-2.12.2/docs/Makefile.in +--- gtk+2.0-2.12.2.old/docs/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1102,19 +863,18 @@ Index: gtk+-2.12.1/docs/faq/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/reference/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/reference/Makefile.in 2007-11-18 01:23:38.035809048 +0100 -+++ gtk+-2.12.1/docs/reference/Makefile.in 2007-11-18 01:23:43.188102661 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.2/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.12.2.old/docs/reference/gdk/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/reference/gdk/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1123,19 +883,18 @@ Index: gtk+-2.12.1/docs/reference/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/reference/gdk/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/reference/gdk/Makefile.in 2007-11-18 01:23:37.979805857 +0100 -+++ gtk+-2.12.1/docs/reference/gdk/Makefile.in 2007-11-18 01:23:43.188102661 +0100 -@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -118,6 +120,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.2/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.12.2.old/docs/reference/gdk-pixbuf/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/reference/gdk-pixbuf/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1144,19 +903,18 @@ Index: gtk+-2.12.1/docs/reference/gdk/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -129,6 +131,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/reference/gdk-pixbuf/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-11-18 01:23:37.971805401 +0100 -+++ gtk+-2.12.1/docs/reference/gdk-pixbuf/Makefile.in 2007-11-18 01:23:43.188102661 +0100 -@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -118,6 +120,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.2/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.12.2.old/docs/reference/gtk/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/reference/gtk/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1165,19 +923,18 @@ Index: gtk+-2.12.1/docs/reference/gdk-pixbuf/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -129,6 +131,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/reference/gtk/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/reference/gtk/Makefile.in 2007-11-18 01:23:37.939803577 +0100 -+++ gtk+-2.12.1/docs/reference/gtk/Makefile.in 2007-11-18 01:23:43.188102661 +0100 -@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -118,6 +120,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/Makefile.in gtk+2.0-2.12.2/docs/reference/Makefile.in +--- gtk+2.0-2.12.2.old/docs/reference/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/reference/Makefile.in 2007-11-27 05:24:50.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1186,19 +943,18 @@ Index: gtk+-2.12.1/docs/reference/gtk/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -129,6 +131,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/tools/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/tools/Makefile.in 2007-11-18 01:23:37.927802894 +0100 -+++ gtk+-2.12.1/docs/tools/Makefile.in 2007-11-18 01:23:43.188102661 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/tools/Makefile.in gtk+2.0-2.12.2/docs/tools/Makefile.in +--- gtk+2.0-2.12.2.old/docs/tools/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/tools/Makefile.in 2007-11-27 05:24:51.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1207,19 +963,18 @@ Index: gtk+-2.12.1/docs/tools/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/docs/tutorial/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/docs/tutorial/Makefile.in 2007-11-18 01:23:37.919802438 +0100 -+++ gtk+-2.12.1/docs/tutorial/Makefile.in 2007-11-18 01:23:43.188102661 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/tutorial/Makefile.in gtk+2.0-2.12.2/docs/tutorial/Makefile.in +--- gtk+2.0-2.12.2.old/docs/tutorial/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/docs/tutorial/Makefile.in 2007-11-27 05:24:51.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1228,19 +983,18 @@ Index: gtk+-2.12.1/docs/tutorial/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk/Makefile.in 2007-11-18 01:23:37.883800386 +0100 -+++ gtk+-2.12.1/gdk/Makefile.in 2007-11-18 01:23:43.188102661 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/directfb/Makefile.in gtk+2.0-2.12.2/gdk/directfb/Makefile.in +--- gtk+2.0-2.12.2.old/gdk/directfb/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk/directfb/Makefile.in 2007-11-27 05:24:52.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1249,19 +1003,18 @@ Index: gtk+-2.12.1/gdk/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk/directfb/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk/directfb/Makefile.in 2007-11-18 01:23:37.875799930 +0100 -+++ gtk+-2.12.1/gdk/directfb/Makefile.in 2007-11-18 01:23:43.192102889 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/Makefile.in gtk+2.0-2.12.2/gdk/Makefile.in +--- gtk+2.0-2.12.2.old/gdk/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk/Makefile.in 2007-11-27 05:24:52.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1270,19 +1023,18 @@ Index: gtk+-2.12.1/gdk/directfb/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk/quartz/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk/quartz/Makefile.in 2007-11-18 01:23:37.867799474 +0100 -+++ gtk+-2.12.1/gdk/quartz/Makefile.in 2007-11-18 01:23:43.192102889 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/quartz/Makefile.in gtk+2.0-2.12.2/gdk/quartz/Makefile.in +--- gtk+2.0-2.12.2.old/gdk/quartz/Makefile.in 2007-11-26 20:44:20.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk/quartz/Makefile.in 2007-11-27 05:24:52.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1291,19 +1043,18 @@ Index: gtk+-2.12.1/gdk/quartz/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk/win32/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk/win32/Makefile.in 2007-11-18 01:23:37.815796511 +0100 -+++ gtk+-2.12.1/gdk/win32/Makefile.in 2007-11-18 01:23:43.192102889 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/win32/Makefile.in gtk+2.0-2.12.2/gdk/win32/Makefile.in +--- gtk+2.0-2.12.2.old/gdk/win32/Makefile.in 2007-11-26 20:44:20.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk/win32/Makefile.in 2007-11-27 05:24:52.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1312,19 +1063,18 @@ Index: gtk+-2.12.1/gdk/win32/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk/win32/rc/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk/win32/rc/Makefile.in 2007-11-18 01:23:37.799795599 +0100 -+++ gtk+-2.12.1/gdk/win32/rc/Makefile.in 2007-11-18 01:23:43.192102889 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.2/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.12.2.old/gdk/win32/rc/Makefile.in 2007-11-26 20:44:20.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk/win32/rc/Makefile.in 2007-11-27 05:24:52.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1333,19 +1083,18 @@ Index: gtk+-2.12.1/gdk/win32/rc/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk/x11/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk/x11/Makefile.in 2007-11-18 01:23:37.783794687 +0100 -+++ gtk+-2.12.1/gdk/x11/Makefile.in 2007-11-18 01:23:43.192102889 +0100 -@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/x11/Makefile.in gtk+2.0-2.12.2/gdk/x11/Makefile.in +--- gtk+2.0-2.12.2.old/gdk/x11/Makefile.in 2007-11-26 20:44:20.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk/x11/Makefile.in 2007-11-27 05:24:53.000000000 +0100 +@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1354,19 +1103,18 @@ Index: gtk+-2.12.1/gdk/x11/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -125,6 +127,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk-pixbuf/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk-pixbuf/Makefile.in 2007-11-18 01:23:37.731791724 +0100 -+++ gtk+-2.12.1/gdk-pixbuf/Makefile.in 2007-11-18 01:23:43.192102889 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -114,6 +116,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.2/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.12.2.old/gdk-pixbuf/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk-pixbuf/Makefile.in 2007-11-27 05:24:51.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1375,19 +1123,18 @@ Index: gtk+-2.12.1/gdk-pixbuf/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gdk-pixbuf/pixops/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gdk-pixbuf/pixops/Makefile.in 2007-11-18 01:23:37.683788988 +0100 -+++ gtk+-2.12.1/gdk-pixbuf/pixops/Makefile.in 2007-11-18 01:23:43.192102889 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.2/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.12.2.old/gdk-pixbuf/pixops/Makefile.in 2007-11-26 20:44:19.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk-pixbuf/pixops/Makefile.in 2007-11-27 05:24:51.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1396,19 +1143,18 @@ Index: gtk+-2.12.1/gdk-pixbuf/pixops/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gtk/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gtk/Makefile.in 2007-11-18 01:23:37.663787848 +0100 -+++ gtk+-2.12.1/gtk/Makefile.in 2007-11-18 01:23:43.196103117 +0100 -@@ -113,6 +113,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/Makefile.in gtk+2.0-2.12.2/gtk/Makefile.in +--- gtk+2.0-2.12.2.old/gtk/Makefile.in 2007-11-26 20:44:20.000000000 +0100 ++++ gtk+2.0-2.12.2/gtk/Makefile.in 2007-11-27 05:24:53.000000000 +0100 +@@ -113,6 +113,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1417,15 +1163,15 @@ Index: gtk+-2.12.1/gtk/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -147,6 +149,7 @@ GMOFILES = @GMOFILES@ - 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 +381,8 @@ INCLUDES = \ +@@ -136,6 +138,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -379,6 +382,8 @@ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ @@ -1434,7 +1180,7 @@ Index: gtk+-2.12.1/gtk/Makefile.in -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(GTK_DEBUG_FLAGS) \ -@@ -633,13 +638,16 @@ gtk_public_h_sources = \ +@@ -634,13 +639,16 @@ # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ gtktextlayout.h \ @@ -1454,7 +1200,7 @@ Index: gtk+-2.12.1/gtk/Makefile.in gtksearchenginebeagle.h \ gtksearchenginetracker.h\ gtksearchenginesimple.h \ -@@ -649,10 +657,7 @@ gtk_private_h_sources = \ +@@ -650,10 +658,7 @@ gtkfilechooserdefault.h \ gtkfilechooserembed.h \ gtkfilechooserentry.h \ @@ -1465,11 +1211,10 @@ Index: gtk+-2.12.1/gtk/Makefile.in gtkfilesystemunix.h \ gtkhsv.h \ gtkiconcache.h \ -Index: gtk+-2.12.1/gtk/theme-bits/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gtk/theme-bits/Makefile.in 2007-11-18 01:23:37.647786936 +0100 -+++ gtk+-2.12.1/gtk/theme-bits/Makefile.in 2007-11-18 01:23:43.196103117 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.2/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.12.2.old/gtk/theme-bits/Makefile.in 2007-11-26 20:44:20.000000000 +0100 ++++ gtk+2.0-2.12.2/gtk/theme-bits/Makefile.in 2007-11-27 05:24:53.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1478,19 +1223,18 @@ Index: gtk+-2.12.1/gtk/theme-bits/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/gtk/xdgmime/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/gtk/xdgmime/Makefile.in 2007-11-18 01:23:37.599784201 +0100 -+++ gtk+-2.12.1/gtk/xdgmime/Makefile.in 2007-11-18 01:23:43.196103117 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.2/gtk/xdgmime/Makefile.in +--- gtk+2.0-2.12.2.old/gtk/xdgmime/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/gtk/xdgmime/Makefile.in 2007-11-27 05:24:54.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1499,19 +1243,18 @@ Index: gtk+-2.12.1/gtk/xdgmime/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/ltmain.sh -=================================================================== ---- gtk+-2.12.1.orig/ltmain.sh 2007-11-18 01:23:37.583783289 +0100 -+++ gtk+-2.12.1/ltmain.sh 2007-11-18 01:23:43.200103345 +0100 -@@ -43,7 +43,7 @@ EXIT_FAILURE=1 +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/ltmain.sh gtk+2.0-2.12.2/ltmain.sh +--- gtk+2.0-2.12.2.old/ltmain.sh 2007-08-29 13:52:51.000000000 +0200 ++++ gtk+2.0-2.12.2/ltmain.sh 2007-08-14 19:43:36.000000000 +0200 +@@ -43,7 +43,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool @@ -1520,7 +1263,7 @@ Index: gtk+-2.12.1/ltmain.sh TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -@@ -2122,7 +2122,10 @@ EOF +@@ -2122,7 +2122,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; @@ -1532,7 +1275,7 @@ Index: gtk+-2.12.1/ltmain.sh esac fi if test "$pass" = dlopen; then -@@ -3244,6 +3247,11 @@ EOF +@@ -3244,6 +3247,11 @@ revision="$number_minor" lt_irix_increment=no ;; @@ -1544,11 +1287,10 @@ Index: gtk+-2.12.1/ltmain.sh esac ;; no) -Index: gtk+-2.12.1/m4macros/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/m4macros/Makefile.in 2007-11-18 01:23:37.567782377 +0100 -+++ gtk+-2.12.1/m4macros/Makefile.in 2007-11-18 01:23:43.200103345 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/m4macros/Makefile.in gtk+2.0-2.12.2/m4macros/Makefile.in +--- gtk+2.0-2.12.2.old/m4macros/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/m4macros/Makefile.in 2007-11-27 05:24:54.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1557,19 +1299,18 @@ Index: gtk+-2.12.1/m4macros/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/Makefile.in 2007-11-18 01:23:37.507778958 +0100 -+++ gtk+-2.12.1/modules/Makefile.in 2007-11-18 01:23:43.200103345 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/Makefile.in gtk+2.0-2.12.2/Makefile.in +--- gtk+2.0-2.12.2.old/Makefile.in 2007-11-26 20:44:18.000000000 +0100 ++++ gtk+2.0-2.12.2/Makefile.in 2007-11-27 05:24:49.000000000 +0100 +@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1578,19 +1319,56 @@ Index: gtk+-2.12.1/modules/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/engines/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/engines/Makefile.in 2007-11-18 01:23:37.495778274 +0100 -+++ gtk+-2.12.1/modules/engines/Makefile.in 2007-11-18 01:23:43.200103345 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -113,6 +115,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -330,7 +333,10 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++# don't build perf measurement tools in static builds ++@ENABLE_STATIC_FALSE@MAYBE_PERF = perf ++ ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 +@@ -482,13 +488,14 @@ + DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \ + acinclude.m4 aclocal.m4 compile config.guess config.h.in \ +- 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 \ + 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 +-DIST_SUBDIRS = $(SUBDIRS) ++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \ ++ perf contrib docs m4macros + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -740,7 +747,7 @@ + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/Makefile.in gtk+2.0-2.12.2/modules/engines/Makefile.in +--- gtk+2.0-2.12.2.old/modules/engines/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/engines/Makefile.in 2007-11-27 05:24:54.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1599,19 +1377,18 @@ Index: gtk+-2.12.1/modules/engines/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/engines/ms-windows/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/engines/ms-windows/Makefile.in 2007-11-18 01:23:37.439775082 +0100 -+++ gtk+-2.12.1/modules/engines/ms-windows/Makefile.in 2007-11-18 01:23:43.204103573 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/engines/ms-windows/Makefile.in 2007-11-27 05:24:54.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1620,19 +1397,18 @@ Index: gtk+-2.12.1/modules/engines/ms-windows/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/engines/ms-windows/Theme/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-11-18 01:23:37.423774171 +0100 -+++ gtk+-2.12.1/modules/engines/ms-windows/Theme/Makefile.in 2007-11-18 01:23:43.204103573 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-11-27 05:24:54.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1641,19 +1417,18 @@ Index: gtk+-2.12.1/modules/engines/ms-windows/Theme/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-11-18 01:23:37.367770979 +0100 -+++ gtk+-2.12.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-11-18 01:23:43.204103573 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/Makefile.in 2007-11-27 05:24:54.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1662,19 +1437,18 @@ Index: gtk+-2.12.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/engines/pixbuf/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/engines/pixbuf/Makefile.in 2007-11-18 01:23:37.351770067 +0100 -+++ gtk+-2.12.1/modules/engines/pixbuf/Makefile.in 2007-11-18 01:23:43.204103573 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.2/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.12.2.old/modules/engines/pixbuf/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/engines/pixbuf/Makefile.in 2007-11-27 05:24:55.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1683,19 +1457,18 @@ Index: gtk+-2.12.1/modules/engines/pixbuf/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/input/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/input/Makefile.in 2007-11-18 01:23:37.299767104 +0100 -+++ gtk+-2.12.1/modules/input/Makefile.in 2007-11-18 01:23:43.204103573 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/input/Makefile.in gtk+2.0-2.12.2/modules/input/Makefile.in +--- gtk+2.0-2.12.2.old/modules/input/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/input/Makefile.in 2007-11-27 05:24:55.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1704,15 +1477,15 @@ Index: gtk+-2.12.1/modules/input/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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 +433,10 @@ im_multipress_la_LIBADD = $(LDADDS) +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -431,9 +434,10 @@ imconffiledir = $(sysconfdir)/gtk-2.0 dist_imconffile_DATA = im-multipress.conf @@ -1724,7 +1497,7 @@ Index: gtk+-2.12.1/modules/input/Makefile.in module_LTLIBRARIES = \ $(IM_XIM_MODULE) \ -@@ -985,7 +989,18 @@ uninstall-local: +@@ -986,7 +990,18 @@ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -1744,11 +1517,10 @@ Index: gtk+-2.12.1/modules/input/Makefile.in @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -Index: gtk+-2.12.1/modules/printbackends/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/printbackends/Makefile.in 2007-11-18 01:23:37.283766192 +0100 -+++ gtk+-2.12.1/modules/printbackends/Makefile.in 2007-11-18 01:23:43.204103573 +0100 -@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/Makefile.in gtk+2.0-2.12.2/modules/Makefile.in +--- gtk+2.0-2.12.2.old/modules/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/Makefile.in 2007-11-27 05:24:54.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1757,19 +1529,18 @@ Index: gtk+-2.12.1/modules/printbackends/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -125,6 +127,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/printbackends/cups/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/printbackends/cups/Makefile.in 2007-11-18 01:23:37.223762773 +0100 -+++ gtk+-2.12.1/modules/printbackends/cups/Makefile.in 2007-11-18 01:23:43.204103573 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.2/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.12.2.old/modules/printbackends/cups/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/printbackends/cups/Makefile.in 2007-11-27 05:24:55.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1778,19 +1549,18 @@ Index: gtk+-2.12.1/modules/printbackends/cups/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/printbackends/file/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/printbackends/file/Makefile.in 2007-11-18 01:23:37.207761861 +0100 -+++ gtk+-2.12.1/modules/printbackends/file/Makefile.in 2007-11-18 01:23:43.208103801 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.2/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.12.2.old/modules/printbackends/file/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/printbackends/file/Makefile.in 2007-11-27 05:24:56.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1799,19 +1569,18 @@ Index: gtk+-2.12.1/modules/printbackends/file/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/printbackends/lpr/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/printbackends/lpr/Makefile.in 2007-11-18 01:23:37.151758669 +0100 -+++ gtk+-2.12.1/modules/printbackends/lpr/Makefile.in 2007-11-18 01:23:43.208103801 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.2/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.12.2.old/modules/printbackends/lpr/Makefile.in 2007-11-26 20:44:22.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/printbackends/lpr/Makefile.in 2007-11-27 05:24:56.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1820,19 +1589,18 @@ Index: gtk+-2.12.1/modules/printbackends/lpr/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/modules/printbackends/test/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/modules/printbackends/test/Makefile.in 2007-11-18 01:23:37.135757757 +0100 -+++ gtk+-2.12.1/modules/printbackends/test/Makefile.in 2007-11-18 01:23:43.208103801 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/Makefile.in gtk+2.0-2.12.2/modules/printbackends/Makefile.in +--- gtk+2.0-2.12.2.old/modules/printbackends/Makefile.in 2007-11-26 20:44:21.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/printbackends/Makefile.in 2007-11-27 05:24:55.000000000 +0100 +@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1841,19 +1609,18 @@ Index: gtk+-2.12.1/modules/printbackends/test/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/perf/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/perf/Makefile.in 2007-11-18 01:23:37.079754566 +0100 -+++ gtk+-2.12.1/perf/Makefile.in 2007-11-18 01:23:43.208103801 +0100 -@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -114,6 +116,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.2/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.12.2.old/modules/printbackends/test/Makefile.in 2007-11-26 20:44:22.000000000 +0100 ++++ gtk+2.0-2.12.2/modules/printbackends/test/Makefile.in 2007-11-27 05:24:56.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1862,19 +1629,18 @@ Index: gtk+-2.12.1/perf/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -123,6 +125,7 @@ GMOFILES = @GMOFILES@ - 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@ -Index: gtk+-2.12.1/tests/Makefile.in -=================================================================== ---- gtk+-2.12.1.orig/tests/Makefile.in 2007-11-18 01:23:37.067753882 +0100 -+++ gtk+-2.12.1/tests/Makefile.in 2007-11-18 01:23:43.208103801 +0100 -@@ -92,6 +92,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/perf/Makefile.in gtk+2.0-2.12.2/perf/Makefile.in +--- gtk+2.0-2.12.2.old/perf/Makefile.in 2007-11-26 20:44:22.000000000 +0100 ++++ gtk+2.0-2.12.2/perf/Makefile.in 2007-11-27 05:24:56.000000000 +0100 +@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1883,11 +1649,31 @@ Index: gtk+-2.12.1/tests/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -126,6 +128,7 @@ GMOFILES = @GMOFILES@ - 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@ +@@ -112,6 +114,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/tests/Makefile.in gtk+2.0-2.12.2/tests/Makefile.in +--- gtk+2.0-2.12.2.old/tests/Makefile.in 2007-11-26 20:44:22.000000000 +0100 ++++ gtk+2.0-2.12.2/tests/Makefile.in 2007-11-27 05:24:57.000000000 +0100 +@@ -92,6 +92,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -115,6 +117,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ diff --git a/debian/patches/071_fix_gdk_window_null_crasher.patch b/debian/patches/071_fix_gdk_window_null_crasher.patch index a0dd4cbd59..35726e0507 100644 --- a/debian/patches/071_fix_gdk_window_null_crasher.patch +++ b/debian/patches/071_fix_gdk_window_null_crasher.patch @@ -1,34 +1,21 @@ ---- gdk/gdkwindow.c.orig 2007-10-02 11:22:11.000000000 +0200 -+++ gtk+2.0-2.12.0/gdk/gdkwindow.c 2007-10-02 11:22:20.000000000 +0200 -@@ -609,18 +609,21 @@ gdk_window_get_parent (GdkWindow *window - GdkWindow* - gdk_window_get_toplevel (GdkWindow *window) - { - GdkWindowObject *obj; - +--- gdk/gdkwindow.c.old 2007-11-27 05:31:06.000000000 +0100 ++++ gtk+2.0-2.12.2/gdk/gdkwindow.c 2007-11-27 05:33:15.000000000 +0100 +@@ -614,9 +614,12 @@ g_return_val_if_fail (GDK_IS_WINDOW (window), NULL); obj = (GdkWindowObject *)window; - while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) + while (obj && GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) { obj = (GdkWindowObject *)obj->parent; +- + } + + g_return_val_if_fail (obj != NULL, NULL); - ++ return GDK_WINDOW (obj); } - /** - * gdk_window_get_children: - * @window: a #GdkWindow - * -@@ -2290,19 +2293,21 @@ gdk_window_update_idle (gpointer data) - return FALSE; - } - - static gboolean - gdk_window_is_toplevel_frozen (GdkWindow *window) +@@ -2295,9 +2298,11 @@ { GdkWindowObject *toplevel; @@ -41,17 +28,7 @@ } static void - gdk_window_schedule_update (GdkWindow *window) - { - if (window && - (GDK_WINDOW_OBJECT (window)->update_freeze_count || - gdk_window_is_toplevel_frozen (window))) -@@ -2428,16 +2433,19 @@ gdk_window_process_all_updates (void) - - update_windows = NULL; - update_idle = 0; - - g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL); +@@ -2433,6 +2438,9 @@ while (tmp_list) { @@ -60,9 +37,4 @@ + GdkWindowObject *private = (GdkWindowObject *)tmp_list->data; - if (private->update_freeze_count || - gdk_window_is_toplevel_frozen (tmp_list->data)) - update_windows = g_slist_prepend (update_windows, private); - else - gdk_window_process_updates_internal (tmp_list->data); - + if (!GDK_WINDOW_DESTROYED (tmp_list->data)) diff --git a/debian/patches/series b/debian/patches/series index b9d0aed55e..12f422a199 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,7 +14,6 @@ 030_gtkentry_password-char-circle.patch 031_gtksearchenginetracker_fixes.patch 033_treeview_resizing.patch -034_gtkcupsutils_type_fix.patch 040_filechooser_single-click.patch 041_ia32-libs.patch 042_treeview_single-focus.patch