[clutter/f19] Revert last merge
Kalev Lember
kalev at fedoraproject.org
Fri May 17 12:23:54 UTC 2013
commit b98ff9e7f7ade74ccdef3fbf9b5bc87a21e2256a
Author: Kalev Lember <kalevlember at gmail.com>
Date: Fri May 17 14:22:37 2013 +0200
Revert last merge
The git merge from master branch accidentally enabled the clutter
wayland support in F19. To enable it we'd need cogl built with wayland
backend enabled, and this is currently disabled in F19 cogl builds.
This reverts commit 1738557689f44c8ae9294c1d9051d03434103b51, reversing
changes made to c954df28e5dc0d8b370208ff19ff1d99077c1a7f.
(Use 'git cherry-pick' instead of merge when branches have diverged.)
...Prefer-the-X11-backend-to-the-Wayland-one.patch | 52 ----------------
clutter-1.13.4-xi23.patch | 65 ++++++++++++++++++++
clutter-xi2-crash.patch | 26 ++++++++
clutter.spec | 34 +---------
oob-device-fix.patch | 33 ++++++++++
sources | 2 +-
6 files changed, 129 insertions(+), 83 deletions(-)
---
diff --git a/clutter-1.13.4-xi23.patch b/clutter-1.13.4-xi23.patch
new file mode 100644
index 0000000..b11c80c
--- /dev/null
+++ b/clutter-1.13.4-xi23.patch
@@ -0,0 +1,65 @@
+From b58a1d66816c19eda079a1bd7cecd1ad03644e69 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Wed, 23 Jan 2013 17:09:59 -0500
+Subject: [PATCH] x11: Always request XI2.2
+
+The X server should fill in the minor version that it supports in the
+case where it only supports the older version. We should not get a
+BadRequest or fail the version check if we pass something higher.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692466
+---
+ clutter/x11/clutter-backend-x11.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
+index 2d8f4ba..26f9581 100644
+--- a/clutter/x11/clutter-backend-x11.c
++++ b/clutter/x11/clutter-backend-x11.c
+@@ -239,12 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
+ {
+ #ifdef HAVE_XINPUT_2
+ int major = 2;
+-
+-#ifdef HAVE_XINPUT_2_2
+ int minor = 2;
+-#else
+- int minor = 0;
+-#endif /* HAVE_XINPUT_2_2 */
+
+ if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
+ {
+--
+1.8.1.2
+
+From 3e1450ba17fce90a8034cc525c67a87ff3cdd53d Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Wed, 23 Jan 2013 14:49:26 -0500
+Subject: [PATCH] clutter-backend: Request XI2.3
+
+Since XIQueryVersion, the bad API that it is, chooses the first client
+version that it gets, we need to ensure that we pass XIQueryVersion the
+new XI2.3 version, knowing fully well that Clutter won't be confused
+by the new features.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692466
+---
+ clutter/x11/clutter-backend-x11.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
+index 26f9581..1015f4c 100644
+--- a/clutter/x11/clutter-backend-x11.c
++++ b/clutter/x11/clutter-backend-x11.c
+@@ -239,7 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
+ {
+ #ifdef HAVE_XINPUT_2
+ int major = 2;
+- int minor = 2;
++ int minor = 3;
+
+ if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
+ {
+--
+1.8.1.2
+
diff --git a/clutter-xi2-crash.patch b/clutter-xi2-crash.patch
new file mode 100644
index 0000000..219144b
--- /dev/null
+++ b/clutter-xi2-crash.patch
@@ -0,0 +1,26 @@
+diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
+index 73e99af..b5bf2e4 100644
+--- a/clutter/x11/clutter-device-manager-xi2.c
++++ b/clutter/x11/clutter-device-manager-xi2.c
+@@ -733,12 +733,15 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
+
+ device = g_hash_table_lookup (manager_xi2->devices_by_id,
+ GINT_TO_POINTER (xev->deviceid));
+- _clutter_input_device_reset_axes (device);
+- _clutter_input_device_reset_scroll_info (device);
+- translate_device_classes (backend_x11->xdpy,
+- device,
+- xev->classes,
+- xev->num_classes);
++ if (device)
++ {
++ _clutter_input_device_reset_axes (device);
++ _clutter_input_device_reset_scroll_info (device);
++ translate_device_classes (backend_x11->xdpy,
++ device,
++ xev->classes,
++ xev->num_classes);
++ }
+ }
+ retval = CLUTTER_TRANSLATE_REMOVE;
+ break;
diff --git a/clutter.spec b/clutter.spec
index 299882d..03ab068 100644
--- a/clutter.spec
+++ b/clutter.spec
@@ -1,9 +1,5 @@
-%if 0%{?fedora}
-%global with_wayland 1
-%endif
-
Name: clutter
-Version: 1.14.4
+Version: 1.14.2
Release: 1%{?dist}
Summary: Open Source software library for creating rich graphical user interfaces
@@ -22,12 +18,6 @@ BuildRequires: libXcomposite-devel
BuildRequires: libXdamage-devel
BuildRequires: libXi-devel
Requires: gobject-introspection
-%if %{with_wayland}
-BuildRequires: libwayland-client-devel
-BuildRequires: libwayland-cursor-devel
-BuildRequires: libxkbcommon-devel
-%endif
-
# F18
Obsoletes: clutter-gtk010 < 0.11.4-9
@@ -78,11 +68,7 @@ This package contains documentation for clutter.
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
%configure $CONFIGFLAGS \
- --enable-xinput \
- --enable-gdk-backend \
-%if %{with_wayland}
- --enable-wayland-backend \
-%endif
+ --enable-xinput
# clutter git ships with some magic to put the git log in shipped tarballs
# which gets listed in files; don't blow up if it's missing
if ! test -f ChangeLog; then
@@ -122,26 +108,14 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/gtk-doc/html/cally
%changelog
-* Wed May 15 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.14.4-1
-- Update to 1.14.4
-
* Wed Apr 17 2013 Richard Hughes <rhughes at redhat.com> - 1.14.2-1
- Update to 1.14.2
* Tue Mar 26 2013 Kalev Lember <kalevlember at gmail.com> - 1.14.0-1
- Update to 1.14.0
-* Tue Mar 19 2013 Matthias Clasen <mclasen at redhat.com> - 1.13.10-1
-- Update to 1.13.10
-
-* Thu Mar 14 2013 Bastien Nocera <bnocera at redhat.com> 1.13.8-4
-- Prefer the X11 backend to the Wayland one, and enable wayland
-
-* Thu Mar 14 2013 Matthias Clasen <mclasen at redhat.com> 1.13.8-3
-- Enabling Wayland broke the login screen, so disable for now
-
-* Wed Mar 13 2013 Matthias Clasen <mclasen at redhat.com> 1.13.8-2
-- Enable Wayland backend
+* Tue Mar 19 2013 Ray Strode <rstrode at redhat.com> 1.13.10-1
+- Update to 1.3.10
* Tue Mar 5 2013 Matthias Clasen <mclasen at redhat.com> 1.13.8-1
- Update to 1.13.8
diff --git a/oob-device-fix.patch b/oob-device-fix.patch
new file mode 100644
index 0000000..cc59282
--- /dev/null
+++ b/oob-device-fix.patch
@@ -0,0 +1,33 @@
+From d5604be9e5a148ced73dee2ede49b38f97119baf Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Mon, 28 Jan 2013 15:49:51 +0200
+Subject: [PATCH] xi2: Fix access beyond array boundaries
+
+---
+ clutter/x11/clutter-device-manager-xi2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
+index 616dee7..bd9473e 100644
+--- a/clutter/x11/clutter-device-manager-xi2.c
++++ b/clutter/x11/clutter-device-manager-xi2.c
+@@ -94,13 +94,13 @@ translate_valuator_class (Display *xdisplay,
+ atoms_initialized = TRUE;
+ }
+
+- for (i = CLUTTER_INPUT_AXIS_IGNORE;
+- i < CLUTTER_INPUT_AXIS_LAST;
++ for (i = 0;
++ i < N_AXIS_ATOMS;
+ i += 1)
+ {
+ if (clutter_input_axis_atoms[i] == class->label)
+ {
+- axis = i;
++ axis = i + 1;
+ break;
+ }
+ }
+--
+1.8.1
+
diff --git a/sources b/sources
index 34c53e6..24e84e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c072e4c27e69368f2b877ea4f6da2cdf clutter-1.14.4.tar.xz
+efe6ede426c99389f3ff698685cf6094 clutter-1.14.2.tar.xz
More information about the scm-commits
mailing list