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@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-09-30 20:02:50 +02:00
parent a7a7d1a74d
commit 09c57db734
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
2 changed files with 60 additions and 8 deletions

View File

@ -0,0 +1,48 @@
From 361dee19b0451c998ae8e0dd12fff310f6aeada6 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
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 ()

View File

@ -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 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI=8
inherit cmake gnome2-utils inherit cmake gnome2-utils
DESCRIPTION="Vietnamese UniKey engine for IBus" DESCRIPTION="Vietnamese UniKey engine for IBus"
HOMEPAGE="https://github.com/vn-input/ibus-unikey" HOMEPAGE="https://github.com/vn-input/ibus-unikey"
SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P/_/-}"
LICENSE="GPL-3+" LICENSE="GPL-3+"
SLOT="0" SLOT="0"
KEYWORDS="amd64 x86" KEYWORDS="amd64 x86"
IUSE="" IUSE=""
RDEPEND="app-i18n/ibus RDEPEND="
x11-libs/gtk+:3 app-i18n/ibus
virtual/libintl" virtual/libintl
x11-libs/gtk+:3"
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig BDEPEND="
sys-devel/gettext" sys-devel/gettext
S="${WORKDIR}/${P/_/-}" virtual/pkgconfig"
PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) # bug 957750, git master
src_configure() { src_configure() {
local mycmakeargs=( local mycmakeargs=(