clutter: fix x11 when GDK_BACKEND isn't set
This commit is contained in:
parent
20a0d7c9df
commit
eafc4bfb17
39
srcpkgs/clutter/patches/clutter-x11-startup-error.patch
Normal file
39
srcpkgs/clutter/patches/clutter-x11-startup-error.patch
Normal file
@ -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 <Marc-Antoine@Perennou.com>
|
||||||
|
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 <Marc-Antoine@Perennou.com>
|
||||||
|
---
|
||||||
|
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
|
@ -1,8 +1,7 @@
|
|||||||
# Template file for 'clutter'
|
# Template file for 'clutter'
|
||||||
pkgname=clutter
|
pkgname=clutter
|
||||||
reverts=1.26.2_1
|
version=1.26.2
|
||||||
version=1.26.0
|
revision=2
|
||||||
revision=1
|
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
build_options="gir"
|
build_options="gir"
|
||||||
configure_args="$(vopt_enable gir introspection) --enable-evdev --enable-evdev-input
|
configure_args="$(vopt_enable gir introspection) --enable-evdev --enable-evdev-input
|
||||||
@ -17,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||||||
homepage="http://www.clutter-project.org"
|
homepage="http://www.clutter-project.org"
|
||||||
license="LGPL-2.1"
|
license="LGPL-2.1"
|
||||||
distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz"
|
distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz"
|
||||||
checksum=67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06
|
checksum=e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56
|
||||||
|
|
||||||
if [ -z "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
build_options_default="gir"
|
build_options_default="gir"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user