13 files changed, 88 insertions, 15 deletions

diff --git a/meta-oe/recipes-devtools/jq/jq_1.7.1.bb b/meta-oe/recipes-devtools/jq/jq_1.8.0.bb
index a6a1d6a07a..af35324b5f 100644
--- a/meta-oe/recipes-devtools/jq/jq_1.7.1.bb
+++ b/meta-oe/recipes-devtools/jq/jq_1.8.0.bb
@@ -6,13 +6,13 @@ HOMEPAGE = "https://jqlang.github.io/jq/"
 BUGTRACKER = "https://github.com/jqlang/jq/issues"
 SECTION = "utils"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=488f4e0b04c0456337fb70d1ac1758ba"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08ffb5ac7e7e6bfc66968b89f01f512a"
 
 GITHUB_BASE_URI = "https://github.com/jqlang/${BPN}/releases/"
 SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
     file://run-ptest \
     "
-SRC_URI[sha256sum] = "478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2"
+SRC_URI[sha256sum] = "91811577f91d9a6195ff50c2bffec9b72c8429dc05ec3ea022fd95c06d2b319c"
 
 inherit autotools github-releases ptest
 
@@ -26,9 +26,6 @@ PACKAGECONFIG[oniguruma] = "--with-oniguruma,--without-oniguruma,onig"
 # enable if you want ptest running under valgrind
 PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind"
 
-# Gets going with gcc-15 but See if it can be removed with next upgrade
-CFLAGS += "-std=gnu17"
-
 do_configure:append() {
         sed -i -e "/^ac_cs_config=/ s:${WORKDIR}::g" ${B}/config.status
 }
diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
index f18ef1f292..7cb6c097f3 100644
--- a/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
+++ b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
@@ -101,3 +101,6 @@ do_install_ptest () {
     sed -i -e 's#${PYTHON}#/usr/bin/python3#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
     sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
 }
+
+# It needs fortran compiler and we do not enable fortran with clang yet
+TOOLCHAIN = "gcc"
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
index 9932cf01db..a892a55844 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
@@ -37,13 +37,24 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
 PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2"
 
 do_install:append:class-target() {
-    for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do
-        sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file"
+    for file in MagickCore-config.im7 MagickWand-config.im7; do
+        sed -i 's,${STAGING_DIR_TARGET},,g' "${D}${bindir}/$file"
     done
-    sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
-    sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
-    sed -i 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
-    sed -i 's,${HOSTTOOLS_DIR},${bindir},g' ${D}${sysconfdir}/ImageMagick-7/delegates.xml
+
+    if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then
+        sed -i 's,${STAGING_DIR_TARGET},,g' "${D}${bindir}/Magick++-config.im7"
+    fi
+
+    if ${@bb.utils.contains('PACKAGECONFIG', 'xml', 'true', 'false', d)}; then
+        xml_config="${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml"
+        sed -i 's,${S},,g' "$xml_config"
+        sed -i 's,${B},,g' "$xml_config"
+        sed -i 's,${RECIPE_SYSROOT},,g' "$xml_config"
+    fi
+
+    if ${@bb.utils.contains_any('PACKAGECONFIG', 'webp openjpeg', 'true', 'false', d)}; then
+        sed -i 's,${HOSTTOOLS_DIR},${bindir},g' "${D}${sysconfdir}/ImageMagick-7/delegates.xml"
+    fi
 }
 
 FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch b/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch
new file mode 100644
index 0000000000..2c3cf696ed
--- /dev/null
+++ b/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch
@@ -0,0 +1,33 @@
+From d04ea418c5fcfec2f6fbb2dd9f982ddf12c5be87 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Tue, 3 Jun 2025 10:02:58 +0200
+Subject: [PATCH] pcp-htop: fix header build race condition
+
+.c and .h files are soft-linked before being compiled. Under heavy load
+or a build with a high CPU count, the compilation can start before
+header files are softlinked, resulting in a build error:
+| pcp-htop.c:13:10: fatal error: CommandLine.h: No such file or directory
+|    13 | #include "CommandLine.h"
+|       |          ^~~~~~~~~~~~~~~
+
+Fix this by adding the make dependency between object files and the
+headers.
+
+Upstream-Status: Backport [https://github.com/performancecopilot/pcp/commit/0ca303467ce382127cd9676e288bf7690a93f084]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ src/pcp/htop/GNUmakefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile
+index 3e29638d6..898f0b766 100644
+--- a/src/pcp/htop/GNUmakefile
++++ b/src/pcp/htop/GNUmakefile
+@@ -224,6 +224,7 @@ default:    build-me
+ include $(BUILDRULES)
+ 
+ ifeq "$(HAVE_NCURSESW)" "true"
++$(OBJECTS): $(HFILES)
+ build-me: $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) $(CMDTARGET) $(DISTLINKS) $(MAN_PAGES)
+ 
+ install: default
diff --git a/meta-oe/recipes-support/pcp/pcp_6.3.7.bb b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
index c390b9eec2..65efac06be 100644
--- a/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
+++ b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
@@ -14,6 +14,7 @@ SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \
             file://pass-options-to-AR.patch \
             file://fix_parallel_make.patch \
                         file://0001-bind2-Use-pmcpp-from-native-builds.patch \
