diff --git a/gtk+-2.90.5.tar.bz2 b/gtk+-2.90.5.tar.bz2 deleted file mode 100644 index 80aa863..0000000 --- a/gtk+-2.90.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c3c2b461c5a9e0c07dcc320d6362728284e8294f2cd77428d51694c15681264 -size 17028893 diff --git a/gtk+-2.90.6.tar.bz2 b/gtk+-2.90.6.tar.bz2 new file mode 100644 index 0000000..b9a2124 --- /dev/null +++ b/gtk+-2.90.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d5afda85fe0d9b4dbfdc265fed2f07cd0ed214bc2055310816f471e2f762dc +size 16988522 diff --git a/gtk3-bnc130159-bgo319483-async-font-selection.patch b/gtk3-bnc130159-bgo319483-async-font-selection.patch index 668fbff..577bdf3 100644 --- a/gtk3-bnc130159-bgo319483-async-font-selection.patch +++ b/gtk3-bnc130159-bgo319483-async-font-selection.patch @@ -1,16 +1,24 @@ -Index: gtk+-2.16.0/gtk/gtkfontsel.c +Index: gtk+-2.90.6/gtk/gtkfontsel.c =================================================================== ---- gtk+-2.16.0.orig/gtk/gtkfontsel.c -+++ gtk+-2.16.0/gtk/gtkfontsel.c -@@ -588,11 +588,24 @@ static void +--- gtk+-2.90.6.orig/gtk/gtkfontsel.c ++++ gtk+-2.90.6/gtk/gtkfontsel.c +@@ -130,6 +130,8 @@ struct _GtkFontSelectionDialogPriv + #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[] = { +@@ -612,10 +614,23 @@ static void gtk_font_selection_finalize (GObject *object) { - GtkFontSelection *fontsel; + GtkFontSelection *fontsel = GTK_FONT_SELECTION (object); + guint selection_timeout; - - g_return_if_fail (GTK_IS_FONT_SELECTION (object)); - - fontsel = GTK_FONT_SELECTION (object); + + 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) @@ -24,30 +32,30 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c + if (selection_timeout) + g_source_remove (selection_timeout); + - gtk_font_selection_ref_family (fontsel, NULL); - gtk_font_selection_ref_face (fontsel, NULL); + G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object); + } -@@ -631,6 +644,9 @@ gtk_font_selection_reload_fonts (GtkFont +@@ -652,6 +667,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)); -+ ++ /* 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); -@@ -638,6 +654,9 @@ gtk_font_selection_reload_fonts (GtkFont +@@ -659,6 +677,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 */ ++ /* Enable selection timeout */ + g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (0)); + pango_font_description_free (desc); } } -@@ -714,10 +733,10 @@ gtk_font_selection_scroll_on_map (GtkWid +@@ -737,21 +758,26 @@ gtk_font_selection_scroll_on_map (GtkWid } /* This is called when a family is selected in the list. */ @@ -57,11 +65,12 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c +static gboolean +gtk_font_selection_real_select_font (gpointer data) { -+ GtkTreeSelection *selection; GtkFontSelection *fontsel; + GtkFontSelectionPriv *priv; ++ GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; -@@ -725,7 +744,11 @@ gtk_font_selection_select_font (GtkTreeS + #ifdef INCLUDE_FONT_ENTRIES const gchar *family_name; #endif @@ -69,11 +78,14 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c + GDK_THREADS_ENTER (); + fontsel = GTK_FONT_SELECTION (data); -+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->family_list)); + priv = fontsel->priv; ++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->family_list)); ++ if (gtk_tree_selection_get_selected (selection, &model, &iter)) { -@@ -747,6 +770,40 @@ gtk_font_selection_select_font (GtkTreeS + PangoFontFamily *family; +@@ -772,6 +798,40 @@ gtk_font_selection_select_font (GtkTreeS g_object_unref (family); } @@ -108,13 +120,13 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c + } + else + { -+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_font, data); ++ 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 -@@ -949,14 +1006,20 @@ gtk_font_selection_select_best_style (Gt +@@ -977,14 +1037,22 @@ gtk_font_selection_select_best_style (Gt /* This is called when a style is selected in the list. */ @@ -124,22 +136,23 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c +static gboolean +gtk_font_selection_real_select_style (gpointer data) { -- GtkFontSelection *fontsel = GTK_FONT_SELECTION (data); + GtkFontSelection *fontsel = GTK_FONT_SELECTION (data); ++ GtkFontSelectionPriv *priv; + GtkTreeSelection *selection; -+ GtkFontSelection *fontsel; GtkTreeModel *model; GtkTreeIter iter; - + + if (!g_object_get_data (G_OBJECT (data), "immediate-selection")) + GDK_THREADS_ENTER (); + -+ fontsel = GTK_FONT_SELECTION (data); -+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->face_list)); ++ 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; -@@ -968,6 +1031,40 @@ gtk_font_selection_select_style (GtkTree +@@ -996,6 +1064,40 @@ gtk_font_selection_select_style (GtkTree gtk_font_selection_show_available_sizes (fontsel, FALSE); gtk_font_selection_select_best_size (fontsel); @@ -174,13 +187,13 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c + } + else + { -+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_style, data); ++ 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 -@@ -1100,22 +1197,60 @@ gtk_font_selection_size_focus_out (GtkWi +@@ -1129,20 +1231,62 @@ gtk_font_selection_size_focus_out (GtkWi } /* This is called when a size is selected in the list. */ @@ -190,18 +203,19 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c +static gboolean +gtk_font_selection_real_select_size (gpointer data) { + GtkFontSelection *fontsel = GTK_FONT_SELECTION (data); ++ GtkFontSelectionPriv *priv; + GtkTreeSelection *selection; - GtkFontSelection *fontsel; GtkTreeModel *model; GtkTreeIter iter; gint new_size; - + + if (!g_object_get_data (G_OBJECT (data), "immediate-selection")) + GDK_THREADS_ENTER (); + - fontsel = GTK_FONT_SELECTION (data); -- -+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->size_list)); ++ priv = fontsel->priv; ++ ++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->size_list)); + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { @@ -239,27 +253,27 @@ Index: gtk+-2.16.0/gtk/gtkfontsel.c + } + else + { -+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_size, data); ++ 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 -@@ -1449,6 +1584,9 @@ gtk_font_selection_select_font_desc (Gtk +@@ -1444,6 +1588,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)); -+ ++ /* Disable selection timeout */ ++ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (1)); ++ if (pfamily) *pfamily = new_family; else -@@ -1499,6 +1637,9 @@ gtk_font_selection_select_font_desc (Gtk +@@ -1494,6 +1641,9 @@ gtk_font_selection_select_font_desc (Gtk gtk_font_selection_set_size (fontsel, pango_font_description_get_size (new_desc)); -+ /* Enable selection timeout */ ++ /* 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 168aae3..3e8d7e5 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Thu Sep 9 23:10:49 CEST 2010 - vuntz@opensuse.org + +- Remove pkgconfig(xrender) BuildRequires: it's not needed anymore. +- Rebase gtk3-bnc130159-bgo319483-async-font-selection.patch. + +------------------------------------------------------------------- +Wed Sep 1 16:28:26 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.90.6: + + All drawing done by GTK+ itself has been ported from GDK + drawing APIs to cairo + + GtkExpander and GtkFrame now implement GtkSizeRequest + + GtkExpander gained a ::label-fill property to make the label + fill the entire horizontal space + + Allow windows to be dragged by clicking on empty areas in + menubars and toolbars + + GtkAboutDialog can now refer to licenses using a ::license-type + enumeration instead of embedding the license text + + Deprecations and cleanups: + - Remove GtkNotebookPage + - Remove public struct members in many classes + - Remove the GtkRecentManager::limit property + - Remove all GDK drawing functions, ie gdk_draw_*. Use cairo + instead. + - Remove all GdkGC functions. Use cairo instead. + - Remove all of GdkImage. Use cairo instead. + - Remove all of GdkRGB. Use cairo instead. + - Remove gdk_{bit,pix}map_create_from_data + - GDK no longer depends on the render X extension + + New accessors: + - gdk_cursor_get_cursor_type + - gdk_device_get_n_axes + - gdk_display_is_closed + - gtk_notebook_get_tab_[hv]border + + New cairo-related APIs: + - gdk_window_create_similar_surface + - gdk_window_get_background_pattern + + Bugs fixed: bgo#90935, bgo#97414, bgo#336225, bgo#554926, + bgo#557263, bgo#579583, bgo#580291, bgo#596125, bgo#604391, + bgo#605190, bgo#609264, bgo#611313, bgo#612919, bgo#614049, + bgo#614443, bgo#615474, bgo#618327, bgo#621571, bgo#622658, + bgo#623603, bgo#623865, bgo#624087, bgo#624224, bgo#624270, + bgo#624333, bgo#624362, bgo#624367, bgo#624397, bgo#624432, + bgo#624540, bgo#624687, bgo#624707, bgo#624779, bgo#625104, + bgo#625235, bgo#625300, bgo#625416, bgo#625650, bgo#625655, + bgo#625715, bgo#625953, bgo#626052, bgo#626276, bgo#626514 + + Updated translations. +- Patch gtk3-bnc130159-bgo319483-async-font-selection.patch has + been marked as NEEDS-REBASE. According to bgo#319483, a lot has + changed in the underlying libraries (fontconfig/pango) and + re-evaluation of the patch might be required. + ------------------------------------------------------------------- Wed Aug 25 12:08:36 CEST 2010 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index e374b29..96eaad3 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -1,5 +1,5 @@ # -# spec file for package gtk3 (Version 2.90.5) +# spec file for package gtk3 (Version 2.90.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands @@ -20,8 +20,8 @@ Name: gtk3 %define _name gtk+ -Version: 2.90.5 -Release: 2 +Version: 2.90.6 +Release: 1 # FIXME: 2.90.5 doesn't compile with parallel build (bgo#624304). Check if this is still true for later versions. License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) @@ -59,7 +59,6 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(xrender) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description