path: root/patches/gtk+-2.14.7/generic/gtk+-2.14.7-autogen.diff

Only in gtk+-2.14.7: autom4te.cache
---
 Makefile.in                                 |    2 
 configure                                   |   78 ++++++++++++++--------------
 gdk/Makefile.in                             |    3 -
 gtk/Makefile.in                             |   10 +--
 modules/other/gail/libgail-util/Makefile.in |   18 +++---
 5 files changed, 55 insertions(+), 56 deletions(-)

Index: gtk+-2.14.7/configure
===================================================================
--- gtk+-2.14.7.orig/configure
+++ gtk+-2.14.7/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for gtk+ 2.14.7.
+# Generated by GNU Autoconf 2.63 for gtk+ 2.14.8.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
 #
@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gtk+'
 PACKAGE_TARNAME='gtk+'
-PACKAGE_VERSION='2.14.7'
-PACKAGE_STRING='gtk+ 2.14.7'
+PACKAGE_VERSION='2.14.8'
+PACKAGE_STRING='gtk+ 2.14.8'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B'
 
 ac_unique_file="gdk/gdktypes.h"
@@ -1739,7 +1739,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gtk+ 2.14.7 to adapt to many kinds of systems.
+\`configure' configures gtk+ 2.14.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1813,7 +1813,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gtk+ 2.14.7:";;
+     short | recursive ) echo "Configuration of gtk+ 2.14.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1962,7 +1962,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gtk+ configure 2.14.7
+gtk+ configure 2.14.8
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1976,7 +1976,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gtk+ $as_me 2.14.7, which was
+It was created by gtk+ $as_me 2.14.8, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2646,7 +2646,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gtk+'
- VERSION='2.14.7'
+ VERSION='2.14.8'
 
 
 # Some tools Automake needs.
@@ -2792,10 +2792,10 @@ ac_config_headers="$ac_config_headers co
 
 GTK_MAJOR_VERSION=2
 GTK_MINOR_VERSION=14
-GTK_MICRO_VERSION=7
-GTK_INTERFACE_AGE=7
-GTK_BINARY_AGE=1407
-GTK_VERSION=2.14.7
+GTK_MICRO_VERSION=8
+GTK_INTERFACE_AGE=8
+GTK_BINARY_AGE=1408
+GTK_VERSION=2.14.8
 GTK_API_VERSION=2.0
 GTK_BINARY_VERSION=2.10.0
 
@@ -2817,7 +2817,7 @@ GTK_BINARY_VERSION=2.10.0
 
 
 
-LT_VERSION_INFO="1400:7:1400"
+LT_VERSION_INFO="1400:8:1400"
 LT_CURRENT_MINUS_AGE=0
 
 
@@ -2838,7 +2838,7 @@ GAIL_LT_CURRENT_MINUS_AGE=18
 #
 GDK_PIXBUF_MAJOR=2
 GDK_PIXBUF_MINOR=14
-GDK_PIXBUF_MICRO=7
+GDK_PIXBUF_MICRO=8
 GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
 
 
@@ -9017,7 +9017,7 @@ EOF
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
   $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
@@ -9931,7 +9931,7 @@ else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
 need_lib_prefix=unknown
-hardcode_into_libs=no
+hardcode_into_libs="no"
 
 # when you set need_version to no, make sure it does not cause -set_version
 # flags to be left without arguments
@@ -11786,16 +11786,16 @@ shlibpath_overrides_runpath=$shlibpath_o
 hardcode_action=$hardcode_action
 
 # Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+hardcode_into_libs="no"
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+hardcode_libdir_flag_spec=""
 
 # If ld is used when linking, flag to hardcode \$libdir into
 # a binary during linking. This must work even if \$libdir does
 # not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+hardcode_libdir_flag_spec_ld=""
 
 # Whether we need a single -rpath flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
@@ -13933,7 +13933,7 @@ dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
 need_lib_prefix=unknown
-hardcode_into_libs=no
+hardcode_into_libs="no"
 
 # when you set need_version to no, make sure it does not cause -set_version
 # flags to be left without arguments
@@ -14867,16 +14867,16 @@ shlibpath_overrides_runpath=$shlibpath_o
 hardcode_action=$hardcode_action_CXX
 
 # Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+hardcode_into_libs="no"
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+hardcode_libdir_flag_spec=""
 
 # If ld is used when linking, flag to hardcode \$libdir into
 # a binary during linking. This must work even if \$libdir does
 # not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+hardcode_libdir_flag_spec_ld=""
 
 # Whether we need a single -rpath flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
@@ -15721,7 +15721,7 @@ EOF
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
   $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
@@ -16564,7 +16564,7 @@ dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
 need_lib_prefix=unknown
-hardcode_into_libs=no
+hardcode_into_libs="no"
 
 # when you set need_version to no, make sure it does not cause -set_version
 # flags to be left without arguments
@@ -17498,16 +17498,16 @@ shlibpath_overrides_runpath=$shlibpath_o
 hardcode_action=$hardcode_action_F77
 
 # Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+hardcode_into_libs="no"
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+hardcode_libdir_flag_spec=""
 
 # If ld is used when linking, flag to hardcode \$libdir into
 # a binary during linking. This must work even if \$libdir does
 # not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+hardcode_libdir_flag_spec_ld=""
 
 # Whether we need a single -rpath flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
@@ -18332,7 +18332,7 @@ EOF
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
   $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
@@ -19195,7 +19195,7 @@ dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
 need_lib_prefix=unknown
-hardcode_into_libs=no
+hardcode_into_libs="no"
 
 # when you set need_version to no, make sure it does not cause -set_version
 # flags to be left without arguments
@@ -20129,16 +20129,16 @@ shlibpath_overrides_runpath=$shlibpath_o
 hardcode_action=$hardcode_action_GCJ
 
 # Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+hardcode_into_libs="no"
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+hardcode_libdir_flag_spec=""
 
 # If ld is used when linking, flag to hardcode \$libdir into
 # a binary during linking. This must work even if \$libdir does
 # not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+hardcode_libdir_flag_spec_ld=""
 
 # Whether we need a single -rpath flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
@@ -20615,16 +20615,16 @@ shlibpath_overrides_runpath=$shlibpath_o
 hardcode_action=$hardcode_action_RC
 
 # Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+hardcode_into_libs="no"
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+hardcode_libdir_flag_spec=""
 
 # If ld is used when linking, flag to hardcode \$libdir into
 # a binary during linking. This must work even if \$libdir does
 # not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+hardcode_libdir_flag_spec_ld=""
 
 # Whether we need a single -rpath flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
@@ -33913,7 +33913,7 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG
 
 
 if test "x$gdktarget" = "xdirectfb"; then
-  DIRECTFB_REQUIRED_VERSION=0.9.24
+  DIRECTFB_REQUIRED_VERSION=1.0.0
   { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5
 $as_echo_n "checking for DirectFB... " >&6; }
 
@@ -36616,7 +36616,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gtk+ $as_me 2.14.7, which was
+This file was extended by gtk+ $as_me 2.14.8, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -36679,7 +36679,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-gtk+ config.status 2.14.7
+gtk+ config.status 2.14.8
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
Index: gtk+-2.14.7/gdk/Makefile.in
===================================================================
--- gtk+-2.14.7.orig/gdk/Makefile.in
+++ gtk+-2.14.7/gdk/Makefile.in
@@ -389,6 +389,7 @@ EXTRA_DIST = \
 	gdk.def 		\
 	gdkmarshalers.list	\
 	gdkmedialib.h		\
+	gdkwindowimpl.h		\
 	makeenums.pl		\
 	makefile.msc		\
 	gdk.symbols		\
@@ -502,8 +503,6 @@ gdk_built_public_sources = \
 
 
 gdk_built_private_headers = \
-	gdkprivate.h				\
-	gdkwindowimpl.h				\
 	gdkalias.h
 
 
Index: gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in
===================================================================
--- gtk+-2.14.7.orig/modules/other/gail/libgail-util/Makefile.in
+++ gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in
@@ -406,7 +406,7 @@ XVFB_START = \
 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
 	&& DISPLAY=:$$XID && export DISPLAY
 
-@OS_WIN32_TRUE@export_symbols = -export-symbols gailutil.def
+@OS_WIN32_TRUE@export_symbols = -export-symbols $(srcdir)/gailutil.def
 @OS_WIN32_TRUE@no_undefined = -no-undefined
 
 @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gailutil.lib
@@ -908,12 +908,12 @@ test-report perf-report full-report:	${T
 .PHONY: test test-report perf-report full-report
 # run make test as part of make check
 check-local: test
-@OS_WIN32_TRUE@install-libtool-import-lib:
-@OS_WIN32_TRUE@	$(INSTALL) .libs/libgailutil.dll.a $(DESTDIR)$(libdir)
-@OS_WIN32_TRUE@uninstall-libtool-import-lib:
-@OS_WIN32_TRUE@	-rm $(DESTDIR)$(libdir)/libgailutil.dll.a
-@OS_WIN32_FALSE@install-libtool-import-lib:
-@OS_WIN32_FALSE@uninstall-libtool-import-lib:
+@OS_WIN32_TRUE@install-def-file: gailutil.def
+@OS_WIN32_TRUE@	$(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir)
+@OS_WIN32_TRUE@uninstall-def-file:
+@OS_WIN32_TRUE@	-rm $(DESTDIR)$(libdir)/gailutil.def
+@OS_WIN32_FALSE@install-def-file:
+@OS_WIN32_FALSE@uninstall-def-file:
 
 @MS_LIB_AVAILABLE_TRUE@install-ms-lib:
 @MS_LIB_AVAILABLE_TRUE@	$(INSTALL) gailutil.lib $(DESTDIR)$(libdir)
@@ -926,9 +926,9 @@ check-local: test
 gailutil.lib: libgailutil.la gailutil.def
 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
 
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
 
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: uninstall-ms-lib uninstall-def-file
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: gtk+-2.14.7/gtk/Makefile.in
===================================================================
--- gtk+-2.14.7.orig/gtk/Makefile.in
+++ gtk+-2.14.7/gtk/Makefile.in
@@ -3226,11 +3226,11 @@ stamp-icons: $(STOCK_ICONS)
 	) done								\
 	&& touch stamp-icons
 
-gtkbuiltincache.h: @REBUILD@ stamp-icons
-	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
-	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
-	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
-	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+#gtkbuiltincache.h: @REBUILD@ stamp-icons
+#	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+#	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
+#	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+#	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
 
 install-data-local:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: gtk+-2.14.7/Makefile.in
===================================================================
--- gtk+-2.14.7.orig/Makefile.in
+++ gtk+-2.14.7/Makefile.in
@@ -516,7 +516,7 @@ XVFB_START = \
 	&& DISPLAY=:$$XID && export DISPLAY
 
 
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 
 # require automake 1.4