+            file://0001-pcp-htop-fix-header-build-race-condition.patch \
            "
 
 export PCP_DIR = "${RECIPE_SYSROOT_NATIVE}"
diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc
index b953ae2502..c62bfab034 100644
--- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
+++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
@@ -72,6 +72,7 @@ PTESTS_FAST_META_PYTHON = "\
     python3-pyroute2 \
     python3-pyserial \
     python3-pytest-mock \
+    python3-pytest-sugar \
     python3-pytoml \
     python3-pyyaml-include \
     python3-pydbus \
diff --git a/meta-python/recipes-devtools/python/python3-pytest-sugar/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-sugar/run-ptest
new file mode 100644
index 0000000000..b4bf4b65d8
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-sugar/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest -vv | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
diff --git a/meta-python/recipes-devtools/python/python3-pytest-sugar_1.0.0.bb b/meta-python/recipes-devtools/python/python3-pytest-sugar_1.0.0.bb
new file mode 100644
index 0000000000..9ce29aef7e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-sugar_1.0.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)."
+HOMEPAGE = "https://github.com/Teemu/pytest-sugar"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc31f3b2a6a301239a1ba99b71a9459"
+
+SRC_URI += "file://run-ptest"
+SRC_URI[sha256sum] = "6422e83258f5b0c04ce7c632176c7732cab5fdb909cb39cca5c9139f81276c0a"
+
+inherit pypi python_poetry_core ptest-python-pytest
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[dev] = ",,,python3-black python3-flake8 python3-pre-commit"
+
+do_install_ptest:append() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/test_sugar.py ${D}${PTEST_PATH}/tests/
+}
+
+RDEPENDS:${PN} += "python3-packaging python3-pytest python3-termcolor \
+                   python3-core python3-packaging python3-pytest \
+                                   python3-pytest-xdist"
+
+RDEPENDS:${PN}-ptest +=  "python3-tox"
diff --git a/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb b/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb
index 87e258ae1f..5295d2213e 100644
--- a/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb
+++ b/meta-python/recipes-devtools/python/python3-typer_0.16.0.bb
@@ -32,6 +32,7 @@ RDEPENDS:${PN}-ptest += "\
     python3-mypy \
     python3-pytest \
     python3-pytest-cov \
+    python3-pytest-sugar \
     python3-pytest-xdist \
     python3-rich \
     python3-shellingham \
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb
index 6a00e48ebb..bf492b3d57 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb
@@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "systemd"
 
 RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
                    parted python3-pyparted multipath-tools \
-                   lsof cryptsetup libblockdev \
+                   lsof cryptsetup libblockdev libblockdev-bin \
                    libbytesize \
 "
 
diff --git a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.2.bb b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.3.bb
index 0ba997b544..e4d5d731c6 100644
--- a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.2.bb
+++ b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db"
 
 inherit thunar-plugin
 
-SRC_URI[sha256sum] = "6379f877bcfc0ea85db9f43723b6fb317893050c712bd03c2ae3232fb9d5ade3"
+SRC_URI[sha256sum] = "cc0ffc86dc48e72edc6f6a61ad4345f99018526d5d854360960759ce1ec2ca22"
 
 # install tap files in ${libdir}/thunar-archive-plugin
 EXTRA_OECONF += "--libexecdir=${libdir}"
diff --git a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.5.0.bb
index 00afa2bbb2..7418083149 100644
--- a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb
+++ b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.5.0.bb
@@ -7,4 +7,4 @@ inherit thunar-plugin
 
 DEPENDS += "taglib"
 
-SRC_URI[sha256sum] = "9592111e11699e449c1fbd5f72d1633ef39b00f17a988cd251ba228dab4fc90a"
+SRC_URI[sha256sum] = "105a72d51c7fbcc690c9b9a850f3743accbd9bf5dc51480b5ea283dfde96d61e"
diff --git a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.2.bb b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.4.0.bb
index 065e89254b..f22e0ca9fa 100644
--- a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.2.bb
+++ b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.4.0.bb
@@ -7,6 +7,6 @@ inherit thunar-plugin features_check
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "pam"
 
-SRC_URI[sha256sum] = "1009d5e6c91534fa49a69090c53c54ab9da2e0428d08d8e687528f63a4ac3f07"
+SRC_URI[sha256sum] = "0afc9b9ff31c88b208ca9a58bc61d95f9f5408f2adbcd7fe911dfce9e22fba44"
 
 RDEPENDS:${PN} += "samba-server"