summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-gnome
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2024-01-19 17:49:29 +0300
committerPatrick Williams <patrick@stwcx.xyz>2024-01-23 20:52:36 +0300
commit56b44a9896b5068220cbd7d58795773b750149c8 (patch)
tree26baf5d8f0d7031707b62deab067516b733c915a /meta-openembedded/meta-gnome
parent1ada3c2d58691868267415a1ea08dab4a7f54aef (diff)
downloadopenbmc-56b44a9896b5068220cbd7d58795773b750149c8.tar.xz
subtree updates
meta-arm: 5712422011..1cad3c3813: Jon Mason (3): arm/pyhsslms: update to 2.0.0 arm/trusted-firmware-m: update to 2.0.0 arm/opencsd: update to 1.4.2 Ross Burton (2): arm-bsp/documentation: upgrade Sphinx slightly arm/fvp-base-a-aem: upgrade to 11.24.11 Vikas Katariya (2): arm-bsp/n1sdp: Downgrade to 6.1 linux yocto kernel arm-bsp/linux-yocto: Remove EOL Linux yocto kernel 6.5 meta-openembedded: 098dc606f9..4dbbef7a39: Alex Kiernan (1): thin-provisioning-tools: Drop musl fixes (fixed upstream) Derek Straka (9): python3-web3: update to version 6.14.0 python3-engineio: update to version 4.8.2 python3-marshmallow: update to version 3.20.2 python3-apispec: update to version 6.4.0 python3-protobuf: update to version 4.25.1 python3-eth-hash: update to version 0.6.0 python3-google-auth: update to version 2.26.2 python3-socketio: update to version 5.11.0 python3-google-api-python-client: update to version 2.113.0 Fabio Estevam (1): v4l-utils: Update to 1.26.1 Jörg Sommer (1): i2cdev: Fix MUSL build Khem Raj (7): thunar: inherit gtk-doc libxklavier: inherit gtk-doc libwnck: inherit gtk-doc schroedinger: inherit gtk-doc gst-shark: inherit gtk-doc evolution-data-server: Use inherit_defer for native class opencl-icd: Rename rdepends to virtual-opencl-icd Markus Volk (2): flatpak: fix gtk-doc build gvfs: drop gnome-keyring rdepend Peter Marko (1): grpc: correct dependencies Randy MacLeod (1): rng-tools: move from oe-core to meta-oe Ross Burton (9): libuser: fix gtk-doc configure call libuser: remove obsolete GTKDOC_DOCDIR assignment gtksourceview4: remove check for target gtk-doc gtksourceview4: remove obsolete workaround for build failures telepathy-glib: inherit gtk-doc glade: inherit gtk-doc, fix FILES libgxim: inherit gtk-doc gmime: inherit gtk-doc raptor2: inherit gtk-doc Wang Mingyu (3): frr: use update-alternatives for ietf-interfaces.yang libsmi: use update-alternatives for ietf-interfaces.yang frr: Fix install conflict when enable multilib. alperak (1): adcli: use https protocol for fetching poky: 61182659c2..7af374c90c: Alexander Kanavin (3): glib-2.0: ensure GI_DATA_ENABLED is set gobject-introspection-data.bbclass: move do_compile() tweak to g-i class python: update 3.11.5 -> 3.12.1 Alexander Sverdlin (2): linux-firmware: upgrade 20231030 -> 20231211 linux-firmware: package PowerVR firmware André Draszik (1): linux-firmware: split out rockchip/dptx firmware Changhyeok Bae (1): iw: upgrade 5.19 -> 6.7 Etienne Cordonnier (3): package.py: fix Darwin support chrpath.bbclass: fix Darwin support siteinfo.bbclass: add support for darwin19 and darwin21 Fabio Estevam (2): mesa: Upgrade 23.3.2 -> 23.3.3 libdrm: Upgrade to 2.4.120 Joe Slater (1): init-ifupdown: add predictable interface names Kai Kang (1): xserver-xorg: 21.1.9 -> 21.1.11 Khem Raj (3): webkitgtk: Workaround for clang compiler segfault mdadm: Disable 10ddf-fail-spare and 10ddf-fail-stop-readd testcases openssl: Fix build on riscv Ola x Nilsson (2): insane.bbclass: Check for adjtime in check_32_bit_symbols insane.bbclass: Python code cleanup in check_32bit_symbols Petr Vorel (1): iputils: update to 20240117 Randy MacLeod (2): rng-tools: move to meta-oe rng-tools: Revert "rng-tools: move to meta-oe" Richard Purdie (13): bitbake: ast/BBHandler: Add inherit_defer support allarch: Fix allarch corner case rootfs: Fix MULTILIB_RE_ALLOW to be inherit order independent rootfs-postcommands: Try and improve ordering constraints classes/recipes: Switch to use inherit_defer libtool: Update patches to mark as backports libtool: Update nios2 patch to match upstream merged version libtool: Update prefixmap and clang patches to match upstream submission libtool: Update cleanup sysroot handling patch libtool: Update patch offsets libtool: Update further patch status to backport reproducible: Fix race with externalsrc/devtool over lockfile build-appliance-image: Update to master head revision Ross Burton (4): musl: doesn't support riscv32 libunwind: merge .inc and .bb libunwind: refresh patches libunwind: clean up configuration Simone Weiß (1): classes-global/insane: Add check for "virtual/" in RPROVIDES and RDEPENDS Tim Orling (1): python3-alabaster: upgrade 0.7.13 -> 0.7.16 Trevor Woerner (1): bmaptool: add 3 fixes Vyacheslav Yurkov (9): recipetool: Don't fail on local go modules classes: go-vendor: Reference local modules classes: go-vendor: Handle modules from the same repo classes: go-vendor: Unlink vendor dir later recipetool: Proceed even with a missing license file recipetool: Disregard version in URL for replaced modules oeqa/selftest/recipetool: Move create_go test to a proper class oeqa/selftest/recipetool: Move helper function to the class scope oeqa/selftest/recipetool: Add test coverage for local go modules Wang Mingyu (22): mpg123: upgrade 1.32.3 -> 1.32.4 bind: upgrade 9.18.20 -> 9.18.21 iproute2: upgrade 6.6.0 -> 6.7.0 kexec-tools: upgrade 2.0.27 -> 2.0.28 libbsd: upgrade 0.11.7 -> 0.11.8 libxmlb: upgrade 0.3.14 -> 0.3.15 nghttp2: upgrade 1.57.0 -> 1.58.0 ofono: upgrade 2.2 -> 2.3 python3-numpy: upgrade 1.26.2 -> 1.26.3 vte: upgrade 0.74.1 -> 0.74.2 python3-cython: upgrade 3.0.7 -> 3.0.8 python3-git: upgrade 3.1.40 -> 3.1.41 python3-hypothesis: upgrade 6.92.2 -> 6.92.9 python3-jinja2: upgrade 3.1.2 -> 3.1.3 python3-markdown: upgrade 3.5 -> 3.5.2 python3-more-itertools: upgrade 10.1.0 -> 10.2.0 python3-pycryptodome: upgrade 3.19.1 -> 3.20.0 python3-pycryptodomex: upgrade 3.19.1 -> 3.20.0 python3-trove-classifiers: upgrade 2023.11.29 -> 2024.1.8 stress-ng: upgrade 0.17.03 -> 0.17.04 virglrenderer: upgrade 1.0.0 -> 1.0.1 xz: upgrade 5.4.4 -> 5.4.5 Change-Id: I9581526d3addb54889dd73268e672c2d84345f3e Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-openembedded/meta-gnome')
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb4
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb2
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc2
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch38
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb16
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb2
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb2
-rw-r--r--meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb2
-rw-r--r--meta-openembedded/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch22
-rw-r--r--meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb6
10 files changed, 71 insertions, 25 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
index 681a61c33a..28d4c2152b 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
@@ -1,10 +1,12 @@
require ${BPN}.inc
-inherit native
+inherit_defer native
DEPENDS = "glib-2.0-native"
# build native helpers
+do_configure[noexec] = "1"
+
do_compile() {
cd ${S}/src/camel
sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 11a52b455e..0c3cc53030 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -6,7 +6,7 @@ DEPENDS = " \
dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
"
-inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala
+inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
REQUIRED_DISTRO_FEATURES = "opengl"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
index 2f3bf61982..33190c461c 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543"
-GNOMEBASEBUILDCLASS = "autotools"
+GNOMEBASEBUILDCLASS = "cmake"
inherit gnomebase upstream-version-is-even
SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch
new file mode 100644
index 0000000000..8230bbbd16
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch
@@ -0,0 +1,38 @@
+From 397751846130f79d5fbe8d617b788f3bcbb36816 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Tue, 9 Jan 2024 22:20:03 +0000
+Subject: [PATCH] meson: remove pointless gtk-doc check
+
+There's no point explicitly checking for gtk-doc, for two reasons:
+
+1) In cross-compiled environments this looks for a target gtk-doc, not a
+ native gtk-doc, so it should set native:true.
+
+2) The gnome.gtkdoc() function checks for gtk-doc itself.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/351]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ meson.build | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ba07da70..1109daea 100644
+--- a/meson.build
++++ b/meson.build
+@@ -107,12 +107,6 @@ else
+ vapigen_dep = []
+ endif
+
+-if build_gtk_doc
+- gtk_doc_dep = dependency('gtk-doc', version: gtk_doc_req)
+-else
+- gtk_doc_dep = []
+-endif
+-
+ # Look for the libxml2 library manually on Visual Studio if
+ # its pkg-config file could not be found, as the NMake
+ # Makefiles of libxml2 do not generate the pkg-config files
+--
+2.34.1
+
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb
index 353f02f1ba..38ca4a39e6 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb
@@ -10,27 +10,15 @@ PNAME = "gtksourceview"
S = "${WORKDIR}/${PNAME}-${PV}"
-
inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz"
+SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz \
+ file://0001-remove-pointless-check.patch"
SRC_URI[sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d"
GIR_MESON_OPTION = 'gir'
GTKDOC_MESON_OPTION = "gtk_doc"
-# Override the definition in meson.bbclass. The dependencies in mason.build are incomplete
-# and the recipe will not build with "-j 1". This fix is benign but should be reviewed when
-# updating versions.
-#
-meson_do_compile() {
- bbnote "========== generating gtksourceview-gresources.h ========"
- bbnote "PARALLEL_MAKE is ${PARALLEL_MAKE}"
- ninja ${PARALLEL_MAKE} gtksourceview/gtksourceview-gresources.h
- bbnote "========== compiling target all ========"
- ninja ${PARALLEL_MAKE}
-}
-
FILES:${PN} += "${datadir}/gtksourceview-4"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb
index 627b499fe8..7ac6c3ef21 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb
@@ -58,7 +58,7 @@ PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit"
PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist"
PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive"
PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi"
-PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3, gnome-keyring"
+PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3"
PACKAGECONFIG[gcrypt] = "-Dgcrypt=true, -Dgcrypt=false, libgcrypt"
PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts"
PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false, libgdata"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
index 8655affdbb..d7f47002f8 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
@@ -9,7 +9,7 @@ PACKAGECONFIG ??= "startup-notification"
PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
GNOMEBASEBUILDCLASS = "autotools"
-inherit gnomebase gobject-introspection features_check
+inherit gnomebase gobject-introspection features_check gtk-doc
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb
index 7955663f26..f52c210ed4 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2"
-inherit autotools pkgconfig gettext gobject-introspection features_check
+inherit autotools pkgconfig gettext gobject-introspection features_check gtk-doc
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch
new file mode 100644
index 0000000000..4d11b94e02
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch
@@ -0,0 +1,22 @@
+Update the GTK_DOC_CHECK invocation to specify where the
+documentation will be built (as the default is ./docs).
+
+This is needed so that gtkdocize as run by autopoint knows where the
+documentation will be built.
+
+Upstream-Status: Submitted [https://pagure.io/libuser/pull-request/70]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/configure.ac b/configure.ac
+index 0bd4a67..51508b7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -169,7 +169,7 @@ if test "$GCC" = yes ; then
+ AC_MSG_RESULT([$enable_Werror])
+ fi
+
+-GTK_DOC_CHECK
++GTK_DOC_CHECK([1.14],[--flavour no-tmpl --docdir docs/reference])
+
+ AC_CONFIG_FILES([Makefile po/Makefile.in docs/Makefile docs/reference/Makefile
+ libuser.pc])
diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb
index d86a577b10..6d3bce8a1c 100644
--- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb
+++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb
@@ -14,6 +14,7 @@ SECTION = "base"
SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \
file://0001-docs-Disable-building.patch \
file://0002-remove-unused-execinfo.h.patch \
+ file://gtkdoc.patch \
"
SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f"
@@ -26,11 +27,6 @@ REQUIRED_DISTRO_FEATURES = "pam"
EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
-GTKDOC_DOCDIR = "${S}/docs/reference"
-
-# run autopoint since it needs ABOUT-NLS and admin/config.rpath from gettext
-#EXTRA_AUTORECONF:remove = "--exclude=autopoint"
-
do_configure:prepend() {
install -d ${S}/admin -d ${S}/m4
touch ${S}/ABOUT-NLS ${S}/admin/config.rpath