From 702df27ef420e45b3aff1d22759f855babc7c8fe Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Mon, 1 Dec 2025 13:15:37 +0100 Subject: [PATCH] utfcpp: upgrade 4.0.6 -> 4.0.8 License-update: the project removed the submodules, and included the necessary files in the main repository. The license itself hasn't chaged, however it seems that it was indicated incorrectly in the recipe previously: the main application is BSL-1.0, but the additional header is under MIT, and not BSD. Selection from the shortlog: - fix compile warning - Get rid of submodules and add ftest.h to tests directry - tidy code - Compile time checks for size of UTF-16 code units Signed-off-by: Gyorgy Sarvari Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 +- meta/recipes-support/utfcpp/utfcpp_4.0.6.bb | 14 -------------- meta/recipes-support/utfcpp/utfcpp_4.0.8.bb | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 meta/recipes-support/utfcpp/utfcpp_4.0.6.bb create mode 100644 meta/recipes-support/utfcpp/utfcpp_4.0.8.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index b5031b55af3..e8c7dc7da30 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -855,7 +855,7 @@ RECIPE_MAINTAINER:pn-usbutils = "Unassigned " RECIPE_MAINTAINER:pn-util-linux = "Chen Qi " RECIPE_MAINTAINER:pn-util-linux-libuuid = "Chen Qi " RECIPE_MAINTAINER:pn-util-macros = "Unassigned " -RECIPE_MAINTAINER:pn-utfcpp = "Unassigned " +RECIPE_MAINTAINER:pn-utfcpp = "Gyorgy Sarvari " RECIPE_MAINTAINER:pn-v86d = "Unassigned " RECIPE_MAINTAINER:pn-vala = "Unassigned " RECIPE_MAINTAINER:pn-valgrind = "Mingli Yu " diff --git a/meta/recipes-support/utfcpp/utfcpp_4.0.6.bb b/meta/recipes-support/utfcpp/utfcpp_4.0.6.bb deleted file mode 100644 index 344f2701581..00000000000 --- a/meta/recipes-support/utfcpp/utfcpp_4.0.6.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = " UTF-8 with C++ in a Portable Way" -HOMEPAGE = "https://github.com/nemtrif/utfcpp" - -LICENSE = "BSL-1.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c \ - file://extern/ftest/LICENSE;md5=d33c6488d3b003723a5f17ac984db030" - -SRC_URI = "gitsm://github.com/nemtrif/utfcpp;protocol=https;branch=master" - -SRCREV = "b26a5f718f4f370af1852a0d5c6ae8fa031ba7d0" - -inherit cmake - -FILES:${PN}-dev += "${datadir}/utf8cpp/cmake" diff --git a/meta/recipes-support/utfcpp/utfcpp_4.0.8.bb b/meta/recipes-support/utfcpp/utfcpp_4.0.8.bb new file mode 100644 index 00000000000..7f6eb367f10 --- /dev/null +++ b/meta/recipes-support/utfcpp/utfcpp_4.0.8.bb @@ -0,0 +1,15 @@ +SUMMARY = " UTF-8 with C++ in a Portable Way" +HOMEPAGE = "https://github.com/nemtrif/utfcpp" + +LICENSE = "BSL-1.0 & MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://tests/ftest.h;endline=25;md5=d33c6488d3b003723a5f17ac984db030" + +SRC_URI = "git://github.com/nemtrif/utfcpp;protocol=https;branch=master;tag=v${PV}" + +SRCREV = "f9319195dfddf369f68f18e7c0039b3f351797fd" + +inherit cmake + +FILES:${PN}-dev += "${datadir}/utf8cpp/cmake" -- 2.47.3