[gnome-build-meta/abderrahim/buildstream-1.1.4] core-deps: remove wayland
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/buildstream-1.1.4] core-deps: remove wayland
- Date: Tue, 7 Aug 2018 11:05:17 +0000 (UTC)
commit 91885c0e7c802a277b4e732903f9abe85c4b64ed
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Tue Aug 7 12:03:38 2018 +0100
core-deps: remove wayland
We are using the same version as freedesktop-sdk, and it is causing
problems with overlaps.
elements/core-deps.bst | 1 -
elements/core-deps/WebKitGTK+.bst | 3 ++-
elements/core-deps/clutter.bst | 3 ++-
elements/core-deps/cogl.bst | 3 ++-
elements/core-deps/gtk+-3.bst | 3 ++-
elements/core-deps/gtk+.bst | 3 ++-
elements/core-deps/wayland.bst | 9 ---------
elements/core/mutter.bst | 3 ++-
8 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index cb34fb9..1297e45 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -205,7 +205,6 @@ depends:
- core-deps/valgrind.bst
- core-deps/volume-key.bst
- core-deps/vte.bst
-- core-deps/wayland.bst
- core-deps/woff2.bst
- core-deps/xmlto.bst
- core-deps/yelp-tools.bst
diff --git a/elements/core-deps/WebKitGTK+.bst b/elements/core-deps/WebKitGTK+.bst
index d20245e..c70f594 100644
--- a/elements/core-deps/WebKitGTK+.bst
+++ b/elements/core-deps/WebKitGTK+.bst
@@ -17,8 +17,9 @@ depends:
- core-deps/libsecret.bst
- core-deps/libsoup.bst
- core-deps/pango.bst
-- core-deps/wayland.bst
- core-deps/woff2.bst
+- filename: desktop/wayland.bst
+ junction: freedesktop-sdk.bst
- filename: desktop/hyphen.bst
junction: freedesktop-sdk.bst
- filename: desktop/xorg-lib-xt.bst
diff --git a/elements/core-deps/clutter.bst b/elements/core-deps/clutter.bst
index 473f786..fd53e74 100644
--- a/elements/core-deps/clutter.bst
+++ b/elements/core-deps/clutter.bst
@@ -12,7 +12,8 @@ depends:
- core-deps/json-glib.bst
- core-deps/libgudev.bst
- core-deps/libinput.bst
-- core-deps/wayland.bst
+- filename: desktop/wayland.bst
+ junction: freedesktop-sdk.bst
- filename: base.bst
junction: freedesktop-sdk.bst
variables:
diff --git a/elements/core-deps/cogl.bst b/elements/core-deps/cogl.bst
index c2ef785..55662d7 100644
--- a/elements/core-deps/cogl.bst
+++ b/elements/core-deps/cogl.bst
@@ -10,7 +10,8 @@ depends:
- core-deps/gstreamer.bst
- core-deps/gtk-doc.bst
- core-deps/pango.bst
-- core-deps/wayland.bst
+- filename: desktop/wayland.bst
+ junction: freedesktop-sdk.bst
- filename: base.bst
junction: freedesktop-sdk.bst
variables:
diff --git a/elements/core-deps/gtk+-3.bst b/elements/core-deps/gtk+-3.bst
index a2d7f20..aef21d9 100644
--- a/elements/core-deps/gtk+-3.bst
+++ b/elements/core-deps/gtk+-3.bst
@@ -11,7 +11,8 @@ depends:
- core-deps/gobject-introspection.bst
- core-deps/gtk-doc.bst
- core-deps/pango.bst
-- core-deps/wayland.bst
+- filename: desktop/wayland.bst
+ junction: freedesktop-sdk.bst
- filename: desktop/cairo.bst
junction: freedesktop-sdk.bst
- filename: desktop/libepoxy.bst
diff --git a/elements/core-deps/gtk+.bst b/elements/core-deps/gtk+.bst
index c4ae4ea..0eaace9 100644
--- a/elements/core-deps/gtk+.bst
+++ b/elements/core-deps/gtk+.bst
@@ -15,7 +15,8 @@ depends:
- core-deps/gstreamer.bst
- core-deps/gtk-doc.bst
- core-deps/pango.bst
-- core-deps/wayland.bst
+- filename: desktop/wayland.bst
+ junction: freedesktop-sdk.bst
- filename: base.bst
junction: freedesktop-sdk.bst
variables:
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index 2175270..3fb2759 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -14,7 +14,6 @@ depends:
- core-deps/libinput.bst
- core-deps/pango.bst
- core-deps/upower.bst
-- core-deps/wayland.bst
- core-deps/zenity.bst
- core/gnome-desktop.bst
- core/gsettings-desktop-schemas.bst
@@ -22,6 +21,8 @@ depends:
junction: freedesktop-sdk.bst
- filename: desktop/xorg-lib-xtst.bst
junction: freedesktop-sdk.bst
+- filename: desktop/wayland.bst
+ junction: freedesktop-sdk.bst
- filename: base.bst
junction: freedesktop-sdk.bst
variables:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]