[ptxdist] [PATCH] weston: version bump 6.0.0 -> 6.0.1

[ptxdist] [PATCH] weston: version bump 6.0.0 -> 6.0.1

[Philipp Zabel]

Miscellaneous fixes, mostly Meson build system.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...1-meson-link-editor-with-gobject-2.0.patch | 27 -------------------
 patches/weston-6.0.0/series                   |  4 ---
 rules/weston.make                             |  4 +--
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 patches/weston-6.0.0/0001-meson-link-editor-with-gobject-2.0.patch
 delete mode 100644 patches/weston-6.0.0/series

diff --git a/patches/weston-6.0.0/0001-meson-link-editor-with-gobject-2.0.patch b/patches/weston-6.0.0/0001-meson-link-editor-with-gobject-2.0.patch
deleted file mode 100644
index 377201370894..000000000000
--- a/patches/weston-6.0.0/0001-meson-link-editor-with-gobject-2.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Pekka Paalanen <pekka.paalanen@collabora.com>
-Date: Fri, 22 Mar 2019 13:58:30 +0200
-Subject: [PATCH] meson: link editor with gobject-2.0
-
-editor.c calls g_clear_object(), so it should link to gobject directly instead
-of relying on pangocairo pulling it in in its pkg-config.
-
-Fixes: https://gitlab.freedesktop.org/wayland/weston/issues/211
-
-Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
----
- clients/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clients/meson.build b/clients/meson.build
-index 47e9e8ce3d4f..53a94212fbf1 100644
---- a/clients/meson.build
-+++ b/clients/meson.build
-@@ -236,7 +236,7 @@ demo_clients = [
- 			text_input_unstable_v1_client_protocol_h,
- 			text_input_unstable_v1_protocol_c,
- 		],
--		'deps': [ 'pangocairo' ]
-+		'deps': [ 'pangocairo', 'gobject-2.0' ]
- 	},
- 	{ 'basename': 'eventdemo' },
- 	{ 'basename': 'flower' },
diff --git a/patches/weston-6.0.0/series b/patches/weston-6.0.0/series
deleted file mode 100644
index ab85096ab2b0..000000000000
--- a/patches/weston-6.0.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-meson-link-editor-with-gobject-2.0.patch
-# 8ef3b72a2ca4ff289abb571736a695ac  - git-ptx-patches magic
diff --git a/rules/weston.make b/rules/weston.make
index 23b03cff1695..26a3ff72f567 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -17,9 +17,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION	:= 6.0.0
+WESTON_VERSION	:= 6.0.1
 LIBWESTON_MAJOR := 6
-WESTON_MD5	:= 7c634e262f8a464a076c97fd50ad36b3
+WESTON_MD5	:= e7b10710ef1eac82258f97bfd41fe534
 WESTON		:= weston-$(WESTON_VERSION)
 WESTON_SUFFIX	:= tar.xz
 WESTON_URL	:= http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de