community/nxp-mfgtools: fix gcc13 build, use samurai, put header in usr/include

community/nxp-mfgtools/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Olliver Schinagl <oliver@schinagl.nl>
 pkgname=nxp-mfgtools
 pkgver=1.5.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Freescale/NXP i.MX Chip image deploy tools"
 url="https://github.com/NXPmicro/mfgtools"
 arch="all"
@@ -15,9 +15,12 @@ makedepends="
 	libusb-dev
 	libzip-dev
 	openssl-dev>3
+	samurai
 	zstd-dev
 	"
-source="$pkgname-$pkgver.tar.gz::https://github.com/nxp-imx/mfgtools/archive/refs/tags/uuu_$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/nxp-imx/mfgtools/archive/refs/tags/uuu_$pkgver.tar.gz
+	gcc13.patch
+	"
 builddir="$srcdir/mfgtools-uuu_$pkgver/"
 
 prepare() {
@@ -26,7 +29,7 @@ prepare() {
 }
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
@@ -38,7 +41,7 @@ package() {
 	DESTDIR="$pkgdir" cmake --install build
 
 	install -Dm644 build/libuuu/libuuc_s.a "$pkgdir/usr/lib/libuuc_s.a"
-	install -Dm644 libuuu/libuuu.h "$pkgdir/usr/lib/libuuu.h"
+	install -Dm644 libuuu/libuuu.h "$pkgdir/usr/include/libuuu.h"
 }
 
 uuu() {
@@ -47,4 +50,5 @@ uuu() {
 
 sha512sums="
 4b77bab9028dd2270d7b4d7a17e85439e69df5de36fa9b02986df28b0439be0f51959294e684b8d33353621fc33e189db42b8dd83b0ca6c3a6ad76355d8b3515  nxp-mfgtools-1.5.21.tar.gz
+873a2b3a6b091172ce1762dccac13583b25c6781133162f7a8c4cc3fc2ecc30549c324682e1004a3658c49681b87f1975632bf9c9e8f02ec5e02176c780999ce  gcc13.patch
 "

community/nxp-mfgtools/gcc13.patch

@@ -0,0 +1,24 @@
+diff --git a/libuuu/libcomm.h b/libuuu/libcomm.h
+index 93ab7e5..bc39be6 100644
+--- a/libuuu/libcomm.h
++++ b/libuuu/libcomm.h
+@@ -29,6 +29,7 @@
+ *
+ */
+ #include <string>
++#include <cstdint>
+ #include <stdarg.h>
+ #include <locale>
+ #include <cctype>
+diff --git a/uuu/buildincmd.h b/uuu/buildincmd.h
+index 9415117..3a94679 100644
+--- a/uuu/buildincmd.h
++++ b/uuu/buildincmd.h
+@@ -31,6 +31,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <string>
+ #include <vector>