From 5029ba2ea7149ebb3aa8baa01548b647608350bc Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Wed, 22 Apr 2026 12:12:30 +0800 Subject: [PATCH] games-util/chiaki-ng: add 1.10.0, drop 1.9.9-r1 Signed-off-by: Huang Rui --- games-util/chiaki-ng/Manifest | 2 +- ....9.9-r1.ebuild => chiaki-ng-1.10.0.ebuild} | 8 ++--- games-util/chiaki-ng/chiaki-ng-9999.ebuild | 6 ++-- .../files/chiaki-ng-1.10.0-munit-c23.patch | 15 ++++++++ ... chiaki-ng-1.10.0-use-shared-nanopb.patch} | 0 .../chiaki-ng-1.9.9-fix-qt6-guiprivate.patch | 34 ------------------- 6 files changed, 23 insertions(+), 42 deletions(-) rename games-util/chiaki-ng/{chiaki-ng-1.9.9-r1.ebuild => chiaki-ng-1.10.0.ebuild} (90%) create mode 100644 games-util/chiaki-ng/files/chiaki-ng-1.10.0-munit-c23.patch rename games-util/chiaki-ng/files/{chiaki-ng-1.9.9-use-shared-nanopb.patch => chiaki-ng-1.10.0-use-shared-nanopb.patch} (100%) delete mode 100644 games-util/chiaki-ng/files/chiaki-ng-1.9.9-fix-qt6-guiprivate.patch diff --git a/games-util/chiaki-ng/Manifest b/games-util/chiaki-ng/Manifest index 4529ddfa41..ecea75a07a 100644 --- a/games-util/chiaki-ng/Manifest +++ b/games-util/chiaki-ng/Manifest @@ -1,2 +1,2 @@ -DIST chiaki-ng-1.9.9.tar.gz 40777945 BLAKE2B 48db882e9d183f05f9549ef17c536b02f11104f78a02e1c5c2bfd9117997b7060e635139d9a61a13fc0712567ffe0c767b67bf683b46a64962f272d059817fc1 SHA512 a71f2c94f6322785334d226b3d29e9c845202c78e96e31ac2a5f27c1e8a7879551a3d839cb1814cac3909f2c2da4a942aac5c83f690fe1699d332afbdce6c7be +DIST chiaki-ng-1.10.0.tar.gz 40971482 BLAKE2B 037beb6ffb178401a5cba0fb3fb0f7570b409d16bae5f3ac0b987fd03d625fa6cf085b444ca2e9cdbd119211d6650ba56267714f401de517a54606ba4b1db4e1 SHA512 abd03d6288b4f97e6977cb0772d9890fba3fa69d0d0681d7e930c4da18d2a39166673b2564ecb8b0ea496a075b2b605d3a553b9b5f587c2f2a815225ec0c968f DIST munit-439de4a9b136bc3b5163e73d4caf37c590bef875.tar.gz 27747 BLAKE2B 81cac50228c9e782ce2100edc42462d900c08c6dd43c8a6e10abb6a72db559e780fc57e2a26cf308081cc4d55815e1444d8704af4b0fad73076c015753ca8bb8 SHA512 28fbe29636fd3ecb675f2e823165ac88be10adfbb2d4155fee43a4b2747c8dd4f24808ed9ddedd9a2ec60d96367e60fce8ca82c54b0eb605ed9b4bb05392a872 diff --git a/games-util/chiaki-ng/chiaki-ng-1.9.9-r1.ebuild b/games-util/chiaki-ng/chiaki-ng-1.10.0.ebuild similarity index 90% rename from games-util/chiaki-ng/chiaki-ng-1.9.9-r1.ebuild rename to games-util/chiaki-ng/chiaki-ng-1.10.0.ebuild index b292cd73da..7126b48bda 100644 --- a/games-util/chiaki-ng/chiaki-ng-1.9.9-r1.ebuild +++ b/games-util/chiaki-ng/chiaki-ng-1.10.0.ebuild @@ -66,10 +66,6 @@ BDEPEND=" " PATCHES=( - # Fix build failure with Qt 6.10+ (GuiPrivate not found) - # https://github.com/streetpea/chiaki-ng/issues/669 - # https://github.com/streetpea/chiaki-ng/pull/670 - "${FILESDIR}/${P}-fix-qt6-guiprivate.patch" # Use shared nanopb library instead of static # https://bugs.gentoo.org/965824 "${FILESDIR}/${P}-use-shared-nanopb.patch" @@ -80,7 +76,9 @@ src_prepare() { if use test; then rm -r "${S}"/test/munit - ln -s "${WORKDIR}"/munit-${VER_MUNIT} "${S}"/test/munit + cp -r "${WORKDIR}"/munit-${VER_MUNIT} "${S}"/test/munit || die + # munit uses ATOMIC_VAR_INIT, which was removed in C23 (GCC 15+) + eapply "${FILESDIR}/${P}-munit-c23.patch" fi } diff --git a/games-util/chiaki-ng/chiaki-ng-9999.ebuild b/games-util/chiaki-ng/chiaki-ng-9999.ebuild index fa913e293e..6802160e48 100644 --- a/games-util/chiaki-ng/chiaki-ng-9999.ebuild +++ b/games-util/chiaki-ng/chiaki-ng-9999.ebuild @@ -68,7 +68,7 @@ BDEPEND=" PATCHES=( # Use shared nanopb library instead of static # https://bugs.gentoo.org/965824 - "${FILESDIR}/${PN}-1.9.9-use-shared-nanopb.patch" + "${FILESDIR}/${PN}-1.10.0-use-shared-nanopb.patch" ) src_prepare() { @@ -76,7 +76,9 @@ src_prepare() { if use test; then rm -r "${S}"/test/munit - ln -s "${WORKDIR}"/munit-${VER_MUNIT} "${S}"/test/munit + cp -r "${WORKDIR}"/munit-${VER_MUNIT} "${S}"/test/munit || die + # munit uses ATOMIC_VAR_INIT, which was removed in C23 (GCC 15+) + eapply "${FILESDIR}/${PN}-1.10.0-munit-c23.patch" fi } diff --git a/games-util/chiaki-ng/files/chiaki-ng-1.10.0-munit-c23.patch b/games-util/chiaki-ng/files/chiaki-ng-1.10.0-munit-c23.patch new file mode 100644 index 0000000000..da6d500d80 --- /dev/null +++ b/games-util/chiaki-ng/files/chiaki-ng-1.10.0-munit-c23.patch @@ -0,0 +1,15 @@ +Fix build with C23 / GCC 15+: ATOMIC_VAR_INIT was removed in C23. + +Upstream munit is unmaintained since 2020, so patch in-tree. + +--- a/test/munit/munit.c ++++ b/test/munit/munit.c +@@ -798,7 +798,7 @@ + #elif defined(HAVE_STDATOMIC) + # include + # define ATOMIC_UINT32_T _Atomic uint32_t +-# define ATOMIC_UINT32_INIT(x) ATOMIC_VAR_INIT(x) ++# define ATOMIC_UINT32_INIT(x) (x) + #elif defined(HAVE_CLANG_ATOMICS) + # define ATOMIC_UINT32_T _Atomic uint32_t + # define ATOMIC_UINT32_INIT(x) (x) diff --git a/games-util/chiaki-ng/files/chiaki-ng-1.9.9-use-shared-nanopb.patch b/games-util/chiaki-ng/files/chiaki-ng-1.10.0-use-shared-nanopb.patch similarity index 100% rename from games-util/chiaki-ng/files/chiaki-ng-1.9.9-use-shared-nanopb.patch rename to games-util/chiaki-ng/files/chiaki-ng-1.10.0-use-shared-nanopb.patch diff --git a/games-util/chiaki-ng/files/chiaki-ng-1.9.9-fix-qt6-guiprivate.patch b/games-util/chiaki-ng/files/chiaki-ng-1.9.9-fix-qt6-guiprivate.patch deleted file mode 100644 index 2afb6173ae..0000000000 --- a/games-util/chiaki-ng/files/chiaki-ng-1.9.9-fix-qt6-guiprivate.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe5bfd87998c7ca67ade76436e31ab9924000c8b Mon Sep 17 00:00:00 2001 -From: Morgan Helton -Date: Fri, 24 Oct 2025 20:03:09 -0500 -Subject: [PATCH] Add Qt6::GuiPrivate link conditional on Qt version - -Fix build failure with Qt 6.10+ -Upstream fix: https://github.com/streetpea/chiaki-ng/pull/670 -Related issue: https://github.com/streetpea/chiaki-ng/issues/669 ---- - gui/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt -index 201dfaf4..7e777e1f 100755 ---- a/gui/CMakeLists.txt -+++ b/gui/CMakeLists.txt -@@ -8,6 +8,10 @@ if(APPLE) - endif() - - find_package(Qt6 REQUIRED COMPONENTS Core Gui Concurrent Svg Qml Quick Widgets) -+if(Qt6_VERSION VERSION_GREATER_EQUAL "6.10.0") -+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate) -+endif() -+ - find_package(Qt6 COMPONENTS WebEngineQuick) - find_package(Qt6 COMPONENTS DBus) - -@@ -154,4 +158,4 @@ install(TARGETS chiaki - BUNDLE DESTINATION bin) - install(FILES chiaking.desktop DESTINATION share/applications) - install(FILES chiaking.png DESTINATION share/icons/hicolor/512x512/apps) --install(FILES io.github.streetpea.Chiaki4deck.appdata.xml DESTINATION share/metainfo) -\ No newline at end of file -+install(FILES io.github.streetpea.Chiaki4deck.appdata.xml DESTINATION share/metainfo)