Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at Mon May 2 12:20:38 CEST 2011.
-------- --- GNOME/gtk2/gtk2.changes 2011-02-19 18:17:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk2/gtk2.changes 2011-04-27 14:03:52.000000000 +0200 @@ -1,0 +2,103 @@ +Wed Apr 27 01:21:49 CEST 2011 - [email protected] + +- Comment out calls to translation-update-upstream as it breaks the + build right now (bnc#690180). +- Change gtk2 Obsoletes from <= to < now that we have a new + upstream version. + +------------------------------------------------------------------- +Wed Apr 27 00:04:41 CEST 2011 - [email protected] + +- Update to version 2.24.4: + + Add missing introspection annotations + + Fix GtkComboBoxEntry accessibility support + + Thread-safety fixes in file chooser and app chooser code + + Fix some deficiencies with the builtin icon theme + + Updated translations. +- Changes from version 2.24.3: + + Build fix. +- Changes from version 2.24.2: + + Bugs fixed: bgo#642905, bgo#643170, bgo#643216, bgo#643416, + bgo#644353. +- Changes from version 2.24.1: + + GTK+ now refuses to load modules that are linked against the + wrong GTK+ version, preventing GTK_PATH accidents. + + A number of memory leaks and segfaults involving accessibility + have been fixed. + + Bugs fixed: bgo#599907, bgo#626730, bgo#633291, bgo#640487, + bgo#640992, bgo#642137, bgo#642642, bgo#642681, bgo#642772. + + Updated translations. +- Changes from version 2.24.0: + + GtkBuilder has gained support for + - items in GtkComboBoxText + - tags in GtkTextTagTable + - menus in GtkMenuToolButton + + The gtk-builder-convert script gained a --target-version option + + Many introspection annotation fixes + + Bugs fixed: bgo#351755, bgo#590459, bgo#639327, bgo#634677. + + Updated translations. +- Changes from version 2.23.90: + + New deprecations: + - gdk_set_pointer_hooks(), gdk_display_set_pointer_hooks() + - gtk_range_get/set_update_policy() + - gtk_window_get/set_frame_dimensions() and + gtk_window_get/set_has_frame() + + The cups print backend can now send print jobs directly in PDF + if cups supports it + + Bugs fixed: bgo#144324, bgo#165987, bgo#560177, bgo#562182, + bgo#622125, bgo#637691, bgo#637958, bgo#637973. +- Changes from version 2.23.3: + + New deprecations: + - GtkRuler (and subclasses) + - gtk_widget_reset_shapes + - gdk_set_sm_client_id + - Foreign window APIs + - gdk_spawn_* + - gdkx_visual_get + - gdk_net_wm_supports + - gdk_set_locale, gtk_set_locale + - Some GDK text conversion routines + - gdk_drag_context_new + - gdk_drag_find_window and gdk_drag_get_protocol + - gdk_xid_table functions + + Bugs fixed: bgo#629955, bgo#634558, bgo#634697, bgo#634882, + bgo#635307, bgo#635588, bgo#636832, bgo#637069, bgo#637156. + + Updated translations. +- Changes from version 2.23.2: + + Fix a branch messup + + Readd the gtk_private_flags_get_type symbol + + Fix crashes on 64-bit + + Allow building with libtool 2.4 +- Changes from version 2.23.1: + + New deprecations: + - gtk_widget_hide_all + + New APIs added to aid migration to GTK+ 3: + - gtk_combo_box_new_with_model_and_entry + + Bugs fixed: bgo#624025, bgo#632381, bgo#632539, bgo#633050, + bgo#634060. +- Changes from version 2.23.0: + + New deprecations: + - gdk_cairo_set_source_pixmap + - Misc GdkDrawable APIs + - gtk_object_destroy + - gtk_init_add, gtk_remove_add, etc + - gtk_noteboook_set_window_creation_hook + - gtk_notebook_set/get_group + - gtk_link_button_set_uri_hook + - gtk_about_dialog_set_url/email_hook + - GtkComboBoxEntry + - combo box text convenience API + + New APIs added to aid migration to GTK+ 3: + - gdk_cairo_set_source_window + - GdkWindow API to supersede GdkDrawable API + - gtk_notebook_set/get_group_name + - GtkLinkButton::activate-link signal + - gtk_combo_box_new_with_entry + - GtkComboBoxText + + Bugs fixed: bgo#423201, bgo#612396, bgo#613728, bgo#629722, + bgo#629955, bgo#630521, bgo#631473, bgo#631697, bgo#632140. +- Rebase gtk2-tracker-0.10.patch, and include additional changes + from git. +- Rebase gtk64.patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gtk+-2.22.1.tar.bz2 New: ---- gtk+-2.24.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.mMZfjZ/_old 2011-05-02 12:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.mMZfjZ/_new 2011-05-02 12:19:09.000000000 +0200 @@ -21,9 +21,8 @@ Name: gtk2 %define _name gtk+ -Version: 2.22.1 -Release: 15 -# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) +Version: 2.24.4 +Release: 1 # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions. # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) License: LGPLv2.1+ @@ -97,8 +96,7 @@ Recommends: gvfs # Provide %{name} to make the lang and immodules packages installable Provides: %{name} = %{version} -# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 2.22.2 (when this provides/obsoletes was introduced) -Obsoletes: %{name} <= %{version} +Obsoletes: %{name} < %{version} # gail is part of gtk+ as of 2.13.x Provides: gail = 1.22.1 Obsoletes: gail < 1.22.1 @@ -293,8 +291,9 @@ %lang_package %prep %setup -q -n %{_name}-%{version} -translation-update-upstream -translation-update-upstream po-properties gtk20-properties +# This breaks the build, so disabled for now (see bnc#690180) +#translation-update-upstream +#translation-update-upstream po-properties gtk20-properties gnome-patch-translation-prepare %if "%_lib" == "lib64" cp -a %{S:2} . @@ -501,7 +500,6 @@ %files immodule-multipress %defattr(-,root,root) -%doc modules/input/README.multipress %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-multipress.so %config %{_sysconfdir}/gtk-2.0/im-multipress.conf ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.mMZfjZ/_old 2011-05-02 12:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.mMZfjZ/_new 2011-05-02 12:19:09.000000000 +0200 @@ -9,7 +9,7 @@ +/etc/gtk-2.0/gtk(64)?.immodules requires "gtk2-tools-<targettype>" provides "gtk2-<targettype> = <version>" - obsoletes "gtk2-<targettype> <= <version>" + obsoletes "gtk2-<targettype> < <version>" obsoletes "gail-<targettype> <= 1.22.1" post "%if "%_lib" == "lib64"" post "if test -f <prefix>%{_bindir}/gtk-query-immodules-2.0-64; then <prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules; fi" ++++++ gtk+-2.22.1.tar.bz2 -> gtk+-2.24.4.tar.bz2 ++++++ GNOME/gtk2/gtk+-2.22.1.tar.bz2 /mounts/work_src_done/STABLE/gtk2/gtk+-2.24.4.tar.bz2 differ: char 11, line 1 ++++++ gtk2-tracker-0.10.patch ++++++ --- /var/tmp/diff_new_pack.mMZfjZ/_old 2011-05-02 12:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.mMZfjZ/_new 2011-05-02 12:19:09.000000000 +0200 @@ -294,7 +294,7 @@ static void finalize (GObject *object) -@@ -181,56 +160,106 @@ finalize (GObject *object) +@@ -181,58 +160,108 @@ finalize (GObject *object) tracker = GTK_SEARCH_ENGINE_TRACKER (object); @@ -410,6 +410,8 @@ + TrackerSparqlCursor *cursor; + GError *error = NULL; + gdk_threads_enter (); + tracker = GTK_SEARCH_ENGINE_TRACKER (user_data); - hit_uris = NULL; @@ -425,15 +427,19 @@ if (error) { _gtk_search_engine_error (GTK_SEARCH_ENGINE (tracker), error->message); -@@ -238,118 +267,96 @@ search_callback (gpointer results, +@@ -238,123 +267,99 @@ search_callback (gpointer results, return; } - if (!results) -- return; +- { +- gdk_threads_leave (); +- return; +- } + if (!cursor) + { + _gtk_search_engine_finished (GTK_SEARCH_ENGINE (tracker)); ++ gdk_threads_leave (); + return; + } @@ -442,6 +448,8 @@ - { - OUT_result = (GPtrArray*) results; + cursor_next (tracker, cursor); ++ ++ gdk_threads_leave (); +} - for (i = 0; i < OUT_result->len; i++) @@ -483,6 +491,8 @@ - g_list_foreach (hit_uris, (GFunc) g_free, NULL); - g_list_free (hit_uris); +- +- gdk_threads_leave (); + g_free (s); } @@ -799,3 +809,53 @@ if (location_uri) { g_string_append (sparql, " . FILTER (fn:starts-with(nie:url(?urn),"); +commit ca619031df23299103b2a6b45f00c16cfd187909 +Author: Alexander Larsson <[email protected]> +Date: Fri Mar 25 10:53:05 2011 +0100 + + Ensure we always grab the gdk lock in async callbacks + + Async callbacks are delivered in idles, so we need to make sure + we get the gdk lock before calling any gdk/gtk stuff. This was + missing in a few places. + (cherry picked from commit e274dbbdced7f3f8e6349bdfadcd743326cfa799) + +diff --git a/gtk/gtksearchenginetracker.c b/gtk/gtksearchenginetracker.c +index 641e793..68346fa 100644 +--- a/gtk/gtksearchenginetracker.c ++++ b/gtk/gtksearchenginetracker.c +@@ -203,6 +203,8 @@ cursor_callback (GObject *object, + GList *hits; + gboolean success; + ++ gdk_threads_enter (); ++ + tracker = GTK_SEARCH_ENGINE_TRACKER (user_data); + + cursor = TRACKER_SPARQL_CURSOR (object); +@@ -217,6 +219,7 @@ cursor_callback (GObject *object, + if (cursor) + g_object_unref (cursor); + ++ gdk_threads_leave (); + return; + } + +@@ -227,6 +230,7 @@ cursor_callback (GObject *object, + if (cursor) + g_object_unref (cursor); + ++ gdk_threads_leave (); + return; + } + +@@ -237,6 +241,9 @@ cursor_callback (GObject *object, + + /* Get next */ + cursor_next (tracker, cursor); ++ ++ gdk_threads_leave (); ++ + } + + static void ++++++ gtk64.patch ++++++ --- /var/tmp/diff_new_pack.mMZfjZ/_old 2011-05-02 12:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.mMZfjZ/_new 2011-05-02 12:19:09.000000000 +0200 @@ -65,7 +65,7 @@ if BUILD_DYNAMIC_MODULES -@@ -237,16 +237,16 @@ noinst_LTLIBRARIES = \ +@@ -237,14 +237,14 @@ noinst_LTLIBRARIES = \ included-modules: $(noinst_LTLIBRARIES) @@ -74,8 +74,6 @@ +gtk64.immodules: Makefile.am $(module_LTLIBRARIES) + $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk64.immodules - EXTRA_DIST += README.multipress - -CLEANFILES = gtk.immodules +CLEANFILES = gtk64.immodules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
