From b9af8750acfaddd4a8b99c3e289510b5476c90f3 Mon Sep 17 00:00:00 2001
From: Patrick Williams <patrick@stwcx.xyz>
Date: Mon, 30 Jan 2023 13:28:01 -0600
Subject: subtree updates

meta-security: 3d9dab6d14..7eed4a60f5:
  Armin Kuster (2):
        linux-yocto.bbappend: bump to kernel version 6.x
        meta-tpm: bump linux-yocto to 6.x kernel

  Max Krummenacher (1):
        samhain: rework due to changed cache handling

meta-openembedded: 2ab113e8be..ea63f13846:
  Beniamin Sandu (1):
        mbedtls: export source files/headers needed by ATF

  Khem Raj (13):
        poco: Do not use std::atomic<bool>
        libwebsockets: Fix build with gcc13
        v4l-utils: Fix build with gcc13
        proj: Upgrade to 9.1.1 release
        mpd: Upgrade to 0.23.12 release
        geos: Upgrade to 3.9.4
        geos: Fix build with gcc13
        libinih: Upgrade to version 56
        python3-pybind11: Upgrade to 2.10.3
        waylandpp: Fix build with gcc-13
        sedutil: Fix build with gcc13
        usbguard: Fix build with gcc13
        minifi-cpp: Fix build with gcc13

  Martin Jansa (6):
        keyutils: fix Upstream-Status formatting
        gphoto2: fix Upstream-Status formatting
        .patch: fix Upstream-Status formatting issues reported by patchreview tool from oe-core
        android-tools: fix Upstream-Status formatting
        mm-common: fix Upstream-Status formatting
        .patch: fix Signed-off-by formatting issues reported by patchreview tool from oe-core

poky: 5e249ec855..29afbb5e14:
  Alejandro Hernandez Samaniego (1):
        newlib: Upgrade 4.2.0 -> 4.3.0

  Alexander Kanavin (1):
        gdk-pixbuf: do not use tools from gdk-pixbuf-native when building tests

  Armin Kuster (1):
        lttng-modules: Fix for 5.10.163 kernel version

  Khem Raj (3):
        valgrind: Include missing <cstdint>
        webkitgtk: Fix build with gcc 13
        gdb: Define alignof using _Alignof when using C11 or newer

  Richard Purdie (3):
        make-mod-scripts: Ensure kernel build output is deterministic
        bitbake.conf: Inject a dash into PN for BB_HASH_CODEPARSER_VALS
        scripts/bitbake-prserv-tool: Fix to work with memres bitbake

  Ross Burton (1):
        Revert "cve-update-db-native: show IP on failure"

meta-arm: 3d51e1117d..aecbb77f72:
  Jon Mason (4):
        arm/qemuarm-secureboot: Changes for v2023.01 u-boot
        arm-bsp/juno: update to use u-boot v2023.01
        arm-bsp/juno: update kernel patches for 6.1
        arm-bsp/fvp-base: update kernel config to remove warning
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia335876b7ce9a4c9d19ca41ae321b266b3b6d00e
---
 .../meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb')

diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb
index aa44515fbb..cca89a9059 100644
--- a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb
+++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb
@@ -12,15 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 
 SECTION = "libs"
 
-DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info"
-DEPENDS:remove:class-native = "gdk-pixbuf-native"
+DEPENDS = "glib-2.0 shared-mime-info"
 
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://run-ptest \
            file://fatal-loader.patch \
-           file://0001-Add-use_prebuilt_tools-option.patch \
+           file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \
            "
 
 SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b"
@@ -46,14 +45,6 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
 
 EXTRA_OEMESON = "-Dman=false"
 
-EXTRA_OEMESON:append:class-target = " \
-    -Duse_prebuilt_tools=true \
-"
-
-EXTRA_OEMESON:append:class-nativesdk = " \
-    -Duse_prebuilt_tools=true \
-"
-
 PACKAGES =+ "${PN}-xlib"
 
 # For GIO image type sniffing
@@ -115,10 +106,6 @@ do_install:append:class-native() {
 		XDG_DATA_DIRS=${STAGING_DATADIR} \
 		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
 
-	create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \
-		XDG_DATA_DIRS=${STAGING_DATADIR} \
-		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
-
 	create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
 		XDG_DATA_DIRS=${STAGING_DATADIR} \
 		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
-- 
cgit v1.2.3