From eafc4bfb176d692eb8fe96048784dec9cff01ce1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 12:11:52 +0200 Subject: [PATCH] clutter: fix x11 when GDK_BACKEND isn't set --- .../patches/clutter-x11-startup-error.patch | 39 +++++++++++++++++++ srcpkgs/clutter/template | 7 ++-- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/clutter/patches/clutter-x11-startup-error.patch diff --git a/srcpkgs/clutter/patches/clutter-x11-startup-error.patch b/srcpkgs/clutter/patches/clutter-x11-startup-error.patch new file mode 100644 index 00000000000..8612c8a7757 --- /dev/null +++ b/srcpkgs/clutter/patches/clutter-x11-startup-error.patch @@ -0,0 +1,39 @@ +The following patch reverts this change as it breaks gnome with x11 which +is still the default with void linux: + +From 55093e304ec0c8cdc287ed933f4d78ca6eea5e07 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Mon, 29 Feb 2016 19:50:43 +0100 +Subject: [PATCH] backend: check for wayland before x11 + +this way, clutter-gtk applications work fine on wayland +without the need of exporting CLUTTER_BACKEND=wayland +as gtk+ checks for wayland and x11 in the same order + +https://bugzilla.gnome.org/show_bug.cgi?id=762888 + +Signed-off-by: Marc-Antoine Perennou +--- + clutter/clutter-backend.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c +index d150e7c..b4e5f82 100644 +--- clutter/clutter-backend.c ++++ clutter/clutter-backend.c +@@ -545,12 +545,12 @@ static const struct { + #ifdef CLUTTER_WINDOWING_GDK + { CLUTTER_WINDOWING_GDK, clutter_backend_gdk_new }, + #endif ++#ifdef CLUTTER_WINDOWING_X11 ++ { CLUTTER_WINDOWING_X11, clutter_backend_x11_new }, ++#endif + #ifdef CLUTTER_WINDOWING_WAYLAND + { CLUTTER_WINDOWING_WAYLAND, clutter_backend_wayland_new }, + #endif +-#ifdef CLUTTER_WINDOWING_X11 +- { CLUTTER_WINDOWING_X11, clutter_backend_x11_new }, +-#endif + #ifdef CLUTTER_WINDOWING_EGL + { CLUTTER_WINDOWING_EGL, clutter_backend_egl_native_new }, + #endif diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index bf98c275c4e..3b5f18eecda 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,8 +1,7 @@ # Template file for 'clutter' pkgname=clutter -reverts=1.26.2_1 -version=1.26.0 -revision=1 +version=1.26.2 +revision=2 build_style=gnu-configure build_options="gir" configure_args="$(vopt_enable gir introspection) --enable-evdev --enable-evdev-input @@ -17,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" -checksum=67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06 +checksum=e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56 if [ -z "$CROSS_BUILD" ]; then build_options_default="gir"