commit: 09c57db734d9e2667a79411f6e867829e655b199 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Sep 30 18:02:50 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 30 18:09:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c57db7
app-i18n/ibus-unikey: update EAPI 7 -> 8, fix build w/ cmake-4 Closes: https://bugs.gentoo.org/957750 Closes: https://bugs.gentoo.org/957751 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/ibus-unikey-0.7.0_beta1-cmake4.patch | 48 ++++++++++++++++++++++ .../ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild | 20 +++++---- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-0.7.0_beta1-cmake4.patch b/app-i18n/ibus-unikey/files/ibus-unikey-0.7.0_beta1-cmake4.patch new file mode 100644 index 000000000000..75f7ebed820a --- /dev/null +++ b/app-i18n/ibus-unikey/files/ibus-unikey-0.7.0_beta1-cmake4.patch @@ -0,0 +1,48 @@ +From 361dee19b0451c998ae8e0dd12fff310f6aeada6 Mon Sep 17 00:00:00 2001 +From: fujiwarat <[email protected]> +Date: Fri, 18 Jul 2025 17:38:45 +0900 +Subject: [PATCH] Fix CMake files with CMake 4.0 + +--- + CMakeLists.txt | 2 +- + cmake/GSettings.cmake | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4eea9179a..95d0e0c22 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.0) ++cmake_minimum_required (VERSION 3.5) + project (ibus-unikey) + + cmake_policy(SET CMP0054 NEW) +diff --git a/cmake/GSettings.cmake b/cmake/GSettings.cmake +index 0da7650ea..c0b8d6b16 100644 +--- a/cmake/GSettings.cmake ++++ b/cmake/GSettings.cmake +@@ -65,6 +65,7 @@ macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX) + ${GSETTINGS_TARGET} + COMMAND + ${CMAKE_COMMAND} -E make_directory "${COMPILE_IN_PLACE_DIR}" ++ POST_BUILD + ) + + # Copy all schemas to the build folder. +@@ -75,6 +76,7 @@ macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX) + COMMAND + ${CMAKE_COMMAND} -E copy "${schema_file}" "${COMPILE_IN_PLACE_DIR}" + COMMENT "Copying schema ${schema_file} to ${COMPILE_IN_PLACE_DIR}" ++ POST_BUILD + ) + endforeach() + +@@ -85,6 +87,7 @@ macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX) + COMMAND + ${glib_schema_compiler} ${COMPILE_IN_PLACE_DIR} + COMMENT "Compiling schemas in folder: ${COMPILE_IN_PLACE_DIR}" ++ POST_BUILD + ) + endif () + diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild index 7a1e8a57f140..366014e0545a 100644 --- a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild +++ b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild @@ -1,26 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit cmake gnome2-utils DESCRIPTION="Vietnamese UniKey engine for IBus" HOMEPAGE="https://github.com/vn-input/ibus-unikey"; SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/_/-}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 x86" IUSE="" -RDEPEND="app-i18n/ibus - x11-libs/gtk+:3 - virtual/libintl" +RDEPEND=" + app-i18n/ibus + virtual/libintl + x11-libs/gtk+:3" DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - sys-devel/gettext" -S="${WORKDIR}/${P/_/-}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) # bug 957750, git master src_configure() { local mycmakeargs=(
