summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-gnome
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-04-08 22:21:03 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-04-08 22:21:12 +0300
commit34ae60030e520db4235f13b99849052e594fde7b (patch)
treef672a23d5bf8d8cf74737e80a304c55766a7d596 /meta-openembedded/meta-gnome
parent4e3797a177a8edd3909ab428353e5186447b8312 (diff)
downloadopenbmc-34ae60030e520db4235f13b99849052e594fde7b.tar.xz
meta-openembedded: refresh master: 0435c9e193..4a9deabbc8
Update meta-openembedded to master HEAD. Alistair Francis (7): python3-pyaudio: Initial commit python3-pyfann2: Initial commit python3-pocketsphinx: Initial commit python3-xxhash: Initial commit mycroft: Initial commit libfann: Initial commit python-cryptography: Bump from 2.4.1 to 2.6.1 Andreas Müller (10): xfce4-screenshooter: upgrade 1.9.4 -> 1.9.5 networkmanager: Fix upstream regex for 1.16 networkmanager: fix build with musl gvfs: fix configure options and DDEPENDS rrdtool: fix build by disabling docs libpeas: rework gobject-introspection handling gvfs: Fix missing executable permission flags for files in libexec gnome-desktop3: remove gconf from DEPENDS gnome-desktop3: rework gobject-introspection handling gnome-desktop3: Disable libseccomp for all archs Brad Bishop (1): libvncserver: enable split client/server packages Fabio Berton (1): python*-requests: Update 2.20.1 -> 2.21.0 Gianfranco Costamagna (2): cpprest: fix build failure on 32bit systems, with upstream merged patch libmodbus: start to prefer version 3.1.4 as default Hongxu Jia (1): dracut: fix udevdir not found Khem Raj (5): ncmpc: Rename artist_screen to library_screen networkmanager: Fix build with clang alsa-oss: Upgrade to 1.1.8 redis: Fix ocasional parallel build failure lcdproc: Fix parallel build Nikolay Nizov (2): android-tools-conf: fix typo android-tools-conf: Make sure /dev/pts/0 exists Oleksandr Kravchuk (2): fping: update to 4.2 nuttcp: update to 7.3.3 Peter Kjellerstedt (1): doxygen: Make it build with ninja 1.9.0 Qi.Chen@windriver.com (2): openldap: add missing CVE tag to patch ipsec-tools: add missing CVE tags to patches Randy MacLeod (2): imagemagic: upgrade to 7.0.8-35 wolfssl: update to 3.15.8 and use github SRC_URI Slater, Joseph (1): tcpreplay: update to version 4.3.2 Vincent Prince (4): Rsyslog: Add mmjsonparse to PACKAGECONFIG zeromq: bump version 4.2.5 => 4.3.1 cppzmq: bump version 4.2.3 => 4.3.0 czmq: bump version 4.1.1 => 4.2.0 Yi Zhao (3): python-engineio: add recipe python-socketio: add recipe python-flask-socketio Zang Ruochen (4): augeas: upgrade 1.10.1 -> 1.11.0 libedit: upgrade 20181209-3.1 -> 20190324-3.1 mcelog: upgrade 161 -> 162 lockfile-progs: upgrade 0.1.17 -> 0.1.18 leimaohui (1): Fix build error for armeb. Change-Id: Ie79748c484bcf4fd28b3bde84e2194044e1c08a8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-gnome')
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch40
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb13
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb14
3 files changed, 60 insertions, 7 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch
new file mode 100644
index 000000000..e93d5b674
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch
@@ -0,0 +1,40 @@
+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 83407b4..80eab84 100644
+--- a/meson.build
++++ b/meson.build
+@@ -53,12 +53,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_pkgconfig_variable('cachedir')
+
+ xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base')
+--
+2.20.1
+
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
index 185a25359..ffd7dcea4 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
@@ -8,14 +8,21 @@ BPN = "gnome-desktop"
GNOMEBASEBUILDCLASS = "meson"
-inherit gnome pkgconfig upstream-version-is-even gobject-introspection
+inherit gnome pkgconfig upstream-version-is-even gobject-introspection distro_features_check
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99"
SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54"
-SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch"
+SRC_URI += " \
+ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
+ file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \
+"
-DEPENDS += "itstool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
+DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev"
inherit distro_features_check gtk-doc
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
index 7f239c413..df9fd50ea 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
GNOMEBASEBUILDCLASS = "meson"
inherit gnome bash-completion gettext upstream-version-is-even
-DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit shadow-native"
+DEPENDS += "libsecret glib-2.0 gconf libgudev udisks2 polkit shadow-native"
SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
@@ -15,12 +15,10 @@ SRC_URI[archive.sha256sum] = "3739d64b79c95a9f0f9faf2c5f9e5298b4b2ebdd6431435ce6
EXTRA_OEMESON = " \
-Dbluray=false \
- -Dgdu=false \
-Dgoa=false \
-Dgoogle=false \
-Dnfs=false \
-Dudisks2=true \
- -Ddocumentation=false \
"
PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
@@ -63,8 +61,16 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse"
# libcdio-paranoia recipe doesn't exist yet
PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia"
-# Fix up permissions on polkit rules.d to work with rpm4 constraints
do_install_append() {
+ # Fix up permissions on polkit rules.d to work with rpm4 constraints
chmod 700 ${D}/${datadir}/polkit-1/rules.d
chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
+
+ # After rebuilds (not from scracth) it can happen that the executables in
+ # libexec ar missing executable permission flag. Not sure but it came up
+ # during transition to meson. Looked into build files and logs but could
+ # not find suspicious
+ for exe in `find ${D}/${libexec}`; do
+ chmod +x $exe
+ done
}