summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2023-05-26 19:10:49 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-06-09 07:48:34 +0300
commite760df85eded3ead9d756555d5144acc5e3d3fa1 (patch)
tree38743ac80acd51ffc6802f09c6d44f80ea26a55f /poky/meta/recipes-core/glib-2.0
parentd5681c52378ddefb08060e8612c8fbd61f726301 (diff)
downloadopenbmc-e760df85eded3ead9d756555d5144acc5e3d3fa1.tar.xz
subtree updates
meta-security: ddf301c45c..5c2379f4bc: Armin Kuster (2): samhain: Update to 4.4.10 layer.conf: Insert addpylib declaration John Edward Broadbent (1): libhoth_git.bb:SRCREV bump 1622e8a04..d769296220d meta-openembedded: 0474e0b870..829dcb63f0: Alexander Stein (2): libcamera: Allow overwriting default pipelines and IPA libcamera: Simplify pipeline configuration Christophe Vu-Brugier (1): exfatprogs: upgrade 1.2.0 -> 1.2.1 Denys Zagorui (2): bpftool: Fix externalsrc support bpftool: return do_configure dependency Joe Slater (2): bats: use baselib libgpiod: modify test 'gpioset: toggle (continuous)' Johannes Kauffmann (2): open62541: rename encryption PACKAGECONFIG open62541: add OpenSSL as crypto provider Khem Raj (52): gerbera: Fix build with fmt 10+ mpd: Fix build with clang-16 ptest-packagelists-meta-oe: Remove nodejs ptests for rv32/rv64 libpeas: Fix reference to TMPDIR in tests lirc: Define SH_PATH=/bin/sh libwebsockets: Fix reference to TMPDIR mce-inject: Pass CFLAGS to make mcelog: Upgrade to 194 xrdb: Pass target CPP location to configure mce-test: Update to latest mce-test: Pass CFLAGS to make ippool: Port to using ppp 2.5.x ippool: Enable systemd service on install libtraceevent: Delete meta-oe-ptests: Add mcelog to PTESTS_FAST_META_OE ptest-packagelists-meta-python: Add python3-pylint to PTESTS_FAST_META_PYTHON oscam: Upgrade to 11718 oscam: Fix buildpaths in generated sources lockfile-progs: Pass DEBUG_PREFIX_MAP options tvheadend: Upgrade to latest master nbdkit: Remove buildpaths from binaries system-config-printer: Delete __pycache__ files dovecot: Upgrade to 2.3.20 dovecot: Do not install dovecot-config mpv: Remove references to builddir from mpv binary libnice: Remove buildpaths from binaries curlpp: Remove references to buildpaths e.g. TMPDIR unbound: Remove references to buildpaths fftw: Check for TOOLCHAIN_OPTIONS to be non-empty before sed ops aom: Upgrade to 3.6.1 aom: Pass nasm flags via toochain.cmake uml-utilities: Fix references to TMPDIR openct: Fix buildpaths being emitted into generated types.h babeld: Upgrade to 1.12.2 nautilus: Fix buildpath QA errors minifi-cpp: Remove references to buildpaths in generated files freerdp: Fix reference to TMPDIR in libfreerdp2.so vlc: Remove WORKDIR from CONFIGURE_LINE definition system-config-printer: Check for gobject-introspection as well in distro features packagegroup-xfce-extended: Blueman also needs gobject introspection distro feature remmina: Fix buildpaths QA warnings cgdb: Fix buildpaths emitted into cgdb binary ibus: Point python interpreter to target location eog: Fix absolute src paths in generated files gimp: Fix buildpaths in binaries and scripts libgphoto2: Edit out sysroot from CC variable in configure tracker: Point TOP_SRCDIR to target path vlan: Pass CFLAGS via CCFLAGS sgpio: Pass CFLAGS to make x265: Pass --debug-prefix-map to nasm ipmiutil: Upgrade to 3.1.9 ipmiutil: Pass --enable-useflags Marek Vasut (1): lvgl: lvgl-demo-fb: Switch to CMake and add DRM and SDL support Markus Volk (7): evince: edit include path for debug package pipewire: update 0.3.70 -> 0.3.71 dav1d: update 1.1.0 -> 1.2.0 gnome-control-center: update 43.2 -> 44.1 mutter: update 43.1 -> 44.1 gnome-shell: update 43.2 -> 44.1 fluidsynth: update 2.2.6 -> 2.3.2 Martin Jansa (20): libsquish: remove unused 0001-makefile-Add-LIBDIR.patch meta-python: remove unused patches from python2 recipes python3-pybind11: remove unused 0001-Do-not-strip-binaries.patch python3-anyjson: remove unused files monkey: remove unused patch file gnome-terminal: remove unused patch file geary: remove unused patch files ndpi: remove unused CVE-2021-36082.patch soci: remove unused soci_libdir.patch cyrus-sasl: remove unused patch file plymouth: remove unused patch file glibmm: remove unused remove-examples.patch opencv: remove unused patch file libiio: remove unused patch file libinih: remove unused patch file beep: remove unused linux-input.patch paho-mqtt-c: remove unused patch file tigervnc: remove unused patch file fbida: remove unused use-jpeg-turbo.patch graphviz: remove unused patch files Martin Siegumfeldt (1): libiio: update to version 0.24 Mingli Yu (1): php: Link with libatomic on rv64 Peter Bergin (6): redis-plus-plus: clean up recipe and make use of packageconfig redis-plus-plus: introduce fix for library detection redis-plus-plus: uprev to 1.3.8 hiredis: uprev to 1.1.0 hiredis: change dependency to redis hiredis: add ptest Ross Burton (38): libblockdev: add PACKAGECONFIG for tools libblockdev: clean up DEPENDS glade: add autoconf-archive-native DEPENDS python3-kivy: depend on gobject-introspection-data DISTRO_FEATURE vte9: add missing dependency on glib-2.0-native libgxim: add autoconf-archive-native DEPENDS gnome-common: add autoconf-archive RDEPENDS graphviz: no longer needs intltool-native libpeas: depend on gobject-introspection-data system-config-printer: clean up DEPENDS imsettings: add missing DEPENDS on autoconf-archive-native python3-pyatspi: make dependent on gobject-introspection-data being enabled gnome-menu: remove redundant dependencies hplip: build against libusb1 hplip: remove redundant FILES:${PN}-dbg gutenprint: rewrite recipe and update gutenprint: match ownership on /etc/cups python3-pydbus-manager: remove obsolete recipe python3-pydbus: remove obsolete recipe firewalld: add features_check on gobject-introspection-data blueman: add features_check on gobject-introspection-data networkd-dispatcher: add features_check on gobject-introspection-data python3-asyncio-glib: add features_check on gobject-introspection-data eog: requires gobject-introspection-data DISTRO_FEATURE grilo-plugins: add PACKAGECONFIG for tracker packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled libpeas: requires gobject-introspection-data DISTRO_FEATURE gnome-desktop: gobject-introspection is not in fact mandatory gnome-photos: requires gobject-introspection-data DISTRO_FEATURE geoclue: the library doesn't need gobject-introspection nautilus: requires gobject-introspection-data DISTRO_FEATURE packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled python3-blivetgui: requires gobject-introspection-data DISTRO_FEATURE xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor catfish: requires gobject-introspection-data DISTRO_FEATURE menulibre: requires gobject-introspection-data DISTRO_FEATURE xfce4-panel-profiles: requires gobject-introspection-data DISTRO_FEATURE networkmanager: add dependency on pyhthon3-pygobject-native Sanjay Chitroda (1): gnulib: Update recipe name to 2018-12-18 Thomas Perrot (1): networkmanager: Turn ppp support into a packageconfig option Wang Mingyu (43): fmt: upgrade 9.1.0 -> 10.0.0 spdlog: fix build error for master fmt mpd: fix build error when fmt updated gensio: upgrade 2.6.4 -> 2.6.5 ctags: upgrade 6.0.20230507.0 -> 6.0.20230521.0 libirecovery: upgrade 1.0.1 -> 1.1.0 hidapi: upgrade 0.13.1 -> 0.14.0 double-conversion: upgrade 3.2.1 -> 3.3.0 adw-gtk3: upgrade 4.6 -> 4.7 gnome-terminal: upgrade 3.48.0 -> 3.48.1 grilo: upgrade 0.3.15 -> 0.3.16 lldpd: upgrade 1.0.16 -> 1.0.17 f2fs-tools: upgrade 1.15.0 -> 1.16.0 dbus-cxx: upgrade 2.3.1 -> 2.4.0 mailcap: upgrade 2.1.53 -> 2.1.54 c-ares: upgrade 1.19.0 -> 1.19.1 fetchmail: upgrade 6.4.23 -> 6.4.37 python3-flask-restful: upgrade 0.3.9 -> 0.3.10 python3-dominate: upgrade 2.7.0 -> 2.8.0 python3-antlr4-runtime: upgrade 4.12.0 -> 4.13.0 python3-coverage: upgrade 7.2.5 -> 7.2.6 python3-imageio: upgrade 2.28.1 -> 2.29.0 ostree: upgrade 2023.2 -> 2023.3 python3-asgiref: upgrade 3.6.0 -> 3.7.1 python3-can: upgrade 4.2.0 -> 4.2.1 python3-u-msgpack-python: upgrade 2.7.2 -> 2.8.0 python3-astroid: upgrade 2.15.4 -> 2.15.5 python3-protobuf: upgrade 4.23.0 -> 4.23.1 python3-pulsectl: upgrade 23.5.1 -> 23.5.2 python3-django: upgrade 4.1.7 -> 4.2.1 python3-google-auth: upgrade 2.18.0 -> 2.18.1 python3-pytest-xdist: upgrade 3.3.0 -> 3.3.1 python3-sqlalchemy: upgrade 2.0.13 -> 2.0.15 python3-xlsxwriter: upgrade 3.1.0 -> 3.1.1 python3-websocket-client: upgrade 1.5.1 -> 1.5.2 zchunk: upgrade 1.3.0 -> 1.3.1 python3-stevedore: upgrade 5.0.0 -> 5.1.0 python3-sentry-sdk: upgrade 1.22.2 -> 1.24.0 rdma-core: upgrade 45.0 -> 46.0 valijson: upgrade 1.0 -> 1.0.1 python3-tzlocal: upgrade 4.3 -> 5.0.1 python3-xmlschema: upgrade 2.2.3 -> 2.3.0 setxkbmap: upgrade 1.3.3 -> 1.3.4 Xiangyu Chen (2): Revert "pahole: fix native package build error" libbpf: installing uapi headers for native package Zhang Xiao (1): dhcp-relay: dev subpackage conflicts with bind-dev richardhb (1): python3-bleak: add recipe ricoheller (3): python3-dbus-fast: add recipe python3-aioredis: add recipe mbpoll: add recipe poky: 35e5d29a7d..76494f2b66: Alexander Kanavin (23): glib-2.0: upgrade 2.74.6 -> 2.76.2 ppp: upgrade 2.4.9 -> 2.5.0 ovmf: update 202211 -> 202302 btrfs-tools: update 6.1.3 -> 6.3 erofs-utils: update 1.5 -> 1.6 llvm: update 15.0.7 -> 16.0.3 perlcross: update 1.4 -> 1.4.1 perl: update 5.36.0 -> 5.36.1 rpm: update 4.18.0 -> 4.18.1 less: update 608 -> 633 librsvf: update 2.54.5 -> 2.56.0 libva: update 2.16 -> 2.18 cryptodev: remove unneeded patch gpgme: update 1.18.0 -> 1.20.0 libatomic-ops: update 7.6.14 -> 7.8.0 libgcrypt: update 1.10.1 -> 1.10.2 libgpg-error: update 1.46 -> 1.47 createrepo-c: update 0.20.1 -> 0.21.1 elfutils: update 0.188 -> 0.189 meson: update 1.0.1 ->1.1.0 gdb: trim python support RDEPENDS gdb: enable python PACKAGECONFIG valgrind: update 3.20.0 -> 3.21.0 Antonin Godard (1): archiver: move exclusion logic in a dedicated function Anuj Mittal (4): gsettings-desktop-schemas: upgrade 43.0 -> 44.0 harfbuzz: upgrade 7.1.0 -> 7.3.0 libevdev: upgrade 1.13.0 -> 1.13.1 libsoup: upgrade 3.4.0 -> 3.4.2 Arno Baumfalk (1): bitbake: fetch2/npm: evaluate PATH before patching HOME Bartosz Golaszewski (17): python3-attrs: unify RDEPENDS python3-attrs: don't use PYTHON_PN python3-attrs: add missing run-time dependencies python3-certifi: add missing run-time dependencies python3-hypothesis: fix run-time dependencies python3-tomli: add missing run-time dependencies python3-pathspec: add missing run-time dependencies python3-installer: add missing run-time dependencies python3-sphinx-rtd-theme: add missing run-time dependencies python3-setuptools-rust: fix RDEPENDS and allow target build python3-pyproject-hooks: add missing run-time dependencies python3-pycryptodome: don't use PYTHON_PN python3-pycryptodome: add missing run-time dependencies python3-pygobject: add missing run-time dependencies python3-manifest: cgitb: new package python3-manifest: zipapp: new package python3-manifest: turtle: new package Bergin, Peter (1): bitbake: lib/bb/tests/fetch.py: set initial branch Chen Qi (2): oe-buildenv-internal: remove path from previous project staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot Chi Xu (1): expect: Add ptest support Deepthi Hemraj (1): binutils: stable 2.40 branch updates Denys Dmytriyenko (2): grep: upgrade 3.10 -> 3.11 xz: upgrade 5.4.2 -> 5.4.3 Eero Aaltonen (1): avahi: fix D-Bus introspection Frieder Schrempf (1): psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox Geoff Parker (1): libwebp: add BBCLASSEXTEND Kai Kang (1): pm-utils: fix multilib conflictions Khem Raj (8): llvm: Enable RISCV support llvm,mesa: Drop MESA_LLVM_RELEASE systemd: Drop a backport go: Upgrade 1.20.1 -> 1.20.4 go: Use -no-pie to build target cgo gcc: Upgrade to GCC 13.1 release bitbake.conf: Add -fcanon-prefix-map to DEBUG_PREFIX_MAP perf: Fix build with gcc-13 Leon Anavi (1): wic: Add argument --hidden to default imager Lorenzo Arena (1): conf: add nice level to the hash config ignred variables Martin Jansa (11): kernel-devicetree: make shell scripts posix compliant go.bbclass: don't use test to check output from ls image-live.bbclass: respect IMAGE_MACHINE_SUFFIX binutils: package static libs from gprofng rpm: drop unused 0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch libx11: remove unused patch and FILESEXTRAPATHS qemu: remove unused qemu-7.0.0-glibc-2.36.patch minicom: remove unused patch files inetutils: remove unused patch files libgloss: remove unused patch file kmod: remove unused ptest.patch Max Krummenacher (4): libtraceevent: import from meta-openembedded libtraceevent: fix qa issue reference to tmpdir perf: make pkg-config available perf: add libtraceevent packageconfig Mikko Rapeli (3): qemurunner: support serial console login via qemu stdout qemurunner: avoid leaking server_socket qemurunner: add boot logs to do_testimage task logs in real time Pavel Zhukov (1): lib/terminal.py: Add urxvt terminal Peter Kjellerstedt (5): glib-2.0: Avoid having g_futex_simple() inadvertently modify errno musl: Correct SRC_URI xf86-video-intel: Use the HTTPS protocol to fetch the Git repositories bitbake: fetch2/crate: Simplify extraction of crate names and versions from URIs bitbake: fetch2/crate: Correct unpack for a crate that matches the recipe name Qiu Tingting (1): e2fsprogs: Fix error SRCDIR when using usrmerge DISTRO_FEATURES Randolph Sapp (2): package: enable recursion on file globs kernel-devicetree: recursively search for dtbs Randy MacLeod (1): vim: upgrade 9.0.1429 -> 9.0.1527 Ranjitsinh Rathod (1): kmscube: Correct DEPENDS to avoid overwrite Richard Purdie (9): bitbake: cooker: Fix/improve collections handling bitbake: fetch2: Clarify different localpaths functions bitbake: fetch2/local: Add debug to include chosen path bitbake.conf: Empty SRC_URI for code parser cache handling bitbake: cooker: Add FILE_LAYERNAME variable containing the layername for a recipe linux-yocto: Drop 5.15 support lttng-tools: Add patch to fix gcc 13 test issue glib-2.0: Fix TMPDIR mismatch test failures linux-yocto: Drop 5.15 support Robert Joslyn (1): curl: Update from 8.0.1 to 8.1.0 Ross Burton (23): cpio: upgrade to 2.14 gnutls: add PACKAGECONFIG for DANE gnutls: add PACKAGECONFIG options for certification compression gnutls: use system libtasn1 gnutls: clean up ptest compilation gnutls: remove use of argp-standalone for musl glib-networking: fix LICENSE statement glib-networking: add gnomeproxy PACKAGECONFIG glib-networking add environment variable proxy PACKAGECONFIG qemu: add PACKAGECONFIG for debuginfo support meta: depend on autoconf-archive-native, not autoconf-archive gobject-introspection: always DEPEND on gobject-introspection-native python3-pygobject: remove explicit gobject-introspection DEPENDS gconf: remove explicit gobject-introspection DEPENDS gi-docgen.bbclass: depends on gobject-introspection-data being enabled python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE gstreamer1.0-python: mandate gobject-introspection-data DISTRO_FEATURE python3-gitdb: remove python3-async dependency python3-async: remove recipe libcheck: add ghetto automake output libnl: clean up ptest libcomps: clean up DEPENDS gdbm: improve run-ptest Sudip Mukherjee (2): dhcpcd: upgrade to v10.0.1 libxi: upgrade to v1.8.1 Thomas Roos (2): oeqa: adding selftest-hello and use it to speed up tests oeqa/selftest/cases/devtool.py: skip all tests require folder a git repo Tom Hochstein (1): piglit: Add missing glslang dependencies Trevor Gamblin (2): python3-hatchling: upgrade 1.14.1 -> 1.17.0 python3-trove-classifiers: upgrade 2023.4.29 -> 2023.5.2 Wang Mingyu (1): iso-codes: upgrade 4.13.0 -> 4.15.0 meta-raspberrypi: 928bb234bb..9240ea91ca: Zachary T Welch (1): machines: simplify MACHINEOVERRIDES definitions meta-arm: f9d80e1a14..5cbe3041be: Clément Péron (5): arm/lib: pass the PATH to fvp runner scripts/runfvp: Fix KeyError exception when there is no FVP_CONSOLE provided runfvp: make fvp runner to hold the config fvp: runner: execute fvp process in the same working directory as fvpconf runfvp: update filepath in fvpconf to relative path Jon Mason (2): arm-bsp/tc1: use latest kernel and u-boot arm-bsp/tc1: re-enable signed kernel image Ross Burton (2): arm/lib/fvp: remove redundant trailing commas arm-bsp/fvp-base: remove u-boot version pinning Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: If7df9ee24ecd0b574eeb9ca799dd15d915d4ec42
Diffstat (limited to 'poky/meta/recipes-core/glib-2.0')
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch36
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch50
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch48
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch77
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch31
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch47
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest2
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb (renamed from poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb)7
8 files changed, 60 insertions, 238 deletions
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch
new file mode 100644
index 0000000000..db63cfd91e
--- /dev/null
+++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch
@@ -0,0 +1,36 @@
+From edd1e47f107410d9e4edb691335410026ae5a534 Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+Date: Tue, 25 Apr 2023 20:02:31 +0200
+Subject: [PATCH] Avoid having g_futex_simple() inadvertently modify errno
+
+If both __NR_futex and __NR_futex_time64 are defined, g_futex_simple()
+will first call futex_time64(). If that fails with ENOSYS, then
+futex_time() is called instead. However, errno was not saved and
+restored in this case, which would result in g_futex_simple()
+returning with errno set to ENOSYS, even if futex_time() succeeded.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/edd1e47f107410d9e4edb691335410026ae5a534]
+Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+---
+ glib/gthreadprivate.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
+index 9c847e039..74d37ba32 100644
+--- a/glib/gthreadprivate.h
++++ b/glib/gthreadprivate.h
+@@ -65,9 +65,13 @@ struct _GRealThread
+ #define g_futex_simple(uaddr, futex_op, ...) \
+ G_STMT_START \
+ { \
++ int saved_errno = errno; \
+ int res = syscall (__NR_futex_time64, uaddr, (gsize) futex_op, __VA_ARGS__); \
+ if (res < 0 && errno == ENOSYS) \
+- syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \
++ { \
++ errno = saved_errno; \
++ syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \
++ } \
+ } \
+ G_STMT_END
+ #elif defined(__NR_futex_time64)
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch
deleted file mode 100644
index 57ada66907..0000000000
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3c56ff21b9a5fe18f9cec9b97ae1788fdf5d563e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Tue, 6 Jul 2021 19:26:03 +0100
-Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2990]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
- don't happen
-
-The access and creation time tests create a file, gets the time in
-seconds, then gets the time in microseconds and assumes that the
-difference between the two has to be above 0.
-
-As rare as this may be, it can happen:
-
-$ stat g-file-info-test-50A450 -c %y
-2021-07-06 18:24:56.000000767 +0100
-
-Change the test to simply assert that the difference not negative to
-handle this case.
-
-This is the same fix as 289f8b, but that was just modification time.
-
----
- gio/tests/g-file-info.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c
-index d9ad045..c9b12b0 100644
---- a/gio/tests/g-file-info.c
-+++ b/gio/tests/g-file-info.c
-@@ -307,7 +307,7 @@ test_g_file_info_access_time (void)
- g_assert_nonnull (dt_usecs);
-
- ts = g_date_time_difference (dt_usecs, dt);
-- g_assert_cmpint (ts, >, 0);
-+ g_assert_cmpint (ts, >=, 0);
- g_assert_cmpint (ts, <, G_USEC_PER_SEC);
-
- /* Try again with nanosecond precision. */
-@@ -442,7 +442,7 @@ test_g_file_info_creation_time (void)
- g_assert_nonnull (dt_usecs);
-
- ts = g_date_time_difference (dt_usecs, dt);
-- g_assert_cmpint (ts, >, 0);
-+ g_assert_cmpint (ts, >=, 0);
- g_assert_cmpint (ts, <, G_USEC_PER_SEC);
-
- /* Try again with nanosecond precision. */
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch
deleted file mode 100644
index db08b5af55..0000000000
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fdbffaea2fa85c203cc6aacb5734acac65aeaa19 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 11 Nov 2022 13:12:42 +0100
-Subject: [PATCH] tests/meson.build: do not use can_run_host_binaries()
-
-can_run_host_binaries() returns true even when cross compiling,
-if there is an executable wrapper defined that can run
-cross-binaries under some kind of emulation.
-
-Unfortunately, custom_target() will not use the wrapper
-and will attempt to execute the command directly. Until
-this is addressed in meson upstream, we have to disable
-these targets in cross scenarios.
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3067]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
----
- gio/tests/meson.build | 2 +-
- glib/tests/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 49cfa25ce..ea59656f9 100644
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -652,7 +652,7 @@ if installed_tests_enabled
- endforeach
- endif
-
--if meson.can_run_host_binaries()
-+if not meson.is_cross_build()
-
- compiler_type = '--compiler=@0@'.format(cc.get_id())
-
-diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index 69508178e..e4f75f302 100644
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -411,7 +411,7 @@ executable('testing-helper', 'testing-helper.c',
- )
-
- # some testing of gtester functionality
--if meson.can_run_host_binaries() and host_system != 'windows'
-+if not meson.is_cross_build() and host_system != 'windows'
- xmllint = find_program('xmllint', required: false)
- if xmllint.found()
- tmpsample_xml = custom_target('tmpsample.xml',
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch
deleted file mode 100644
index 63cbf90ab2..0000000000
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 0ca5254c5d92aec675b76b4bfa72a6885cde6066 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Sat, 29 Oct 2022 04:30:52 +0200
-Subject: [PATCH] glib/gmacros: Always define NULL as nullptr in C++11 and
- newer
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- glib/gmacros.h | 9 ++++++++-
- glib/tests/cxx.cpp | 13 -------------
- 2 files changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/glib/gmacros.h b/glib/gmacros.h
-index 5302841105..9fe8270822 100644
---- a/glib/gmacros.h
-+++ b/glib/gmacros.h
-@@ -870,10 +870,17 @@
- */
- #ifndef NULL
- # ifdef __cplusplus
--# define NULL (0L)
-+# if __cplusplus >= 201103L
-+# define NULL (nullptr)
-+# else
-+# define NULL (0L)
-+# endif /* __cplusplus >= 201103L */
- # else /* !__cplusplus */
- # define NULL ((void*) 0)
- # endif /* !__cplusplus */
-+#elif defined (__cplusplus) && __cplusplus >= 201103L
-+# undef NULL
-+# define NULL (nullptr)
- #endif
-
- #ifndef FALSE
-diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
-index 6ac60791c8..045457c6e2 100644
---- a/glib/tests/cxx.cpp
-+++ b/glib/tests/cxx.cpp
-@@ -34,21 +34,12 @@ test_typeof (void)
- MyObject *obj3 = g_atomic_pointer_get (&obj2);
- g_assert_true (obj3 == obj);
-
--#if __cplusplus >= 201103L
-- MyObject *obj4 = nullptr;
--#else
- MyObject *obj4 = NULL;
--#endif
- g_atomic_pointer_set (&obj4, obj3);
- g_assert_true (obj4 == obj);
-
--#if __cplusplus >= 201103L
-- MyObject *obj5 = nullptr;
-- g_atomic_pointer_compare_and_exchange (&obj5, nullptr, obj4);
--#else
- MyObject *obj5 = NULL;
- g_atomic_pointer_compare_and_exchange (&obj5, NULL, obj4);
--#endif
- g_assert_true (obj5 == obj);
-
- MyObject *obj6 = g_steal_pointer (&obj5);
-@@ -195,11 +186,7 @@ test_steal_pointer (void)
- int
- main (int argc, char *argv[])
- {
--#if __cplusplus >= 201103L
-- g_test_init (&argc, &argv, nullptr);
--#else
- g_test_init (&argc, &argv, NULL);
--#endif
-
- g_test_add_func ("/C++/typeof", test_typeof);
- g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange);
---
-GitLab
-
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch
deleted file mode 100644
index 763d5ce539..0000000000
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7dc19632f3115e3f517c6bc80436fe72c1dcdeb4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Sat, 29 Oct 2022 04:16:00 +0200
-Subject: [PATCH] glib/tests/cxx: Ensure NULL is always casted to a pointer
- type
-
-Otherwise it may not be recognized as valid sentinel
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- glib/tests/cxx.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
-index 045457c6e2..aa5e0cb576 100644
---- a/glib/tests/cxx.cpp
-+++ b/glib/tests/cxx.cpp
-@@ -186,7 +186,11 @@ test_steal_pointer (void)
- int
- main (int argc, char *argv[])
- {
-+#if __cplusplus >= 201103L
- g_test_init (&argc, &argv, NULL);
-+#else
-+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
-+#endif
-
- g_test_add_func ("/C++/typeof", test_typeof);
- g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange);
---
-GitLab
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index ae6881b61e..3dba599fc0 100644
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
-From a3cdf17643bf33d532ec269913974195e136b7fc Mon Sep 17 00:00:00 2001
+From 38e401969a2ff8269919cbeacec733a67f041735 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -13,38 +13,33 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
Port patch to 2.48
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
---
- gio/giomodule.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
+ gio/giomodule.c | 5 -----
+ 1 file changed, 5 deletions(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c
-index f5dbb45..c926e77 100644
+index 11ce7d8..cc27ecd 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -58,6 +58,8 @@
- #ifdef G_OS_WIN32
- #include "gregistrysettingsbackend.h"
- #include "giowin32-priv.h"
-+#else
-+#include <dlfcn.h>
- #endif
- #include <glib/gstdio.h>
-
-@@ -1261,7 +1263,15 @@ get_gio_module_dir (void)
- NULL);
+@@ -1271,9 +1271,6 @@ get_gio_module_dir (void)
g_free (install_dir);
#else
-- module_dir = g_strdup (GIO_MODULE_DIR);
-+ Dl_info info;
-+
-+ if (dladdr (g_io_module_new, &info)) {
-+ char *libdir = g_path_get_dirname (info.dli_fname);
-+ module_dir = g_build_filename (libdir, "gio", "modules", NULL);
-+ g_free (libdir);
-+ } else {
-+ module_dir = g_strdup (GIO_MODULE_DIR);
-+ }
+ module_dir = g_strdup (GIO_MODULE_DIR);
+-#ifdef __APPLE__
+-#include "TargetConditionals.h"
+-#if TARGET_OS_OSX
+ #include <dlfcn.h>
+ {
+ g_autofree gchar *path = NULL;
+@@ -1292,8 +1289,6 @@ get_gio_module_dir (void)
+ }
+ }
+ }
+-#endif
+-#endif
#endif
}
+--
+2.30.2
+
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
index c476d67310..831bc3b91f 100644
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
@@ -6,5 +6,5 @@ if id -u glib2-test; then
fi
useradd glib2-test
cd /tmp
-su glib2-test -c 'gnome-desktop-testing-runner glib'
+su glib2-test -c 'G_TEST_TMPDIR=`readlink -f /tmp` gnome-desktop-testing-runner glib'
userdel glib2-test
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb
index 5b79ae481c..f3a716eb9d 100644
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.6.bb
+++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb
@@ -14,14 +14,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
- file://0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch \
- file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \
- file://cpp-null.patch \
- file://cpp-null2.patch \
+ file://0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch \
"
SRC_URI:append:class-native = " file://relocate-modules.patch"
-SRC_URI[sha256sum] = "069cf7e51cd261eb163aaf06c8d1754c6835f31252180aff5814e5afc7757fbc"
+SRC_URI[sha256sum] = "24f3847857b1d8674cdb0389a36edec0f13c666cd3ce727ecd340eb9da8aca9e"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.