mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-04-20 11:38:34 +00:00
gnome-desktop: update 42.0 -> 43
Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,40 +0,0 @@
|
||||
From de0d33b068a5d8e61cc0c82d88d15b9a8aa97977 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 6 Apr 2019 18:07:17 +0200
|
||||
Subject: [PATCH] meson.build: Disable libseccomp for all archs
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It does not seem mandatory and can cause unsatisfied dependency [1].
|
||||
|
||||
[1] https://errors.yoctoproject.org/Errors/Details/235565/
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
meson.build | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1dc8a73..87d72fe 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -65,12 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev'))
|
||||
host_os = host_machine.system()
|
||||
host_cpu = host_machine.cpu()
|
||||
supported_os = ['linux']
|
||||
-unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64']
|
||||
-if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu)
|
||||
- seccomp_dep = dependency('libseccomp')
|
||||
-else
|
||||
- seccomp_dep = dependency('', required: false)
|
||||
-endif
|
||||
+seccomp_dep = dependency('', required: false)
|
||||
|
||||
fontconfig_cache_path = fontconfig_dep.get_variable(pkgconfig: 'cachedir')
|
||||
xkb_base = xkb_config_dep.get_variable(pkgconfig: 'xkb_base')
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -16,21 +16,22 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
|
||||
|
||||
GIR_MESON_OPTION = ""
|
||||
|
||||
SRC_URI[archive.sha256sum] = "f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6"
|
||||
SRC_URI += " \
|
||||
file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
|
||||
file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \
|
||||
"
|
||||
SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch"
|
||||
SRC_URI[archive.sha256sum] = "3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69"
|
||||
|
||||
DEPENDS += " \
|
||||
fontconfig \
|
||||
gdk-pixbuf \
|
||||
glib-2.0 \
|
||||
gsettings-desktop-schemas \
|
||||
virtual/libx11 \
|
||||
gtk+3 \
|
||||
gtk4 \
|
||||
startup-notification \
|
||||
xkeyboard-config \
|
||||
iso-codes \
|
||||
udev \
|
||||
xext \
|
||||
libseccomp \
|
||||
libxkbcommon \
|
||||
xkeyboard-config \
|
||||
xrandr \
|
||||
"
|
||||
|
||||
GTKDOC_MESON_OPTION = "gtk_doc"
|
||||
Reference in New Issue
Block a user