From 1f0954de1e7a4335cef9c841cc4df79d0862144a6871b07163daaa2357a2f72c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 24 Jan 2012 11:20:19 +0000 Subject: [PATCH] Accepting request 101327 from home:vuntz:branches:GNOME:Factory Update to 3.3.10 OBS-URL: https://build.opensuse.org/request/show/101327 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=75 --- gtk+-3.3.10.tar.xz | 3 +++ gtk+-3.3.8.tar.xz | 3 --- gtk3-unbreak-apps.patch | 24 ------------------------ gtk3.changes | 26 ++++++++++++++++++++++++++ gtk3.spec | 10 ++++------ 5 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 gtk+-3.3.10.tar.xz delete mode 100644 gtk+-3.3.8.tar.xz delete mode 100644 gtk3-unbreak-apps.patch diff --git a/gtk+-3.3.10.tar.xz b/gtk+-3.3.10.tar.xz new file mode 100644 index 0000000..0d28a5e --- /dev/null +++ b/gtk+-3.3.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9808d509bfd42fce692b041a60f3fbb668e43324613c304724e7a727bb44a2a0 +size 13031280 diff --git a/gtk+-3.3.8.tar.xz b/gtk+-3.3.8.tar.xz deleted file mode 100644 index 46af228..0000000 --- a/gtk+-3.3.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17bccca075f5f485d1265d0a3c3955aa6f10911f9f3675b859243fd7f3a88037 -size 13021636 diff --git a/gtk3-unbreak-apps.patch b/gtk3-unbreak-apps.patch deleted file mode 100644 index 948e206..0000000 --- a/gtk3-unbreak-apps.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 85fcd50b3f33cb811f4ba79a53b3a6b29054c721 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie -Date: Tue, 17 Jan 2012 15:55:50 +0000 -Subject: Revert "set the G_PARAM_CONSTRUCT flag on the GtkWindow:application property" - -This reverts commit d4fe912879ce1b19490ba5729f67a27b1cf397c9. - -This patch caused some unanticipated compatibility issues. ---- -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c -index 62b9ac0..93eb4a7 100644 ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -1044,7 +1044,7 @@ gtk_window_class_init (GtkWindowClass *klass) - P_("GtkApplication"), - P_("The GtkApplication for the window"), - GTK_TYPE_APPLICATION, -- GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); -+ GTK_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - window_signals[SET_FOCUS] = - g_signal_new (I_("set-focus"), --- -cgit v0.9.0.2 diff --git a/gtk3.changes b/gtk3.changes index 8b6c201..0d8712c 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Jan 24 11:18:14 UTC 2012 - vuntz@opensuse.org + +- Move ChangeLog to devel subpackage, as it can be big and is not + needed on a default install. + +------------------------------------------------------------------- +Fri Jan 20 21:46:25 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.10: + + GtkApplication: + - Move application menu handling over from GIO + - Fix resize grip positioning in GtkApplicationWindow + + Wayland: + - Make combo boxes work + - Make key modifiers work like on X11 + - Make mouse buttons work correctly + + Quartz: + - Make key modifiers work more like they do on X11 + + Printing: + - Fix handling of custom cups options + + Accessibility: + - Bring key snooping support back for now + + Updated translations. +- Drop gtk3-unbreak-apps.patch: fixed upstream. + ------------------------------------------------------------------- Fri Jan 20 14:08:02 UTC 2012 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 20f1dc3..420dc40 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -24,7 +24,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.3.8 +Version: 3.3.10 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -41,8 +41,6 @@ Patch0: gtk3-GTK_PATH64.patch 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 -# PATCH-FIX-UPSTREAM gtk3-unbreak-apps.patch bgo#667628 vuntz@opensuse.org -- Revert change breaking eog & epiphany -Patch4: gtk3-unbreak-apps.patch BuildRequires: cups-devel BuildRequires: fdupes # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 @@ -52,7 +50,7 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.5 -BuildRequires: pkgconfig(glib-2.0) >= 2.31.10 +BuildRequires: pkgconfig(glib-2.0) >= 2.31.11 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(pango) @@ -290,7 +288,6 @@ cp -a %{S:1} . %endif %patch1 -p0 %patch3 -p1 -%patch4 -p1 %build %configure \ @@ -448,7 +445,7 @@ fi %files -n libgtk-3-0 %defattr(-, root, root) -%doc AUTHORS COPYING README NEWS ChangeLog +%doc AUTHORS COPYING README NEWS %if "%_lib" == "lib64" %doc README.SUSE %endif @@ -531,6 +528,7 @@ fi %files devel %defattr(-,root,root) +%doc ChangeLog %doc %{_datadir}/gtk-doc/html/gail-libgail-util3/ %doc %{_datadir}/gtk-doc/html/gdk3/ %doc %{_datadir}/gtk-doc/html/gtk3/