From b59d31445d1afb78a100e37d90dabac8968b9152fad504ccd33d0937301338e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 20 May 2016 14:38:39 +0000 Subject: [PATCH 1/2] Accepting request 396867 from home:Zaitor New stable rel, not buildtested OBS-URL: https://build.opensuse.org/request/show/396867 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=236 --- gtk+-3.20.4.tar.xz | 3 --- gtk+-3.20.5.tar.xz | 3 +++ gtk3.changes | 8 ++++++++ gtk3.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 gtk+-3.20.4.tar.xz create mode 100644 gtk+-3.20.5.tar.xz diff --git a/gtk+-3.20.4.tar.xz b/gtk+-3.20.4.tar.xz deleted file mode 100644 index de74402..0000000 --- a/gtk+-3.20.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f -size 17195152 diff --git a/gtk+-3.20.5.tar.xz b/gtk+-3.20.5.tar.xz new file mode 100644 index 0000000..f548da6 --- /dev/null +++ b/gtk+-3.20.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564 +size 17196008 diff --git a/gtk3.changes b/gtk3.changes index 2842d56..4e217ba 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 19 17:14:02 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.20.5: + + Bugs fixed: bgo#763852, bgo#765973, bgo#766175, bgo#766233, + bgo#766440, bgo#766442. + + Updated translations. + ------------------------------------------------------------------- Fri May 13 08:29:24 UTC 2016 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index a8dfe9a..ac56a65 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,7 +29,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.20.4 +Version: 3.20.5 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ From 8884094c47eca5087eedb2d4a69aca781f423c3a5ee59519b90252c017376e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 23 May 2016 19:27:58 +0000 Subject: [PATCH 2/2] Accepting request 397536 from home:Zaitor New stable rel, I suggest we take this into GF for now, it can't do any more harm then we already have - but lets test it first before we fwd it....- resub with one disabled patch less OBS-URL: https://build.opensuse.org/request/show/397536 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=237 --- gtk+-3.20.5.tar.xz | 3 - gtk+-3.20.6.tar.xz | 3 + ...30159-bgo319483-async-font-selection.patch | 281 ------------------ gtk3.changes | 9 + gtk3.spec | 7 +- 5 files changed, 13 insertions(+), 290 deletions(-) delete mode 100644 gtk+-3.20.5.tar.xz create mode 100644 gtk+-3.20.6.tar.xz delete mode 100644 gtk3-bnc130159-bgo319483-async-font-selection.patch diff --git a/gtk+-3.20.5.tar.xz b/gtk+-3.20.5.tar.xz deleted file mode 100644 index f548da6..0000000 --- a/gtk+-3.20.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564 -size 17196008 diff --git a/gtk+-3.20.6.tar.xz b/gtk+-3.20.6.tar.xz new file mode 100644 index 0000000..7fe31fd --- /dev/null +++ b/gtk+-3.20.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2 +size 17190912 diff --git a/gtk3-bnc130159-bgo319483-async-font-selection.patch b/gtk3-bnc130159-bgo319483-async-font-selection.patch deleted file mode 100644 index 37a8f2a..0000000 --- a/gtk3-bnc130159-bgo319483-async-font-selection.patch +++ /dev/null @@ -1,281 +0,0 @@ -Index: gtk+-3.5.2/gtk/deprecated/gtkfontsel.c -=================================================================== ---- gtk+-3.5.2.orig/gtk/deprecated/gtkfontsel.c -+++ gtk+-3.5.2/gtk/deprecated/gtkfontsel.c -@@ -136,6 +136,8 @@ struct _GtkFontSelectionDialogPrivate - #define FONT_STYLE_LIST_WIDTH 170 - #define FONT_SIZE_LIST_WIDTH 60 - -+#define DELAY_REAL_SELECTION_MS 75 -+ - /* These are what we use as the standard font sizes, for the size list. - */ - static const guint16 font_sizes[] = { -@@ -626,10 +628,23 @@ static void - gtk_font_selection_finalize (GObject *object) - { - GtkFontSelection *fontsel = GTK_FONT_SELECTION (object); -+ guint selection_timeout; - - gtk_font_selection_ref_family (fontsel, NULL); - gtk_font_selection_ref_face (fontsel, NULL); - -+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "font-selection-timeout")); -+ if (selection_timeout) -+ g_source_remove (selection_timeout); -+ -+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "style-selection-timeout")); -+ if (selection_timeout) -+ g_source_remove (selection_timeout); -+ -+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "size-selection-timeout")); -+ if (selection_timeout) -+ g_source_remove (selection_timeout); -+ - G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object); - } - -@@ -666,6 +681,9 @@ gtk_font_selection_reload_fonts (GtkFont - PangoFontDescription *desc; - desc = gtk_font_selection_get_font_description (fontsel); - -+ /* Disable selection timeout */ -+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (1)); -+ - gtk_font_selection_show_available_fonts (fontsel); - gtk_font_selection_show_available_sizes (fontsel, TRUE); - gtk_font_selection_show_available_styles (fontsel); -@@ -673,6 +691,9 @@ gtk_font_selection_reload_fonts (GtkFont - gtk_font_selection_select_font_desc (fontsel, desc, NULL, NULL); - gtk_font_selection_scroll_to_selection (fontsel); - -+ /* Enable selection timeout */ -+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (0)); -+ - pango_font_description_free (desc); - } - } -@@ -752,21 +773,26 @@ gtk_font_selection_scroll_on_map (GtkWid - } - - /* This is called when a family is selected in the list. */ --static void --gtk_font_selection_select_font (GtkTreeSelection *selection, -- gpointer data) -+static gboolean -+gtk_font_selection_real_select_font (gpointer data) - { - GtkFontSelection *fontsel; - GtkFontSelectionPrivate *priv; -+ GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - #ifdef INCLUDE_FONT_ENTRIES - const gchar *family_name; - #endif - -+ if (!g_object_get_data (G_OBJECT (data), "immediate-selection")) -+ GDK_THREADS_ENTER (); -+ - fontsel = GTK_FONT_SELECTION (data); - priv = fontsel->priv; - -+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->family_list)); -+ - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - PangoFontFamily *family; -@@ -787,6 +813,40 @@ gtk_font_selection_select_font (GtkTreeS - - g_object_unref (family); - } -+ -+ g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (0)); -+ -+ if (!g_object_get_data (G_OBJECT (fontsel), "immediate-selection")) -+ GDK_THREADS_LEAVE (); -+ -+ /* Remove ourselves */ -+ return FALSE; -+} -+ -+static void -+gtk_font_selection_select_font (GtkTreeSelection *selection, -+ gpointer data) -+{ -+ GtkFontSelection *fontsel; -+ guint selection_timeout = 0; -+ guint immediate_selection = 0; -+ -+ fontsel = GTK_FONT_SELECTION (data); -+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "font-selection-timeout")); -+ immediate_selection = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "immediate-selection")); -+ -+ if (selection_timeout) -+ g_source_remove (selection_timeout); -+ -+ if (immediate_selection) -+ { -+ gtk_font_selection_real_select_font (data); -+ } -+ else -+ { -+ selection_timeout = g_timeout_add (DELAY_REAL_SELECTION_MS, gtk_font_selection_real_select_font, data); -+ g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (selection_timeout)); -+ } - } - - static int -@@ -992,14 +1052,22 @@ gtk_font_selection_select_best_style (Gt - - - /* This is called when a style is selected in the list. */ --static void --gtk_font_selection_select_style (GtkTreeSelection *selection, -- gpointer data) -+static gboolean -+gtk_font_selection_real_select_style (gpointer data) - { - GtkFontSelection *fontsel = GTK_FONT_SELECTION (data); -+ GtkFontSelectionPrivate *priv; -+ GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - -+ if (!g_object_get_data (G_OBJECT (data), "immediate-selection")) -+ GDK_THREADS_ENTER (); -+ -+ priv = fontsel->priv; -+ -+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->face_list)); -+ - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - PangoFontFace *face; -@@ -1011,6 +1079,40 @@ gtk_font_selection_select_style (GtkTree - - gtk_font_selection_show_available_sizes (fontsel, FALSE); - gtk_font_selection_select_best_size (fontsel); -+ -+ g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (0)); -+ -+ if (!g_object_get_data (G_OBJECT (fontsel), "immediate-selection")) -+ GDK_THREADS_LEAVE (); -+ -+ /* Remove ourselves */ -+ return FALSE; -+} -+ -+static void -+gtk_font_selection_select_style (GtkTreeSelection *selection, -+ gpointer data) -+{ -+ GtkFontSelection *fontsel; -+ guint selection_timeout = 0; -+ guint immediate_selection = 0; -+ -+ fontsel = GTK_FONT_SELECTION (data); -+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "style-selection-timeout")); -+ immediate_selection = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "immediate-selection")); -+ -+ if (selection_timeout) -+ g_source_remove (selection_timeout); -+ -+ if (immediate_selection) -+ { -+ gtk_font_selection_real_select_style (data); -+ } -+ else -+ { -+ selection_timeout = g_timeout_add (DELAY_REAL_SELECTION_MS, gtk_font_selection_real_select_style, data); -+ g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (selection_timeout)); -+ } - } - - static void -@@ -1144,20 +1246,62 @@ gtk_font_selection_size_focus_out (GtkWi - } - - /* This is called when a size is selected in the list. */ --static void --gtk_font_selection_select_size (GtkTreeSelection *selection, -- gpointer data) -+static gboolean -+gtk_font_selection_real_select_size (gpointer data) - { - GtkFontSelection *fontsel = GTK_FONT_SELECTION (data); -+ GtkFontSelectionPrivate *priv; -+ GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - gint new_size; - -+ if (!g_object_get_data (G_OBJECT (data), "immediate-selection")) -+ GDK_THREADS_ENTER (); -+ -+ priv = fontsel->priv; -+ -+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->size_list)); -+ - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - gtk_tree_model_get (model, &iter, SIZE_COLUMN, &new_size, -1); - gtk_font_selection_set_size (fontsel, new_size * PANGO_SCALE); - } -+ -+ g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (0)); -+ -+ if (!g_object_get_data (G_OBJECT (fontsel), "immediate-selection")) -+ GDK_THREADS_LEAVE (); -+ -+ /* Remove ourselves */ -+ return FALSE; -+} -+ -+static void -+gtk_font_selection_select_size (GtkTreeSelection *selection, -+ gpointer data) -+{ -+ GtkFontSelection *fontsel; -+ guint selection_timeout = 0; -+ guint immediate_selection = 0; -+ -+ fontsel = GTK_FONT_SELECTION (data); -+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "size-selection-timeout")); -+ immediate_selection = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "immediate-selection")); -+ -+ if (selection_timeout) -+ g_source_remove (selection_timeout); -+ -+ if (immediate_selection) -+ { -+ gtk_font_selection_real_select_size (data); -+ } -+ else -+ { -+ selection_timeout = g_timeout_add (DELAY_REAL_SELECTION_MS, gtk_font_selection_real_select_size, data); -+ g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (selection_timeout)); -+ } - } - - static void -@@ -1475,6 +1619,9 @@ gtk_font_selection_select_font_desc (Gtk - if (!new_family) - return FALSE; - -+ /* Disable selection timeout */ -+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (1)); -+ - if (pfamily) - *pfamily = new_family; - else -@@ -1525,6 +1672,9 @@ gtk_font_selection_select_font_desc (Gtk - - gtk_font_selection_set_size (fontsel, pango_font_description_get_size (new_desc)); - -+ /* Enable selection timeout */ -+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (0)); -+ - return TRUE; - } - diff --git a/gtk3.changes b/gtk3.changes index 4e217ba..a03ac41 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 23 15:05:32 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.20.6: + + Bugs fixed: bgo#766694, bgo#766323, bgo#766336, bgo#766737. +- Drop gtk3-bnc130159-bgo319483-async-font-selection.patch: It's + been disabled since version 3.16.2 and upstream closed the bug as + obsolete back in 2011. + ------------------------------------------------------------------- Thu May 19 17:14:02 UTC 2016 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index ac56a65..b2ad65b 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,7 +29,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.20.5 +Version: 3.20.6 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -44,9 +44,6 @@ Source99: baselibs.conf Patch0: gtk3-GTK_PATH64.patch # PATCH-FIX-OPENSUSE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 Patch1: gtk3-path-local.patch -## PATCH-DISABLED gtk3-bnc130159-bgo319483-async-font-selection.patch - Upstream bug was closed as obsolete in 2011, lets see if anyone complains. -# PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages -Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -337,8 +334,6 @@ cp -a %{S:1} . %patch0 -p1 %endif %patch1 -p0 -## PATCH-DISABLED - Upstream bug was closed as obsolete in 2011, as there was a new fontchooser, lets disable the patch and see if anyone complains. -#%%patch3 -p1 %build # Needed for patch1