r24443 - in /desktop/experimental/gtk+2.0/debian: changelog libgtk2.0-0.symbols patches/070_mandatory-relibtoolize.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon May 31 08:20:50 UTC 2010
Author: slomo
Date: Mon May 31 08:20:42 2010
New Revision: 24443
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24443
Log:
* New upstream development release:
+ debian/rules,
debian/libgtk2.0-0.symbols:
- Update for new API symbols.
+ debian/patches/070_mandatory-relibtoolize.patch:
- Regenerated for the new version.
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=24443&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Mon May 31 08:20:42 2010
@@ -1,3 +1,14 @@
+gtk+2.0 (2.21.1-1) experimental; urgency=low
+
+ * New upstream development release:
+ + debian/rules,
+ debian/libgtk2.0-0.symbols:
+ - Update for new API symbols.
+ + debian/patches/070_mandatory-relibtoolize.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 31 May 2010 09:45:32 +0200
+
gtk+2.0 (2.21.0-1) experimental; urgency=low
* New upstream development release:
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.symbols?rev=24443&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] Mon May 31 08:20:42 2010
@@ -70,8 +70,14 @@
gdk_cursor_unref at Base 2.8.0
gdk_device_free_history at Base 2.8.0
gdk_device_get_axis at Base 2.8.0
+ gdk_device_get_axis_use at Base 2.21.1
gdk_device_get_core_pointer at Base 2.8.0
+ gdk_device_get_has_cursor at Base 2.21.1
gdk_device_get_history at Base 2.8.0
+ gdk_device_get_key at Base 2.21.1
+ gdk_device_get_mode at Base 2.21.1
+ gdk_device_get_name at Base 2.21.1
+ gdk_device_get_source at Base 2.21.1
gdk_device_get_state at Base 2.8.0
gdk_device_get_type at Base 2.8.0
gdk_device_set_axis_use at Base 2.8.0
@@ -127,7 +133,11 @@
gdk_drag_abort at Base 2.8.0
gdk_drag_action_get_type at Base 2.8.0
gdk_drag_begin at Base 2.8.0
+ gdk_drag_context_get_action at Base 2.21.1
+ gdk_drag_context_get_actions at Base 2.21.1
+ gdk_drag_context_get_suggested_action at Base 2.21.1
gdk_drag_context_get_type at Base 2.8.0
+ gdk_drag_context_list_targets at Base 2.21.1
gdk_drag_context_new at Base 2.8.0
gdk_drag_context_ref at Base 2.8.0
gdk_drag_context_unref at Base 2.8.0
@@ -273,9 +283,18 @@
gdk_grab_status_get_type at Base 2.8.0
gdk_gravity_get_type at Base 2.8.0
gdk_image_get at Base 2.8.0
+ gdk_image_get_bits_per_pixel at Base 2.21.1
+ gdk_image_get_byte_order at Base 2.21.1
+ gdk_image_get_bytes_per_line at Base 2.21.1
+ gdk_image_get_bytes_per_pixel at Base 2.21.1
gdk_image_get_colormap at Base 2.8.0
+ gdk_image_get_depth at Base 2.21.1
+ gdk_image_get_height at Base 2.21.1
+ gdk_image_get_image_type at Base 2.21.1
gdk_image_get_pixel at Base 2.8.0
gdk_image_get_type at Base 2.8.0
+ gdk_image_get_visual at Base 2.21.1
+ gdk_image_get_width at Base 2.21.1
gdk_image_new at Base 2.8.0
gdk_image_new_bitmap at Base 2.8.0
gdk_image_put_pixel at Base 2.8.0
@@ -524,9 +543,17 @@
gdk_visual_get_best_with_both at Base 2.8.0
gdk_visual_get_best_with_depth at Base 2.8.0
gdk_visual_get_best_with_type at Base 2.8.0
+ gdk_visual_get_bits_per_rgb at Base 2.21.1
+ gdk_visual_get_blue_pixel_details at Base 2.21.1
+ gdk_visual_get_byte_order at Base 2.21.1
+ gdk_visual_get_colormap_size at Base 2.21.1
+ gdk_visual_get_depth at Base 2.21.1
+ gdk_visual_get_green_pixel_details at Base 2.21.1
+ gdk_visual_get_red_pixel_details at Base 2.21.1
gdk_visual_get_screen at Base 2.8.0
gdk_visual_get_system at Base 2.8.0
gdk_visual_get_type at Base 2.8.0
+ gdk_visual_get_visual_type at Base 2.21.1
gdk_visual_type_get_type at Base 2.8.0
gdk_wcstombs at Base 2.8.0
gdk_window_add_filter at Base 2.8.0
@@ -543,8 +570,8 @@
gdk_window_clear_area_e at Base 2.8.0
gdk_window_configure_finished at Base 2.8.0
gdk_window_constrain_size at Base 2.8.0
- gdk_window_coords_from_parent at Base 2.21.0
- gdk_window_coords_to_parent at Base 2.21.0
+ gdk_window_coords_from_parent at Base 2.21.1
+ gdk_window_coords_to_parent at Base 2.21.1
gdk_window_deiconify at Base 2.8.0
gdk_window_destroy at Base 2.8.0
gdk_window_destroy_notify at Base 2.8.0
@@ -560,17 +587,23 @@
gdk_window_freeze_updates at Base 2.8.0
gdk_window_fullscreen at Base 2.8.0
gdk_window_geometry_changed at Base 2.18.0
+ gdk_window_get_accept_focus at Base 2.21.1
+ gdk_window_get_back_pixmap at Base 2.21.1
+ gdk_window_get_background at Base 2.21.1
gdk_window_get_children at Base 2.8.0
+ gdk_window_get_composited at Base 2.21.1
gdk_window_get_cursor at Base 2.18.0
gdk_window_get_decorations at Base 2.8.0
gdk_window_get_deskrelative_origin at Base 2.8.0
- gdk_window_get_effective_parent at Base 2.21.0
- gdk_window_get_effective_toplevel at Base 2.21.0
+ gdk_window_get_effective_parent at Base 2.21.1
+ gdk_window_get_effective_toplevel at Base 2.21.1
gdk_window_get_events at Base 2.8.0
+ gdk_window_get_focus_on_map at Base 2.21.1
gdk_window_get_frame_extents at Base 2.8.0
gdk_window_get_geometry at Base 2.8.0
gdk_window_get_group at Base 2.8.0
gdk_window_get_internal_paint_info at Base 2.8.0
+ gdk_window_get_modal_hint at Base 2.21.1
gdk_window_get_origin at Base 2.8.0
gdk_window_get_parent at Base 2.8.0
gdk_window_get_pointer at Base 2.8.0
@@ -595,6 +628,8 @@
gdk_window_invalidate_rect at Base 2.8.0
gdk_window_invalidate_region at Base 2.8.0
gdk_window_is_destroyed at Base 2.18.0
+ gdk_window_is_input_only at Base 2.21.1
+ gdk_window_is_shaped at Base 2.21.1
gdk_window_is_viewable at Base 2.8.0
gdk_window_is_visible at Base 2.8.0
gdk_window_lookup at Base 2.8.0
@@ -943,7 +978,7 @@
gtk_accelerator_valid at Base 2.8.0
gtk_accessible_connect_widget_destroyed at Base 2.8.0
gtk_accessible_get_type at Base 2.8.0
- gtk_accessible_get_widget at Base 2.21.0
+ gtk_accessible_get_widget at Base 2.21.1
gtk_action_activate at Base 2.8.0
gtk_action_block_activate at Base 2.16.0
gtk_action_block_activate_from at Base 2.8.0
@@ -1766,14 +1801,14 @@
gtk_entry_get_visibility at Base 2.8.0
gtk_entry_get_width_chars at Base 2.8.0
gtk_entry_icon_position_get_type at Base 2.16.0
- gtk_entry_im_context_filter_keypress at Base 2.21.0
+ gtk_entry_im_context_filter_keypress at Base 2.21.1
gtk_entry_layout_index_to_text_index at Base 2.8.0
gtk_entry_new at Base 2.8.0
gtk_entry_new_with_buffer at Base 2.18.0
gtk_entry_new_with_max_length at Base 2.8.0
gtk_entry_prepend_text at Base 2.8.0
gtk_entry_progress_pulse at Base 2.16.0
- gtk_entry_reset_im_context at Base 2.21.0
+ gtk_entry_reset_im_context at Base 2.21.1
gtk_entry_select_region at Base 2.8.0
gtk_entry_set_activates_default at Base 2.8.0
gtk_entry_set_alignment at Base 2.8.0
@@ -2126,7 +2161,9 @@
gtk_icon_view_get_dest_item_at_pos at Base 2.8.0
gtk_icon_view_get_drag_dest_item at Base 2.8.0
gtk_icon_view_get_item_at_pos at Base 2.8.0
+ gtk_icon_view_get_item_column at Base 2.21.1
gtk_icon_view_get_item_padding at Base 2.18.0
+ gtk_icon_view_get_item_row at Base 2.21.1
gtk_icon_view_get_item_width at Base 2.8.0
gtk_icon_view_get_margin at Base 2.8.0
gtk_icon_view_get_markup_column at Base 2.8.0
@@ -3847,7 +3884,7 @@
gtk_text_view_get_cursor_visible at Base 2.8.0
gtk_text_view_get_default_attributes at Base 2.8.0
gtk_text_view_get_editable at Base 2.8.0
- gtk_text_view_get_hadjustment at Base 2.21.0
+ gtk_text_view_get_hadjustment at Base 2.21.1
gtk_text_view_get_indent at Base 2.8.0
gtk_text_view_get_iter_at_location at Base 2.8.0
gtk_text_view_get_iter_at_position at Base 2.8.0
@@ -3863,18 +3900,18 @@
gtk_text_view_get_right_margin at Base 2.8.0
gtk_text_view_get_tabs at Base 2.8.0
gtk_text_view_get_type at Base 2.8.0
- gtk_text_view_get_vadjustment at Base 2.21.0
+ gtk_text_view_get_vadjustment at Base 2.21.1
gtk_text_view_get_visible_rect at Base 2.8.0
gtk_text_view_get_window at Base 2.8.0
gtk_text_view_get_window_type at Base 2.8.0
gtk_text_view_get_wrap_mode at Base 2.8.0
- gtk_text_view_im_context_filter_keypress at Base 2.21.0
+ gtk_text_view_im_context_filter_keypress at Base 2.21.1
gtk_text_view_move_child at Base 2.8.0
gtk_text_view_move_mark_onscreen at Base 2.8.0
gtk_text_view_move_visually at Base 2.8.0
gtk_text_view_new at Base 2.8.0
gtk_text_view_new_with_buffer at Base 2.8.0
- gtk_text_view_reset_im_context at Base 2.21.0
+ gtk_text_view_reset_im_context at Base 2.21.1
gtk_text_view_place_cursor_onscreen at Base 2.8.0
gtk_text_view_scroll_mark_onscreen at Base 2.8.0
gtk_text_view_scroll_to_iter at Base 2.8.0
@@ -4597,7 +4634,7 @@
gtk_widget_reset_rc_styles at Base 2.8.0
gtk_widget_reset_shapes at Base 2.8.0
gtk_widget_send_expose at Base 2.8.0
- gtk_widget_send_focus_change at Base 2.21.0
+ gtk_widget_send_focus_change at Base 2.21.1
gtk_widget_set at Base 2.8.0
gtk_widget_set_accel_path at Base 2.8.0
gtk_widget_set_allocation at Base 2.18.0
@@ -4701,6 +4738,7 @@
gtk_window_group_list_windows at Base 2.14.0
gtk_window_group_new at Base 2.8.0
gtk_window_group_remove_window at Base 2.8.0
+ gtk_window_has_group at Base 2.21.1
gtk_window_has_toplevel_focus at Base 2.8.0
gtk_window_iconify at Base 2.8.0
gtk_window_is_active at Base 2.8.0
Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=24443&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Mon May 31 08:20:42 2010
@@ -1,6 +1,6 @@
-diff -Naur gtk+2.0-2.21.0.old/aclocal.m4 gtk+2.0-2.21.0/aclocal.m4
---- gtk+2.0-2.21.0.old/aclocal.m4 2010-05-07 22:12:42.000000000 +0200
-+++ gtk+2.0-2.21.0/aclocal.m4 2010-05-08 08:30:03.060367356 +0200
+diff -Naur gtk+2.0-2.21.1.old/aclocal.m4 gtk+2.0-2.21.1/aclocal.m4
+--- gtk+2.0-2.21.1.old/aclocal.m4 2010-05-30 23:46:12.000000000 +0200
++++ gtk+2.0-2.21.1/aclocal.m4 2010-05-31 09:58:53.490457770 +0200
@@ -664,8017 +664,6 @@
fi])
@@ -8017,46 +8017,9 @@
-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+ # serial 1 (pkg-config-0.24)
#
- # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-@@ -8743,14 +732,16 @@
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- else
-- pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
-@@ -8794,9 +785,9 @@
- if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-@@ -9920,5 +1911,11 @@
+@@ -9922,5 +1911,11 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
@@ -8068,9 +8031,9 @@
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
m4_include([acinclude.m4])
-diff -Naur gtk+2.0-2.21.0.old/build/Makefile.in gtk+2.0-2.21.0/build/Makefile.in
---- gtk+2.0-2.21.0.old/build/Makefile.in 2010-05-07 22:12:46.000000000 +0200
-+++ gtk+2.0-2.21.0/build/Makefile.in 2010-05-08 08:30:05.920337406 +0200
+diff -Naur gtk+2.0-2.21.1.old/build/Makefile.in gtk+2.0-2.21.1/build/Makefile.in
+--- gtk+2.0-2.21.1.old/build/Makefile.in 2010-05-30 23:46:16.000000000 +0200
++++ gtk+2.0-2.21.1/build/Makefile.in 2010-05-31 09:58:57.083445423 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build
@@ -8096,9 +8059,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/build/win32/Makefile.in gtk+2.0-2.21.0/build/win32/Makefile.in
---- gtk+2.0-2.21.0.old/build/win32/Makefile.in 2010-05-07 22:12:46.000000000 +0200
-+++ gtk+2.0-2.21.0/build/win32/Makefile.in 2010-05-08 08:30:05.996337781 +0200
+diff -Naur gtk+2.0-2.21.1.old/build/win32/Makefile.in gtk+2.0-2.21.1/build/win32/Makefile.in
+--- gtk+2.0-2.21.1.old/build/win32/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/build/win32/Makefile.in 2010-05-31 09:58:57.171445437 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32
@@ -8124,9 +8087,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/build/win32/vs9/Makefile.in gtk+2.0-2.21.0/build/win32/vs9/Makefile.in
---- gtk+2.0-2.21.0.old/build/win32/vs9/Makefile.in 2010-05-07 22:12:46.000000000 +0200
-+++ gtk+2.0-2.21.0/build/win32/vs9/Makefile.in 2010-05-08 08:30:06.072339616 +0200
+diff -Naur gtk+2.0-2.21.1.old/build/win32/vs9/Makefile.in gtk+2.0-2.21.1/build/win32/vs9/Makefile.in
+--- gtk+2.0-2.21.1.old/build/win32/vs9/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/build/win32/vs9/Makefile.in 2010-05-31 09:58:57.247444486 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32/vs9
@@ -8152,9 +8115,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/configure gtk+2.0-2.21.0/configure
---- gtk+2.0-2.21.0.old/configure 2010-05-07 22:12:54.000000000 +0200
-+++ gtk+2.0-2.21.0/configure 2010-05-08 08:30:04.605338082 +0200
+diff -Naur gtk+2.0-2.21.1.old/configure gtk+2.0-2.21.1/configure
+--- gtk+2.0-2.21.1.old/configure 2010-05-30 23:46:24.000000000 +0200
++++ gtk+2.0-2.21.1/configure 2010-05-31 09:58:55.518444355 +0200
@@ -816,6 +816,7 @@
GDK_DEP_LIBS
GDK_EXTRA_CFLAGS
@@ -8163,7 +8126,7 @@
GDK_PACKAGES
USE_DIRECTFB_FALSE
USE_DIRECTFB_TRUE
-@@ -1024,6 +1025,8 @@
+@@ -1026,6 +1027,8 @@
CXXFLAGS
ac_ct_CXX
CXX
@@ -8172,7 +8135,7 @@
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-@@ -1147,6 +1150,10 @@
+@@ -1149,6 +1152,10 @@
enable_shm
enable_xkb
enable_xinerama
@@ -8183,7 +8146,7 @@
enable_rebuilds
enable_visibility
with_xinput
-@@ -1837,6 +1844,12 @@
+@@ -1841,6 +1848,12 @@
--enable-xkb support XKB [default=maybe]
--enable-xinerama support xinerama extension if available
[default=yes]
@@ -8196,7 +8159,7 @@
--disable-rebuilds disable all source autogeneration rules
--disable-visibility don't use ELF visibility attributes
--enable-explicit-deps=[yes/no/auto]
-@@ -4586,6 +4599,14 @@
+@@ -4594,6 +4607,14 @@
@@ -8211,24 +8174,24 @@
if test -n "$ac_tool_prefix"; then
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-@@ -6066,13 +6087,13 @@
+@@ -6074,13 +6095,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6069: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6090: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:6077: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6098: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6072: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6093: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:6080: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6101: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6075: output\"" >&5)
-+ (eval echo "\"\$as_me:6096: output\"" >&5)
+- (eval echo "\"\$as_me:6083: output\"" >&5)
++ (eval echo "\"\$as_me:6104: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6535,11 +6556,11 @@
+@@ -6543,11 +6564,11 @@
;;
# This must be Linux ELF.
@@ -8242,16 +8205,16 @@
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
-@@ -7275,7 +7296,7 @@
+@@ -7283,7 +7304,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7278 "configure"' > conftest.$ac_ext
-+ echo '#line 7299 "configure"' > conftest.$ac_ext
+- echo '#line 7286 "configure"' > conftest.$ac_ext
++ echo '#line 7307 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9270,6 +9291,10 @@
+@@ -9278,6 +9299,10 @@
$RM -r conftest*
@@ -8262,21 +8225,21 @@
if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-@@ -9295,11 +9320,11 @@
+@@ -9303,11 +9328,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:9298: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9323: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9306: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9331: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9302: \$? = $ac_status" >&5
-+ echo "$as_me:9327: \$? = $ac_status" >&5
+- echo "$as_me:9310: \$? = $ac_status" >&5
++ echo "$as_me:9335: \$? = $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.
-@@ -9464,7 +9489,7 @@
+@@ -9472,7 +9497,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -8285,49 +8248,49 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -9634,11 +9659,11 @@
+@@ -9642,11 +9667,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:9637: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9662: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9645: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9670: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9641: \$? = $ac_status" >&5
-+ echo "$as_me:9666: \$? = $ac_status" >&5
+- echo "$as_me:9649: \$? = $ac_status" >&5
++ echo "$as_me:9674: \$? = $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.
-@@ -9739,11 +9764,11 @@
+@@ -9747,11 +9772,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:9742: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9767: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9750: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9746: \$? = $ac_status" >&5
-+ echo "$as_me:9771: \$? = $ac_status" >&5
+- echo "$as_me:9754: \$? = $ac_status" >&5
++ echo "$as_me:9779: \$? = $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
-@@ -9794,11 +9819,11 @@
+@@ -9802,11 +9827,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:9797: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9822: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9805: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9830: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9801: \$? = $ac_status" >&5
-+ echo "$as_me:9826: \$? = $ac_status" >&5
+- echo "$as_me:9809: \$? = $ac_status" >&5
++ echo "$as_me:9834: \$? = $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
-@@ -9913,6 +9938,9 @@
+@@ -9921,6 +9946,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -8337,7 +8300,7 @@
esac
ld_shlibs=yes
-@@ -9934,6 +9962,7 @@
+@@ -9942,6 +9970,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -8345,7 +8308,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10025,7 +10054,7 @@
+@@ -10033,7 +10062,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -8354,7 +8317,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10095,7 +10124,7 @@
+@@ -10103,7 +10132,7 @@
fi
;;
@@ -8363,7 +8326,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10270,6 +10299,7 @@
+@@ -10278,6 +10307,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -8371,7 +8334,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10596,7 +10626,7 @@
+@@ -10604,7 +10634,7 @@
link_all_deplibs=yes
;;
@@ -8380,7 +8343,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11486,7 +11516,7 @@
+@@ -11494,7 +11524,7 @@
;;
# This must be Linux ELF.
@@ -8389,7 +8352,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11526,13 +11556,10 @@
+@@ -11534,13 +11564,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -8404,7 +8367,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11544,6 +11571,18 @@
+@@ -11552,6 +11579,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8423,25 +8386,25 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12164,7 +12203,7 @@
+@@ -12172,7 +12211,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12167 "configure"
-+#line 12206 "configure"
+-#line 12175 "configure"
++#line 12214 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12260,7 +12299,7 @@
+@@ -12268,7 +12307,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12263 "configure"
-+#line 12302 "configure"
+-#line 12271 "configure"
++#line 12310 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13200,7 +13239,7 @@
+@@ -13208,7 +13247,7 @@
inherit_rpath_CXX=yes
;;
@@ -8450,7 +8413,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -14028,7 +14067,7 @@
+@@ -14036,7 +14075,7 @@
;;
esac
;;
@@ -8459,7 +8422,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -14092,7 +14131,7 @@
+@@ -14100,7 +14139,7 @@
;;
esac
;;
@@ -8468,49 +8431,49 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14216,11 +14255,11 @@
+@@ -14224,11 +14263,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:14219: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14258: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14227: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14266: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14223: \$? = $ac_status" >&5
-+ echo "$as_me:14262: \$? = $ac_status" >&5
+- echo "$as_me:14231: \$? = $ac_status" >&5
++ echo "$as_me:14270: \$? = $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.
-@@ -14315,11 +14354,11 @@
+@@ -14323,11 +14362,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:14318: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14357: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14326: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14365: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14322: \$? = $ac_status" >&5
-+ echo "$as_me:14361: \$? = $ac_status" >&5
+- echo "$as_me:14330: \$? = $ac_status" >&5
++ echo "$as_me:14369: \$? = $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
-@@ -14367,11 +14406,11 @@
+@@ -14375,11 +14414,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:14370: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14409: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14378: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14417: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14374: \$? = $ac_status" >&5
-+ echo "$as_me:14413: \$? = $ac_status" >&5
+- echo "$as_me:14382: \$? = $ac_status" >&5
++ echo "$as_me:14421: \$? = $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
-@@ -14443,6 +14482,9 @@
+@@ -14451,6 +14490,9 @@
cygwin* | mingw* | cegcc*)
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'
;;
@@ -8520,7 +8483,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14942,7 +14984,7 @@
+@@ -14950,7 +14992,7 @@
;;
# This must be Linux ELF.
@@ -8529,7 +8492,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14982,13 +15024,10 @@
+@@ -14990,13 +15032,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -8544,7 +8507,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15000,6 +15039,18 @@
+@@ -15008,6 +15047,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8563,7 +8526,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17571,6 +17622,26 @@
+@@ -17579,6 +17630,26 @@
enable_xinerama="yes"
fi
@@ -8590,131 +8553,7 @@
# Check whether --enable-rebuilds was given.
if test "${enable_rebuilds+set}" = set; then :
enableval=$enable_rebuilds;
-@@ -18772,10 +18843,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASE_DEPENDENCIES" >&5
- $as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
-
--if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 2>&5
- ac_status=$?
-@@ -18785,13 +18857,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$BASE_DEPENDENCIES_LIBS"; then
-- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 2>&5
- ac_status=$?
-@@ -18801,8 +18875,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18815,9 +18890,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>&1`
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6"`
- else
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>&1`
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-@@ -18869,10 +18944,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_BACKEND" >&5
- $as_echo_n "checking for CAIRO_BACKEND... " >&6; }
-
--if test -n "$CAIRO_BACKEND_CFLAGS"; then
-- pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$CAIRO_BACKEND_CFLAGS"; then
-+ pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
- ac_status=$?
-@@ -18882,13 +18958,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$CAIRO_BACKEND_LIBS"; then
-- pkg_cv_CAIRO_BACKEND_LIBS="$CAIRO_BACKEND_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$CAIRO_BACKEND_LIBS"; then
-+ pkg_cv_CAIRO_BACKEND_LIBS="$CAIRO_BACKEND_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
- ac_status=$?
-@@ -18898,8 +18976,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -18912,9 +18991,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
-+ CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-$cairo_backend >= 1.6"`
- else
-- CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
-+ CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-$cairo_backend >= 1.6"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$CAIRO_BACKEND_PKG_ERRORS" >&5
-@@ -24018,7 +24097,8 @@
+@@ -24038,7 +24109,8 @@
# Check for the RANDR extension
@@ -8724,7 +8563,7 @@
$as_echo "#define HAVE_RANDR 1" >>confdefs.h
-@@ -24038,7 +24118,8 @@
+@@ -24058,7 +24130,8 @@
# Checks for XFixes extension
@@ -8734,7 +8573,7 @@
$as_echo "#define HAVE_XFIXES 1" >>confdefs.h
-@@ -24049,7 +24130,8 @@
+@@ -24069,7 +24142,8 @@
# Checks for Xcomposite extension
@@ -8744,7 +8583,7 @@
$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
-@@ -24060,7 +24142,7 @@
+@@ -24080,7 +24154,7 @@
# Checks for Xdamage extension
@@ -8753,69 +8592,7 @@
$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
-@@ -24176,10 +24258,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
- $as_echo_n "checking for DIRECTFB... " >&6; }
-
--if test -n "$DIRECTFB_CFLAGS"; then
-- pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DIRECTFB_CFLAGS"; then
-+ pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -24189,13 +24272,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$DIRECTFB_LIBS"; then
-- pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$DIRECTFB_LIBS"; then
-+ pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -24205,8 +24290,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -24219,9 +24305,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
-+ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION"`
- else
-- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
-+ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$DIRECTFB_PKG_ERRORS" >&5
-@@ -24342,20 +24428,23 @@
+@@ -24365,20 +24439,23 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
@@ -8844,7 +8621,7 @@
fi
-@@ -24365,6 +24454,7 @@
+@@ -24388,6 +24465,7 @@
@@ -8852,7 +8629,7 @@
########################################
# Check for Accessibility Toolkit flags
########################################
-@@ -24439,7 +24529,7 @@
+@@ -24462,7 +24540,7 @@
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
if test $enable_explicit_deps != yes ; then
@@ -8861,7 +8638,7 @@
fi
-@@ -25670,6 +25760,10 @@
+@@ -25693,6 +25771,10 @@
as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -8872,9 +8649,9 @@
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff -Naur gtk+2.0-2.21.0.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.21.0/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.21.0.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-05-07 22:12:46.000000000 +0200
-+++ gtk+2.0-2.21.0/contrib/gdk-pixbuf-xlib/Makefile.in 2010-05-08 08:30:06.308337761 +0200
+diff -Naur gtk+2.0-2.21.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.21.1/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.21.1.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/contrib/gdk-pixbuf-xlib/Makefile.in 2010-05-31 09:58:57.555445843 +0200
@@ -44,11 +44,14 @@
$(top_srcdir)/Makefile.decl ChangeLog
subdir = contrib/gdk-pixbuf-xlib
@@ -8900,9 +8677,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/contrib/Makefile.in gtk+2.0-2.21.0/contrib/Makefile.in
---- gtk+2.0-2.21.0.old/contrib/Makefile.in 2010-05-07 22:12:46.000000000 +0200
-+++ gtk+2.0-2.21.0/contrib/Makefile.in 2010-05-08 08:30:06.160337663 +0200
+diff -Naur gtk+2.0-2.21.1.old/contrib/Makefile.in gtk+2.0-2.21.1/contrib/Makefile.in
+--- gtk+2.0-2.21.1.old/contrib/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/contrib/Makefile.in 2010-05-31 09:58:57.351444581 +0200
@@ -40,11 +40,14 @@
@USE_X11_TRUE at am__append_1 = gdk-pixbuf-xlib
subdir = contrib
@@ -8928,9 +8705,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/demos/gtk-demo/Makefile.in gtk+2.0-2.21.0/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.21.0.old/demos/gtk-demo/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/demos/gtk-demo/Makefile.in 2010-05-08 08:30:06.524337499 +0200
+diff -Naur gtk+2.0-2.21.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.21.1/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.21.1.old/demos/gtk-demo/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/demos/gtk-demo/Makefile.in 2010-05-31 09:58:57.827444602 +0200
@@ -42,11 +42,14 @@
bin_PROGRAMS = gtk-demo$(EXEEXT)
subdir = demos/gtk-demo
@@ -8956,9 +8733,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/demos/Makefile.in gtk+2.0-2.21.0/demos/Makefile.in
---- gtk+2.0-2.21.0.old/demos/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/demos/Makefile.in 2010-05-08 08:30:06.420337547 +0200
+diff -Naur gtk+2.0-2.21.1.old/demos/Makefile.in gtk+2.0-2.21.1/demos/Makefile.in
+--- gtk+2.0-2.21.1.old/demos/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/demos/Makefile.in 2010-05-31 09:58:57.695444367 +0200
@@ -46,11 +46,14 @@
@HAVE_PNG_TRUE at am__append_1 = testpixbuf
subdir = demos
@@ -8984,9 +8761,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/faq/Makefile.in gtk+2.0-2.21.0/docs/faq/Makefile.in
---- gtk+2.0-2.21.0.old/docs/faq/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/faq/Makefile.in 2010-05-08 08:30:06.676337532 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/faq/Makefile.in gtk+2.0-2.21.1/docs/faq/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/faq/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/docs/faq/Makefile.in 2010-05-31 09:58:58.023445409 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/faq
@@ -9012,9 +8789,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/Makefile.in gtk+2.0-2.21.0/docs/Makefile.in
---- gtk+2.0-2.21.0.old/docs/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/Makefile.in 2010-05-08 08:30:06.600337237 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/Makefile.in gtk+2.0-2.21.1/docs/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/docs/Makefile.in 2010-05-31 09:58:57.927445089 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs
@@ -9040,9 +8817,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/reference/gdk/Makefile.in gtk+2.0-2.21.0/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.21.0.old/docs/reference/gdk/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/reference/gdk/Makefile.in 2010-05-08 08:30:06.952337496 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.21.1/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/reference/gdk/Makefile.in 2010-05-30 23:46:18.000000000 +0200
++++ gtk+2.0-2.21.1/docs/reference/gdk/Makefile.in 2010-05-31 09:58:58.343444471 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gdk
@@ -9068,9 +8845,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.21.0/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.21.0.old/docs/reference/gdk-pixbuf/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/reference/gdk-pixbuf/Makefile.in 2010-05-08 08:30:06.864338525 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.21.1/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/reference/gdk-pixbuf/Makefile.in 2010-05-30 23:46:18.000000000 +0200
++++ gtk+2.0-2.21.1/docs/reference/gdk-pixbuf/Makefile.in 2010-05-31 09:58:58.239445702 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gdk-pixbuf
@@ -9096,9 +8873,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/reference/gtk/Makefile.in gtk+2.0-2.21.0/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.21.0.old/docs/reference/gtk/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/reference/gtk/Makefile.in 2010-05-08 08:30:07.056338214 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/reference/gtk/Makefile.in gtk+2.0-2.21.1/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/reference/gtk/Makefile.in 2010-05-30 23:46:18.000000000 +0200
++++ gtk+2.0-2.21.1/docs/reference/gtk/Makefile.in 2010-05-31 09:58:58.471447256 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gtk
@@ -9124,9 +8901,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.21.0/docs/reference/libgail-util/Makefile.in
---- gtk+2.0-2.21.0.old/docs/reference/libgail-util/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/reference/libgail-util/Makefile.in 2010-05-08 08:30:07.144337866 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.21.1/docs/reference/libgail-util/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/reference/libgail-util/Makefile.in 2010-05-30 23:46:18.000000000 +0200
++++ gtk+2.0-2.21.1/docs/reference/libgail-util/Makefile.in 2010-05-31 09:58:58.571444943 +0200
@@ -45,11 +45,14 @@
$(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make
subdir = docs/reference/libgail-util
@@ -9152,9 +8929,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/reference/Makefile.in gtk+2.0-2.21.0/docs/reference/Makefile.in
---- gtk+2.0-2.21.0.old/docs/reference/Makefile.in 2010-05-07 22:12:47.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/reference/Makefile.in 2010-05-08 08:30:06.756338135 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/reference/Makefile.in gtk+2.0-2.21.1/docs/reference/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/reference/Makefile.in 2010-05-30 23:46:17.000000000 +0200
++++ gtk+2.0-2.21.1/docs/reference/Makefile.in 2010-05-31 09:58:58.119444901 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
subdir = docs/reference
@@ -9180,9 +8957,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/tools/Makefile.in gtk+2.0-2.21.0/docs/tools/Makefile.in
---- gtk+2.0-2.21.0.old/docs/tools/Makefile.in 2010-05-07 22:12:48.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/tools/Makefile.in 2010-05-08 08:30:07.240337705 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/tools/Makefile.in gtk+2.0-2.21.1/docs/tools/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/tools/Makefile.in 2010-05-30 23:46:18.000000000 +0200
++++ gtk+2.0-2.21.1/docs/tools/Makefile.in 2010-05-31 09:58:58.679444358 +0200
@@ -41,11 +41,14 @@
@USE_X11_TRUE at noinst_PROGRAMS = doc-shooter$(EXEEXT)
subdir = docs/tools
@@ -9208,9 +8985,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/docs/tutorial/Makefile.in gtk+2.0-2.21.0/docs/tutorial/Makefile.in
---- gtk+2.0-2.21.0.old/docs/tutorial/Makefile.in 2010-05-07 22:12:48.000000000 +0200
-+++ gtk+2.0-2.21.0/docs/tutorial/Makefile.in 2010-05-08 08:30:07.316338079 +0200
+diff -Naur gtk+2.0-2.21.1.old/docs/tutorial/Makefile.in gtk+2.0-2.21.1/docs/tutorial/Makefile.in
+--- gtk+2.0-2.21.1.old/docs/tutorial/Makefile.in 2010-05-30 23:46:18.000000000 +0200
++++ gtk+2.0-2.21.1/docs/tutorial/Makefile.in 2010-05-31 09:58:58.771446071 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/tutorial
@@ -9236,9 +9013,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk/directfb/Makefile.in gtk+2.0-2.21.0/gdk/directfb/Makefile.in
---- gtk+2.0-2.21.0.old/gdk/directfb/Makefile.in 2010-05-07 22:12:48.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk/directfb/Makefile.in 2010-05-08 08:30:10.692337530 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk/directfb/Makefile.in gtk+2.0-2.21.1/gdk/directfb/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk/directfb/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk/directfb/Makefile.in 2010-05-31 09:58:59.635447634 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
subdir = gdk/directfb
@@ -9264,9 +9041,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk/Makefile.in gtk+2.0-2.21.0/gdk/Makefile.in
---- gtk+2.0-2.21.0.old/gdk/Makefile.in 2010-05-07 22:12:48.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk/Makefile.in 2010-05-08 08:30:10.592337882 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk/Makefile.in gtk+2.0-2.21.1/gdk/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk/Makefile.in 2010-05-31 09:58:59.483447104 +0200
@@ -45,11 +45,14 @@
@HAVE_INTROSPECTION_TRUE at am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
subdir = gdk
@@ -9292,9 +9069,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk/quartz/Makefile.in gtk+2.0-2.21.0/gdk/quartz/Makefile.in
---- gtk+2.0-2.21.0.old/gdk/quartz/Makefile.in 2010-05-07 22:12:49.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk/quartz/Makefile.in 2010-05-08 08:30:10.796337485 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk/quartz/Makefile.in gtk+2.0-2.21.1/gdk/quartz/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk/quartz/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk/quartz/Makefile.in 2010-05-31 09:58:59.767446330 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/quartz
@@ -9320,9 +9097,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk/tests/Makefile.in gtk+2.0-2.21.0/gdk/tests/Makefile.in
---- gtk+2.0-2.21.0.old/gdk/tests/Makefile.in 2010-05-07 22:12:49.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk/tests/Makefile.in 2010-05-08 08:30:10.880337761 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk/tests/Makefile.in gtk+2.0-2.21.1/gdk/tests/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk/tests/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk/tests/Makefile.in 2010-05-31 09:58:59.871445656 +0200
@@ -41,11 +41,14 @@
TESTS = $(am__EXEEXT_1)
subdir = gdk/tests
@@ -9348,9 +9125,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk/win32/Makefile.in gtk+2.0-2.21.0/gdk/win32/Makefile.in
---- gtk+2.0-2.21.0.old/gdk/win32/Makefile.in 2010-05-07 22:12:49.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk/win32/Makefile.in 2010-05-08 08:30:11.004338026 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk/win32/Makefile.in gtk+2.0-2.21.1/gdk/win32/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk/win32/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk/win32/Makefile.in 2010-05-31 09:59:00.011447237 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32
@@ -9376,9 +9153,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk/win32/rc/Makefile.in gtk+2.0-2.21.0/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.21.0.old/gdk/win32/rc/Makefile.in 2010-05-07 22:12:49.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk/win32/rc/Makefile.in 2010-05-08 08:30:11.096338332 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk/win32/rc/Makefile.in gtk+2.0-2.21.1/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk/win32/rc/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk/win32/rc/Makefile.in 2010-05-31 09:59:00.115444811 +0200
@@ -40,11 +40,14 @@
$(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32/rc
@@ -9404,9 +9181,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk/x11/Makefile.in gtk+2.0-2.21.0/gdk/x11/Makefile.in
---- gtk+2.0-2.21.0.old/gdk/x11/Makefile.in 2010-05-07 22:12:49.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk/x11/Makefile.in 2010-05-08 08:30:11.232337944 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk/x11/Makefile.in gtk+2.0-2.21.1/gdk/x11/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk/x11/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk/x11/Makefile.in 2010-05-31 09:59:00.275445951 +0200
@@ -46,11 +46,14 @@
TESTS = checksettings$(EXEEXT)
subdir = gdk/x11
@@ -9432,9 +9209,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gdk-pixbuf/Makefile.in gtk+2.0-2.21.0/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.21.0.old/gdk-pixbuf/Makefile.in 2010-05-07 22:12:48.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk-pixbuf/Makefile.in 2010-05-08 08:30:08.269337413 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.21.1/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk-pixbuf/Makefile.in 2010-05-30 23:46:18.000000000 +0200
++++ gtk+2.0-2.21.1/gdk-pixbuf/Makefile.in 2010-05-31 09:58:59.107444981 +0200
@@ -51,11 +51,14 @@
@HAVE_INTROSPECTION_TRUE at am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
subdir = gdk-pixbuf
@@ -9460,7 +9237,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -999,6 +1003,7 @@
+@@ -1001,6 +1005,7 @@
libgdk_pixbuf-2.0.la
loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
@@ -9468,7 +9245,7 @@
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
#
-@@ -1356,7 +1361,7 @@
+@@ -1358,7 +1363,7 @@
$(GDK_PIXBUF_DEP_CFLAGS) \
-DGDK_PIXBUF_ENABLE_BACKEND
@@ -9477,9 +9254,9 @@
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
test_gdk_pixbuf_LDADD = $(LDADDS)
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-diff -Naur gtk+2.0-2.21.0.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.21.0/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.21.0.old/gdk-pixbuf/pixops/Makefile.in 2010-05-07 22:12:48.000000000 +0200
-+++ gtk+2.0-2.21.0/gdk-pixbuf/pixops/Makefile.in 2010-05-08 08:30:09.000338567 +0200
+diff -Naur gtk+2.0-2.21.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.21.1/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.21.1.old/gdk-pixbuf/pixops/Makefile.in 2010-05-30 23:46:19.000000000 +0200
++++ gtk+2.0-2.21.1/gdk-pixbuf/pixops/Makefile.in 2010-05-31 09:58:59.251445273 +0200
@@ -42,11 +42,14 @@
noinst_PROGRAMS = timescale$(EXEEXT)
subdir = gdk-pixbuf/pixops
@@ -9505,9 +9282,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gtk/Makefile.in gtk+2.0-2.21.0/gtk/Makefile.in
---- gtk+2.0-2.21.0.old/gtk/Makefile.in 2010-05-07 22:12:49.000000000 +0200
-+++ gtk+2.0-2.21.0/gtk/Makefile.in 2010-05-08 08:30:11.688338705 +0200
+diff -Naur gtk+2.0-2.21.1.old/gtk/Makefile.in gtk+2.0-2.21.1/gtk/Makefile.in
+--- gtk+2.0-2.21.1.old/gtk/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/gtk/Makefile.in 2010-05-31 09:59:00.695447649 +0200
@@ -77,11 +77,14 @@
subdir = gtk
@@ -9533,7 +9310,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -988,6 +992,8 @@
+@@ -990,6 +994,8 @@
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
@@ -9542,7 +9319,7 @@
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -1101,17 +1107,21 @@
+@@ -1103,17 +1109,21 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -9572,9 +9349,9 @@
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
gtkrbtree.h gtkrecentchooserdefault.h \
-diff -Naur gtk+2.0-2.21.0.old/gtk/tests/Makefile.in gtk+2.0-2.21.0/gtk/tests/Makefile.in
---- gtk+2.0-2.21.0.old/gtk/tests/Makefile.in 2010-05-07 22:12:49.000000000 +0200
-+++ gtk+2.0-2.21.0/gtk/tests/Makefile.in 2010-05-08 08:30:11.860337456 +0200
+diff -Naur gtk+2.0-2.21.1.old/gtk/tests/Makefile.in gtk+2.0-2.21.1/gtk/tests/Makefile.in
+--- gtk+2.0-2.21.1.old/gtk/tests/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/gtk/tests/Makefile.in 2010-05-31 09:59:00.843446217 +0200
@@ -42,11 +42,14 @@
@OS_UNIX_TRUE at am__append_1 = defaultvalue
subdir = gtk/tests
@@ -9600,9 +9377,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/gtk/theme-bits/Makefile.in gtk+2.0-2.21.0/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.21.0.old/gtk/theme-bits/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/gtk/theme-bits/Makefile.in 2010-05-08 08:30:11.976337403 +0200
+diff -Naur gtk+2.0-2.21.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.21.1/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.21.1.old/gtk/theme-bits/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/gtk/theme-bits/Makefile.in 2010-05-31 09:59:00.963444704 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = decompose-bits$(EXEEXT)
subdir = gtk/theme-bits
@@ -9628,9 +9405,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/ltmain.sh gtk+2.0-2.21.0/ltmain.sh
---- gtk+2.0-2.21.0.old/ltmain.sh 2010-05-03 18:48:37.000000000 +0200
-+++ gtk+2.0-2.21.0/ltmain.sh 2010-05-08 08:29:57.961340456 +0200
+diff -Naur gtk+2.0-2.21.1.old/ltmain.sh gtk+2.0-2.21.1/ltmain.sh
+--- gtk+2.0-2.21.1.old/ltmain.sh 2010-05-01 09:19:03.000000000 +0200
++++ gtk+2.0-2.21.1/ltmain.sh 2010-05-31 09:58:47.311446339 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -9709,9 +9486,9 @@
esac
;;
no)
-diff -Naur gtk+2.0-2.21.0.old/m4/gtk-doc.m4 gtk+2.0-2.21.0/m4/gtk-doc.m4
---- gtk+2.0-2.21.0.old/m4/gtk-doc.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.0/m4/gtk-doc.m4 2010-05-08 08:29:58.501410075 +0200
+diff -Naur gtk+2.0-2.21.1.old/m4/gtk-doc.m4 gtk+2.0-2.21.1/m4/gtk-doc.m4
+--- gtk+2.0-2.21.1.old/m4/gtk-doc.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.21.1/m4/gtk-doc.m4 2010-05-31 09:58:47.918448276 +0200
@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
@@ -9774,9 +9551,9 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])
-diff -Naur gtk+2.0-2.21.0.old/m4/libtool.m4 gtk+2.0-2.21.0/m4/libtool.m4
---- gtk+2.0-2.21.0.old/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.0/m4/libtool.m4 2010-05-08 08:29:58.065354093 +0200
+diff -Naur gtk+2.0-2.21.1.old/m4/libtool.m4 gtk+2.0-2.21.1/m4/libtool.m4
+--- gtk+2.0-2.21.1.old/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.21.1/m4/libtool.m4 2010-05-31 09:58:47.403446789 +0200
@@ -0,0 +1,7377 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -17155,9 +16932,9 @@
+ ;;
+ esac
+])
-diff -Naur gtk+2.0-2.21.0.old/m4/lt~obsolete.m4 gtk+2.0-2.21.0/m4/lt~obsolete.m4
---- gtk+2.0-2.21.0.old/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.0/m4/lt~obsolete.m4 2010-05-08 08:29:58.357362987 +0200
+diff -Naur gtk+2.0-2.21.1.old/m4/lt~obsolete.m4 gtk+2.0-2.21.1/m4/lt~obsolete.m4
+--- gtk+2.0-2.21.1.old/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.21.1/m4/lt~obsolete.m4 2010-05-31 09:58:47.755445293 +0200
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@@ -17251,9 +17028,9 @@
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-diff -Naur gtk+2.0-2.21.0.old/m4/ltoptions.m4 gtk+2.0-2.21.0/m4/ltoptions.m4
---- gtk+2.0-2.21.0.old/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.0/m4/ltoptions.m4 2010-05-08 08:29:58.149364412 +0200
+diff -Naur gtk+2.0-2.21.1.old/m4/ltoptions.m4 gtk+2.0-2.21.1/m4/ltoptions.m4
+--- gtk+2.0-2.21.1.old/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.21.1/m4/ltoptions.m4 2010-05-31 09:58:47.479480539 +0200
@@ -0,0 +1,368 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
@@ -17623,9 +17400,9 @@
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
-diff -Naur gtk+2.0-2.21.0.old/m4/ltsugar.m4 gtk+2.0-2.21.0/m4/ltsugar.m4
---- gtk+2.0-2.21.0.old/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.0/m4/ltsugar.m4 2010-05-08 08:29:58.225358637 +0200
+diff -Naur gtk+2.0-2.21.1.old/m4/ltsugar.m4 gtk+2.0-2.21.1/m4/ltsugar.m4
+--- gtk+2.0-2.21.1.old/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.21.1/m4/ltsugar.m4 2010-05-31 09:58:47.559445932 +0200
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@@ -17750,9 +17527,9 @@
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
-diff -Naur gtk+2.0-2.21.0.old/m4/ltversion.m4 gtk+2.0-2.21.0/m4/ltversion.m4
---- gtk+2.0-2.21.0.old/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.0/m4/ltversion.m4 2010-05-08 08:29:58.293340395 +0200
+diff -Naur gtk+2.0-2.21.1.old/m4/ltversion.m4 gtk+2.0-2.21.1/m4/ltversion.m4
+--- gtk+2.0-2.21.1.old/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.21.1/m4/ltversion.m4 2010-05-31 09:58:47.675448389 +0200
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
@@ -17777,9 +17554,9 @@
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
-diff -Naur gtk+2.0-2.21.0.old/m4macros/Makefile.in gtk+2.0-2.21.0/m4macros/Makefile.in
---- gtk+2.0-2.21.0.old/m4macros/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/m4macros/Makefile.in 2010-05-08 08:30:12.072338289 +0200
+diff -Naur gtk+2.0-2.21.1.old/m4macros/Makefile.in gtk+2.0-2.21.1/m4macros/Makefile.in
+--- gtk+2.0-2.21.1.old/m4macros/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/m4macros/Makefile.in 2010-05-31 09:59:01.074446232 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = m4macros
@@ -17805,9 +17582,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/Makefile.in gtk+2.0-2.21.0/Makefile.in
---- gtk+2.0-2.21.0.old/Makefile.in 2010-05-07 22:12:53.000000000 +0200
-+++ gtk+2.0-2.21.0/Makefile.in 2010-05-08 08:30:15.944337665 +0200
+diff -Naur gtk+2.0-2.21.1.old/Makefile.in gtk+2.0-2.21.1/Makefile.in
+--- gtk+2.0-2.21.1.old/Makefile.in 2010-05-30 23:46:23.000000000 +0200
++++ gtk+2.0-2.21.1/Makefile.in 2010-05-31 09:59:04.527445359 +0200
@@ -47,17 +47,20 @@
$(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \
$(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
@@ -17850,7 +17627,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -477,7 +482,10 @@
+@@ -479,7 +484,10 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -17862,9 +17639,9 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
-diff -Naur gtk+2.0-2.21.0.old/mkinstalldirs gtk+2.0-2.21.0/mkinstalldirs
---- gtk+2.0-2.21.0.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.0/mkinstalldirs 2010-05-08 08:30:15.880340838 +0200
+diff -Naur gtk+2.0-2.21.1.old/mkinstalldirs gtk+2.0-2.21.1/mkinstalldirs
+--- gtk+2.0-2.21.1.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.21.1/mkinstalldirs 2010-05-31 09:59:04.450455554 +0200
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -18028,9 +17805,9 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-diff -Naur gtk+2.0-2.21.0.old/modules/engines/Makefile.in gtk+2.0-2.21.0/modules/engines/Makefile.in
---- gtk+2.0-2.21.0.old/modules/engines/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/engines/Makefile.in 2010-05-08 08:30:13.489748731 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/engines/Makefile.in gtk+2.0-2.21.1/modules/engines/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/engines/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/modules/engines/Makefile.in 2010-05-31 09:59:01.306447309 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines
@@ -18056,9 +17833,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.21.0/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.21.0.old/modules/engines/ms-windows/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/engines/ms-windows/Makefile.in 2010-05-08 08:30:13.596337976 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.21.1/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/engines/ms-windows/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/modules/engines/ms-windows/Makefile.in 2010-05-31 09:59:01.454446703 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows
@@ -18084,9 +17861,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.21.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.21.0.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-05-08 08:30:13.760338149 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.21.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-05-30 23:46:21.000000000 +0200
++++ gtk+2.0-2.21.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-05-31 09:59:01.686445180 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows/Theme/gtk-2.0
@@ -18112,9 +17889,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.21.0/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.21.0.old/modules/engines/ms-windows/Theme/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/engines/ms-windows/Theme/Makefile.in 2010-05-08 08:30:13.676338014 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.21.1/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/engines/ms-windows/Theme/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/modules/engines/ms-windows/Theme/Makefile.in 2010-05-31 09:59:01.570447821 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows/Theme
@@ -18140,9 +17917,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.21.0/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.21.0.old/modules/engines/pixbuf/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/engines/pixbuf/Makefile.in 2010-05-08 08:30:13.876337673 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.21.1/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/engines/pixbuf/Makefile.in 2010-05-30 23:46:21.000000000 +0200
++++ gtk+2.0-2.21.1/modules/engines/pixbuf/Makefile.in 2010-05-31 09:59:01.834445422 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl ChangeLog
subdir = modules/engines/pixbuf
@@ -18168,9 +17945,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/input/Makefile.in gtk+2.0-2.21.0/modules/input/Makefile.in
---- gtk+2.0-2.21.0.old/modules/input/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/input/Makefile.in 2010-05-08 08:30:14.072338008 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/input/Makefile.in gtk+2.0-2.21.1/modules/input/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/input/Makefile.in 2010-05-30 23:46:21.000000000 +0200
++++ gtk+2.0-2.21.1/modules/input/Makefile.in 2010-05-31 09:59:02.138445012 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/input
@@ -18196,7 +17973,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -715,7 +719,8 @@
+@@ -717,7 +721,8 @@
@INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
@@ -18206,7 +17983,7 @@
@CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
@BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
@BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
-@@ -1267,7 +1272,18 @@
+@@ -1269,7 +1274,18 @@
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -18226,9 +18003,9 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
-diff -Naur gtk+2.0-2.21.0.old/modules/Makefile.in gtk+2.0-2.21.0/modules/Makefile.in
---- gtk+2.0-2.21.0.old/modules/Makefile.in 2010-05-07 22:12:50.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/Makefile.in 2010-05-08 08:30:13.289818077 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/Makefile.in gtk+2.0-2.21.1/modules/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/Makefile.in 2010-05-30 23:46:20.000000000 +0200
++++ gtk+2.0-2.21.1/modules/Makefile.in 2010-05-31 09:59:01.198448519 +0200
@@ -40,11 +40,14 @@
@OS_UNIX_TRUE at am__append_1 = printbackends
subdir = modules
@@ -18254,9 +18031,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.21.0/modules/other/gail/libgail-util/Makefile.in
---- gtk+2.0-2.21.0.old/modules/other/gail/libgail-util/Makefile.in 2010-05-07 22:12:51.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/other/gail/libgail-util/Makefile.in 2010-05-08 08:30:14.672337859 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.21.1/modules/other/gail/libgail-util/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/other/gail/libgail-util/Makefile.in 2010-05-30 23:46:21.000000000 +0200
++++ gtk+2.0-2.21.1/modules/other/gail/libgail-util/Makefile.in 2010-05-31 09:59:02.778445006 +0200
@@ -42,11 +42,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/other/gail/libgail-util
@@ -18282,9 +18059,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/other/gail/Makefile.in gtk+2.0-2.21.0/modules/other/gail/Makefile.in
---- gtk+2.0-2.21.0.old/modules/other/gail/Makefile.in 2010-05-07 22:12:51.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/other/gail/Makefile.in 2010-05-08 08:30:14.560337670 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/other/gail/Makefile.in gtk+2.0-2.21.1/modules/other/gail/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/other/gail/Makefile.in 2010-05-30 23:46:21.000000000 +0200
++++ gtk+2.0-2.21.1/modules/other/gail/Makefile.in 2010-05-31 09:59:02.634446111 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
subdir = modules/other/gail
@@ -18310,9 +18087,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.21.0/modules/other/gail/tests/Makefile.in
---- gtk+2.0-2.21.0.old/modules/other/gail/tests/Makefile.in 2010-05-07 22:12:51.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/other/gail/tests/Makefile.in 2010-05-08 08:30:14.824337769 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.21.1/modules/other/gail/tests/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/other/gail/tests/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/modules/other/gail/tests/Makefile.in 2010-05-31 09:59:02.974445752 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/other/gail/tests
@@ -18338,9 +18115,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/other/Makefile.in gtk+2.0-2.21.0/modules/other/Makefile.in
---- gtk+2.0-2.21.0.old/modules/other/Makefile.in 2010-05-07 22:12:51.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/other/Makefile.in 2010-05-08 08:30:14.240338745 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/other/Makefile.in gtk+2.0-2.21.1/modules/other/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/other/Makefile.in 2010-05-30 23:46:21.000000000 +0200
++++ gtk+2.0-2.21.1/modules/other/Makefile.in 2010-05-31 09:59:02.250445354 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/other
@@ -18366,9 +18143,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.21.0/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.21.0.old/modules/printbackends/cups/Makefile.in 2010-05-07 22:12:51.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/printbackends/cups/Makefile.in 2010-05-08 08:30:15.008337491 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.21.1/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/printbackends/cups/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/modules/printbackends/cups/Makefile.in 2010-05-31 09:59:03.226444745 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/cups
@@ -18394,9 +18171,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/printbackends/file/Makefile.in gtk+2.0-2.21.0/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.21.0.old/modules/printbackends/file/Makefile.in 2010-05-07 22:12:52.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/printbackends/file/Makefile.in 2010-05-08 08:30:15.112337783 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.21.1/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/printbackends/file/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/modules/printbackends/file/Makefile.in 2010-05-31 09:59:03.378445497 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/file
@@ -18422,9 +18199,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.21.0/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.21.0.old/modules/printbackends/lpr/Makefile.in 2010-05-07 22:12:52.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/printbackends/lpr/Makefile.in 2010-05-08 08:30:15.216337937 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.21.1/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/printbackends/lpr/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/modules/printbackends/lpr/Makefile.in 2010-05-31 09:59:03.515445929 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/lpr
@@ -18450,9 +18227,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/printbackends/Makefile.in gtk+2.0-2.21.0/modules/printbackends/Makefile.in
---- gtk+2.0-2.21.0.old/modules/printbackends/Makefile.in 2010-05-07 22:12:51.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/printbackends/Makefile.in 2010-05-08 08:30:14.908338186 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/printbackends/Makefile.in gtk+2.0-2.21.1/modules/printbackends/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/printbackends/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/modules/printbackends/Makefile.in 2010-05-31 09:59:03.086444546 +0200
@@ -42,11 +42,14 @@
@HAVE_PAPI_TRUE at am__append_3 = papi
subdir = modules/printbackends
@@ -18478,9 +18255,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.21.0/modules/printbackends/papi/Makefile.in
---- gtk+2.0-2.21.0.old/modules/printbackends/papi/Makefile.in 2010-05-07 22:12:52.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/printbackends/papi/Makefile.in 2010-05-08 08:30:15.312337782 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.21.1/modules/printbackends/papi/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/printbackends/papi/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/modules/printbackends/papi/Makefile.in 2010-05-31 09:59:03.702446026 +0200
@@ -39,11 +39,14 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -18506,9 +18283,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/modules/printbackends/test/Makefile.in gtk+2.0-2.21.0/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.21.0.old/modules/printbackends/test/Makefile.in 2010-05-07 22:12:52.000000000 +0200
-+++ gtk+2.0-2.21.0/modules/printbackends/test/Makefile.in 2010-05-08 08:30:15.416337528 +0200
+diff -Naur gtk+2.0-2.21.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.21.1/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.21.1.old/modules/printbackends/test/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/modules/printbackends/test/Makefile.in 2010-05-31 09:59:03.838445931 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/test
@@ -18534,9 +18311,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/perf/Makefile.in gtk+2.0-2.21.0/perf/Makefile.in
---- gtk+2.0-2.21.0.old/perf/Makefile.in 2010-05-07 22:12:52.000000000 +0200
-+++ gtk+2.0-2.21.0/perf/Makefile.in 2010-05-08 08:30:15.516337949 +0200
+diff -Naur gtk+2.0-2.21.1.old/perf/Makefile.in gtk+2.0-2.21.1/perf/Makefile.in
+--- gtk+2.0-2.21.1.old/perf/Makefile.in 2010-05-30 23:46:22.000000000 +0200
++++ gtk+2.0-2.21.1/perf/Makefile.in 2010-05-31 09:59:03.978444793 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = testperf$(EXEEXT)
subdir = perf
@@ -18562,9 +18339,9 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.0.old/po/Makefile.in.in gtk+2.0-2.21.0/po/Makefile.in.in
---- gtk+2.0-2.21.0.old/po/Makefile.in.in 2010-04-09 04:30:01.000000000 +0200
-+++ gtk+2.0-2.21.0/po/Makefile.in.in 2010-05-08 08:29:58.465338730 +0200
+diff -Naur gtk+2.0-2.21.1.old/po/Makefile.in.in gtk+2.0-2.21.1/po/Makefile.in.in
+--- gtk+2.0-2.21.1.old/po/Makefile.in.in 2010-04-09 04:30:01.000000000 +0200
++++ gtk+2.0-2.21.1/po/Makefile.in.in 2010-05-31 09:58:47.882444959 +0200
@@ -25,22 +25,23 @@
prefix = @prefix@
@@ -18609,7 +18386,7 @@
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
-@@ -93,8 +94,13 @@
+@@ -93,8 +94,15 @@
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
@@ -18617,14 +18394,16 @@
+ --add-comments --keyword=_ --keyword=N_ \
+ --keyword=C_:1c,2 \
+ --keyword=NC_:1c,2 \
++ --keyword=g_dcgettext:2 \
--keyword=g_dngettext:2,3 \
++ --keyword=g_dpgettext2:2c,3 \
+ --flag=N_:1:pass-c-format \
+ --flag=C_:2:pass-c-format \
+ --flag=NC_:2:pass-c-format \
--flag=g_dngettext:2:pass-c-format \
--flag=g_strdup_printf:1:c-format \
--flag=g_string_printf:2:c-format \
-@@ -111,10 +117,6 @@
+@@ -111,10 +119,6 @@
--flag=g_snprintf:3:c-format \
--flag=g_scanner_error:2:c-format \
--flag=g_scanner_warn:2:c-format \
@@ -18635,7 +18414,7 @@
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
-@@ -125,8 +127,12 @@
+@@ -125,8 +129,12 @@
install-data: install-data- at USE_NLS@
install-data-no: all
install-data-yes: all
@@ -18650,7 +18429,7 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
-@@ -135,7 +141,11 @@
+@@ -135,7 +143,11 @@
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
@@ -18663,7 +18442,7 @@
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-@@ -159,7 +169,11 @@
+@@ -159,7 +171,11 @@
fi; \
done
if test "$(PACKAGE)" = "glib"; then \
@@ -18676,10 +18455,10 @@
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
-diff -Naur gtk+2.0-2.21.0.old/tests/Makefile.in gtk+2.0-2.21.0/tests/Makefile.in
---- gtk+2.0-2.21.0.old/tests/Makefile.in 2010-05-07 22:12:52.000000000 +0200
-+++ gtk+2.0-2.21.0/tests/Makefile.in 2010-05-08 08:30:15.768337913 +0200
-@@ -75,11 +75,14 @@
+diff -Naur gtk+2.0-2.21.1.old/tests/Makefile.in gtk+2.0-2.21.1/tests/Makefile.in
+--- gtk+2.0-2.21.1.old/tests/Makefile.in 2010-05-30 23:46:23.000000000 +0200
++++ gtk+2.0-2.21.1/tests/Makefile.in 2010-05-31 09:59:04.342445391 +0200
+@@ -76,11 +76,14 @@
@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE at am__append_2 = -DHAVE_OBJC=1 -x objective-c++
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -18696,7 +18475,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -432,6 +435,7 @@
+@@ -437,6 +440,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@
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=24443&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Mon May 31 08:20:42 2010
@@ -53,7 +53,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.21.0
+SHVER := 2.21.1
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
More information about the pkg-gnome-commits
mailing list