From 6521b0bc6313f2551b368253198ac4c92a73901d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 22 2014 12:45:23 +0000 Subject: Update to 1.6.0 --- diff --git a/0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch b/0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch deleted file mode 100644 index bb44b96..0000000 --- a/0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a2a62570dd038a459326e3d56cb593af97e2f6f3 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Thu, 28 Aug 2014 15:44:44 +0100 -Subject: [PATCH] Revert "Prefer the GDK windowing backend for Clutter" - -This reverts commit 0fc73a07770223964dbf41a20a4b0a8c3ef9a29c. - -I could have gotten away with this, if it wasn't for you meddling kids -and your Wayland. ---- - clutter-gtk/gtk-clutter-util.c | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c -index 53ec095..f66f8a9 100644 ---- a/clutter-gtk/gtk-clutter-util.c -+++ b/clutter-gtk/gtk-clutter-util.c -@@ -66,9 +66,6 @@ gtk_clutter_init_internal (void) - display = gdk_display_get_default (); - - #if defined(CLUTTER_WINDOWING_GDK) -- /* we want the GDK backend by default */ -- clutter_set_windowing_backend (CLUTTER_WINDOWING_GDK); -- - if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK)) - { - clutter_gdk_set_display (gdk_display_get_default ()); -@@ -82,7 +79,7 @@ gtk_clutter_init_internal (void) - if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) && - GDK_IS_X11_DISPLAY (display)) - { -- /* enable ARGB visuals by default for Clutter; this is a no-op */ -+ /* enable ARGB visuals by default for Clutter */ - clutter_x11_set_use_argb_visual (TRUE); - - /* share the X11 Display with GTK+ */ -@@ -113,9 +110,7 @@ gtk_clutter_init_internal (void) - } - else - #endif -- { -- g_error ("*** Unsupported backend."); -- } -+ g_error ("*** Unsupported backend."); - - /* We disable clutter accessibility support in order to not - * interfere with gtk accessibility support. --- -2.1.0 - diff --git a/clutter-gtk.spec b/clutter-gtk.spec index ff10aed..3e7dc67 100644 --- a/clutter-gtk.spec +++ b/clutter-gtk.spec @@ -1,16 +1,14 @@ %define clutter_version 1.0 Name: clutter-gtk -Version: 1.5.4 -Release: 2%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: A basic GTK clutter widget Group: Development/Languages License: LGPLv2+ URL: http://www.clutter-project.org -Source0: http://download.gnome.org/sources/clutter-gtk/1.5/clutter-gtk-%{version}.tar.xz - -Patch0: 0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch +Source0: http://download.gnome.org/sources/clutter-gtk/1.6/clutter-gtk-%{version}.tar.xz BuildRequires: gtk3-devel >= 3.0.0 BuildRequires: clutter-devel >= 1.9 @@ -33,7 +31,6 @@ clutter-gtk. %prep %setup -q -%patch0 -p1 %build @@ -69,6 +66,9 @@ make check %{?_smp_mflags} V=1 %{_datadir}/gtk-doc/html/clutter-gtk-1.0 %changelog +* Mon Sep 22 2014 Kalev Lember - 1.6.0-1 +- Update to 1.6.0 + * Sun Sep 07 2014 Kalev Lember - 1.5.4-2 - Revert "Prefer the GDK windowing backend for Clutter" (#1134921, #1139052) diff --git a/sources b/sources index e74433d..155c935 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7623247ca3a0d37621091783cf9cdc61 clutter-gtk-1.5.4.tar.xz +08e5d7c249733d4d96bbbd2dc970a06c clutter-gtk-1.6.0.tar.xz