diff options
| author | Pavel Vinogradov | 2019-03-29 17:24:23 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2019-03-29 17:24:23 -0400 |
| commit | a910755ccd629717a594e2be0adc97a341baae40 (patch) | |
| tree | f9d5be847d03fc772975badfe9ffbd9b2f8a7b88 /xorg-app | |
| parent | b557ce4bb776ede2fb9acb819b950513b4199e96 (diff) | |
xorg-app/weston: fixed linking error with glib2
Diffstat (limited to 'xorg-app')
| -rw-r--r-- | xorg-app/weston/HISTORY | 2 | ||||
| -rwxr-xr-x | xorg-app/weston/PRE_BUILD | 4 | ||||
| -rw-r--r-- | xorg-app/weston/patches/editor-gobject.patch | 31 |
3 files changed, 37 insertions, 0 deletions
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY index 27e0f73a85..66d2125a63 100644 --- a/xorg-app/weston/HISTORY +++ b/xorg-app/weston/HISTORY @@ -1,6 +1,8 @@ 2019-03-29 Pavel Vinogradov <public@sourcemage.org> * DEPENDS, DETAILS: mesonified, updated dependencies * BUILD: added a workaround flag + * PRE_BUILD, patches/editor-gobject.patch: added upstream fix for + linking with glib2 2019-03-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 6.0.0 diff --git a/xorg-app/weston/PRE_BUILD b/xorg-app/weston/PRE_BUILD new file mode 100755 index 0000000000..23e683b990 --- /dev/null +++ b/xorg-app/weston/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && + +apply_patch_dir patches diff --git a/xorg-app/weston/patches/editor-gobject.patch b/xorg-app/weston/patches/editor-gobject.patch new file mode 100644 index 0000000000..151ffa637d --- /dev/null +++ b/xorg-app/weston/patches/editor-gobject.patch @@ -0,0 +1,31 @@ +From cbffca980b19fd6a6de14d9f2b4dca6a7711d9e0 Mon Sep 17 00:00:00 2001 +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 47e9e8ce..53a94212 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' }, +-- +2.18.1 + |