From 4ff5c7d9fd98522480978602be02c519900bf2063e512199f6104a66714b32ee Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 22:04:48 +0000 Subject: [PATCH] Accepting request 132736 from GNOME:Next Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132736 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=92 --- gtk+-3.4.4.tar.xz | 3 - gtk+-3.5.16.tar.xz | 3 + gtk3-GTK_PATH64.patch | 12 +- ...30159-bgo319483-async-font-selection.patch | 28 ++-- gtk3-path-local.patch | 19 +-- gtk3.changes | 134 ++++++++++++++++++ gtk3.spec | 11 +- 7 files changed, 170 insertions(+), 40 deletions(-) delete mode 100644 gtk+-3.4.4.tar.xz create mode 100644 gtk+-3.5.16.tar.xz diff --git a/gtk+-3.4.4.tar.xz b/gtk+-3.4.4.tar.xz deleted file mode 100644 index 820a8a2..0000000 --- a/gtk+-3.4.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 -size 12854476 diff --git a/gtk+-3.5.16.tar.xz b/gtk+-3.5.16.tar.xz new file mode 100644 index 0000000..9a0b5ee --- /dev/null +++ b/gtk+-3.5.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de013edc80684393487f893ff42003c692746df50783b54f6c0aa560ae43c1ae +size 13108908 diff --git a/gtk3-GTK_PATH64.patch b/gtk3-GTK_PATH64.patch index 0750b7d..8dfcd63 100644 --- a/gtk3-GTK_PATH64.patch +++ b/gtk3-GTK_PATH64.patch @@ -1,10 +1,10 @@ -Index: gtk+-2.90.5/gtk/gtkmodules.c +Index: gtk+-3.5.2/gtk/gtkmodules.c =================================================================== ---- gtk+-2.90.5.orig/gtk/gtkmodules.c -+++ gtk+-2.90.5/gtk/gtkmodules.c -@@ -67,7 +67,7 @@ get_module_path (void) - if (home_dir) - home_gtk_dir = g_build_filename (home_dir, ".gtk-3.0", NULL); +--- gtk+-3.5.2.orig/gtk/gtkmodules.c ++++ gtk+-3.5.2/gtk/gtkmodules.c +@@ -60,7 +60,7 @@ get_module_path (void) + if (result) + return result; - module_path_env = g_getenv ("GTK_PATH"); + module_path_env = g_getenv ("GTK_PATH64"); diff --git a/gtk3-bnc130159-bgo319483-async-font-selection.patch b/gtk3-bnc130159-bgo319483-async-font-selection.patch index 9aa5876..37a8f2a 100644 --- a/gtk3-bnc130159-bgo319483-async-font-selection.patch +++ b/gtk3-bnc130159-bgo319483-async-font-selection.patch @@ -1,8 +1,8 @@ -Index: gtk+-2.90.6/gtk/gtkfontsel.c +Index: gtk+-3.5.2/gtk/deprecated/gtkfontsel.c =================================================================== ---- gtk+-2.90.6.orig/gtk/deprecated/gtkfontsel.c -+++ gtk+-2.90.6/gtk/deprecated/gtkfontsel.c -@@ -130,6 +130,8 @@ struct _GtkFontSelectionDialogPrivate +--- 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 @@ -11,7 +11,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c /* 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 +@@ -626,10 +628,23 @@ static void gtk_font_selection_finalize (GObject *object) { GtkFontSelection *fontsel = GTK_FONT_SELECTION (object); @@ -35,7 +35,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object); } -@@ -652,6 +667,9 @@ gtk_font_selection_reload_fonts (GtkFont +@@ -666,6 +681,9 @@ gtk_font_selection_reload_fonts (GtkFont PangoFontDescription *desc; desc = gtk_font_selection_get_font_description (fontsel); @@ -45,7 +45,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c gtk_font_selection_show_available_fonts (fontsel); gtk_font_selection_show_available_sizes (fontsel, TRUE); gtk_font_selection_show_available_styles (fontsel); -@@ -659,6 +677,9 @@ gtk_font_selection_reload_fonts (GtkFont +@@ -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); @@ -55,7 +55,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c pango_font_description_free (desc); } } -@@ -737,21 +758,26 @@ gtk_font_selection_scroll_on_map (GtkWid +@@ -752,21 +773,26 @@ gtk_font_selection_scroll_on_map (GtkWid } /* This is called when a family is selected in the list. */ @@ -85,7 +85,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c if (gtk_tree_selection_get_selected (selection, &model, &iter)) { PangoFontFamily *family; -@@ -772,6 +798,40 @@ gtk_font_selection_select_font (GtkTreeS +@@ -787,6 +813,40 @@ gtk_font_selection_select_font (GtkTreeS g_object_unref (family); } @@ -126,7 +126,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c } static int -@@ -977,14 +1037,22 @@ gtk_font_selection_select_best_style (Gt +@@ -992,14 +1052,22 @@ gtk_font_selection_select_best_style (Gt /* This is called when a style is selected in the list. */ @@ -152,7 +152,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c if (gtk_tree_selection_get_selected (selection, &model, &iter)) { PangoFontFace *face; -@@ -996,6 +1064,40 @@ gtk_font_selection_select_style (GtkTree +@@ -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); @@ -193,7 +193,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c } static void -@@ -1129,20 +1231,62 @@ gtk_font_selection_size_focus_out (GtkWi +@@ -1144,20 +1246,62 @@ gtk_font_selection_size_focus_out (GtkWi } /* This is called when a size is selected in the list. */ @@ -259,7 +259,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c } static void -@@ -1444,6 +1588,9 @@ gtk_font_selection_select_font_desc (Gtk +@@ -1475,6 +1619,9 @@ gtk_font_selection_select_font_desc (Gtk if (!new_family) return FALSE; @@ -269,7 +269,7 @@ Index: gtk+-2.90.6/gtk/gtkfontsel.c if (pfamily) *pfamily = new_family; else -@@ -1494,6 +1641,9 @@ gtk_font_selection_select_font_desc (Gtk +@@ -1525,6 +1672,9 @@ gtk_font_selection_select_font_desc (Gtk gtk_font_selection_set_size (fontsel, pango_font_description_get_size (new_desc)); diff --git a/gtk3-path-local.patch b/gtk3-path-local.patch index 01d2466..6651ad1 100644 --- a/gtk3-path-local.patch +++ b/gtk3-path-local.patch @@ -17,15 +17,15 @@ Index: gtk/gtkmodules.c =================================================================== --- gtk/gtkmodules.c.orig +++ gtk/gtkmodules.c -@@ -60,6 +60,7 @@ get_module_path (void) - gchar *home_gtk_dir = NULL; +@@ -55,6 +55,7 @@ get_module_path (void) + const gchar *exe_prefix; gchar *module_path; gchar *default_dir; + gchar *local_dir; static gchar **result = NULL; if (result) -@@ -73,25 +74,32 @@ get_module_path (void) +@@ -64,18 +65,25 @@ get_module_path (void) exe_prefix = g_getenv ("GTK_EXE_PREFIX"); if (exe_prefix) @@ -39,24 +39,15 @@ Index: gtk/gtkmodules.c + local_dir = g_build_filename ("/usr/local", SUSE_HACK_LIB, "gtk-3.0", NULL); + } - if (module_path_env && home_gtk_dir) - module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, -- module_path_env, home_gtk_dir, default_dir, NULL); -+ module_path_env, home_gtk_dir, local_dir, default_dir, NULL); - else if (module_path_env) + if (module_path_env) module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, - module_path_env, default_dir, NULL); + module_path_env, local_dir, default_dir, NULL); - else if (home_gtk_dir) - module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, -- home_gtk_dir, default_dir, NULL); -+ home_gtk_dir, local_dir, default_dir, NULL); else module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, - default_dir, NULL); + local_dir, default_dir, NULL); - g_free (home_gtk_dir); g_free (default_dir); + g_free (local_dir); @@ -81,7 +72,7 @@ Index: gtk/Makefile.in =================================================================== --- gtk/Makefile.in.orig +++ gtk/Makefile.in -@@ -806,8 +806,10 @@ SUBDIRS = a11y . tests +@@ -900,8 +900,10 @@ SUBDIRS = a11y . tests @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi @HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups @HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups diff --git a/gtk3.changes b/gtk3.changes index db4360c..62d924e 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,137 @@ +------------------------------------------------------------------- +Wed Sep 5 06:58:46 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.16: + + Fix critical warnings on startup of nautilus. + +------------------------------------------------------------------- +Tue Sep 4 08:18:30 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.14: + + Input method support + - Propagate input purpose and hints to individual IMs + - Add a hint to suppress on-screen keyboards + + GtkEntry can now set Pango attributes for its text + + GtkEntry and GtkTextView show 'selection handles' when used + with touch devices + + GtkSpinButton can be oriented vertically + + Bugs fixed: bgo#645065, bgo#661973, bgo#672046, bgo#672431, + bgo#676787, bgo#679144, bgo#681617, bgo#682129, bgo#682291, + bgo#682552, bgo#682662, bgo#682724, bgo#682825, bgo#682919, + bgo#683001, bgo#683168 + + Updated translations. + +------------------------------------------------------------------- +Tue Aug 21 08:17:59 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.12: + + GtkApplication: + - Add gtk_application_get_active_window to get the active + window + - Add gtk_widget_insert_action_group to allow more flexibility + when associating widgets with actions + + GtkMenuButton: + - The gtk_menu_button_set_menu function is getting renamed + to gtk_menu_button_set_popup. The old name is still available + for now, but will be removed before 3.6 + + GtkToolbar: + - use CSS properties instead of style properties for padding + + Input method support: + - GtkEntry and GtkTextView now have input-purpose and + input-hints properties that let applications provide useful + hints to input methods, like 'this entry is for a phone nr'. + + Bugs fixed: bgo#373279, bgo#651244, bgo#673478, bgo#681577, + bgo#681591, bgo#681613, bgo#682193, bgo#682235 + + Updated translations. + +------------------------------------------------------------------- +Tue Aug 7 07:03:44 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.10: + + Wayland: + - Add keyboard handling + - Improve clipboard handling + - Add default settings implementation + + GDK thread support has been deprecated + + Bugs fixed: bgo#679910, bgo#679978, bgo#680754, bgo#680803, + bgo#680822, bgo#680901, bgo#680949, bgo#680988, bgo#681005, + bgo#681006, bgo#681064 + + Updated translations. +- Add docbook-xsl-stylesheets and xsltproc BuildRequires: New + depenencies in order to build the man pages. + +------------------------------------------------------------------- +Tue Jul 17 08:34:20 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.8: + + gtk-launch: A new commandline utility to launch an application + from its desktop file + + GtkStrengthBar: A new widget for displaying the strength or + level or some quantity + + Wayland: Updates for changes in the Wayland protocol + + Bugs fixed: bgo#667808, bgo#671437, bgo#671817, bgo#675990, + bgo#677347, bgo#677491, bgo#678828, bgo#678829, bgo#679092, + bgo#679166, bgo#679228, bgo#679409, bgo#679449, bgo#679454, + bgo#679537, bgo#679705, bgo#677892, bgo#679342. + + Updated translations. + +------------------------------------------------------------------- +Mon Jul 16 20:36:11 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.6: + + GtkSearchEntry is a subclass of GtkEntry that is set up to be + used as a search entry + + GtkMenuButton is button that pops up a menu. The menu can be + generated from a GMenu or provided manually + + The GtkMountOperation code will now use gnome-shell to present + a system-modal mount dialog when available + + The accessibility bridge code that exports accessible objects + on the bus is used by default. + + Bugs fixed: bgo#613561, bgo#652809, bgo#668013, bgo#669986, + bgo#670369, bgo#674963, bgo#676077, bgo#677491, bgo#677551, + bgo#677649, bgo#677774, bgo#677809, bgo#677915, bgo#677941, + bgo#677943, bgo#678175, bgo#678407, bgo#678418. + + Updated translations. +- Add pkgconfig(atk-bridge-2.0) BuildRequires: new dependency. + +------------------------------------------------------------------- +Mon Jul 16 10:26:30 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.4: + + GtkIconView size allocation has been rewritten to support + height-for-width and work better. + + The theming code now supports multiple backgrounds and + transitions. + + Bugs fixed: bgo#162865, bgo#460908, bgo#478344, bgo#531319, + bgo#571254, bgo#587873, bgo#643490, bgo#645514, bgo#646798, + bgo#647779, bgo#649569, bgo#652304, bgo#657322, bgo#659613, + bgo#663072, bgo#663991, bgo#664646, bgo#665243, bgo#670449, + bgo#671025, bgo#671249, bgo#672947, bgo#673237, bgo#673749, + bgo#674192, bgo#674409, bgo#674549, bgo#675365, bgo#675421, + bgo#675423, bgo#675501, bgo#675535, bgo#675809, bgo#675895, + bgo#675899, bgo#675951, bgo#676087, bgo#676196, bgo#676198, + bgo#676243, bgo#676329, bgo#676356, bgo#676429, bgo#677055, + bgo#677109, bgo#677202, bgo#677203, bgo#677293, bgo#677363. + + Updated translations. + +------------------------------------------------------------------- +Mon Jul 16 01:25:16 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.2: + + Wayland: + - Allow the wayland backend to be used without cairo-gl + - Expose GdkWaylandDisplayManager for runtime checks + + Theming: + - Optimizations to style invalidation + - Support CSS animatable properties + + Bugs fixed: bgo#563688, bgo#646631, bgo#672361, bgo#672993, + bgo#674468, bgo#674577, bgo#674808, bgo#674809. + + Updated translations. +- Rebase Patches: + + gtk3-GTK_PATH64.patch + + gtk3-path-local.patch. + + gtk3-bnc130159-bgo319483-async-font-selection.patch + ------------------------------------------------------------------- Sun Jul 15 20:28:10 UTC 2012 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index d54163c..438465f 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -24,13 +24,13 @@ Name: gtk3 %define _name gtk+ -Version: 3.4.4 +Version: 3.5.16 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ Group: System/Libraries Url: http://www.gtk.org/ -Source: http://download.gnome.org/sources/gtk+/3.4/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gtk+/3.5/%{_name}-%{version}.tar.xz Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 @@ -42,8 +42,11 @@ Patch1: gtk3-path-local.patch # 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 -BuildRequires: pkgconfig(atk) >= 2.2.0 +BuildRequires: xsltproc +BuildRequires: pkgconfig(atk) >= 2.5.3 +BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) @@ -511,9 +514,11 @@ fi %files tools %defattr(-,root,root) +%{_bindir}/gtk-launch %{_bindir}/gtk-query-immodules-3.0* %{_bindir}/gtk-update-icon-cache-3.0 %ghost %{_bindir}/gtk-update-icon-cache +%{_mandir}/man1/gtk-launch.1%{?ext_man} %{_mandir}/man1/gtk-query-immodules-3.0*.1* %{_mandir}/man1/gtk-update-icon-cache-3.0.1* %ghost %{_mandir}/man1/gtk-update-icon-cache.1*