commit: 88d6c4da18d6e1eb4781ecf6088eb38b0fd88fba Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 25 22:38:32 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 26 16:52:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d6c4da
media-fonts/oxygen-fonts: Fix build w/ cmake-4, drop Qt5 dep ... by switching to GNUInstallDirs. Porting to GNUInstallDirs/CMakePackageConfigHelpers gets rid of a load of warnings and saves porting to KDEInstallDirs6. Closes: https://bugs.gentoo.org/957482 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/oxygen-fonts-5.4.3-cmake4.patch | 66 ++++++++++++++++++++++ .../oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild | 10 ++-- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/media-fonts/oxygen-fonts/files/oxygen-fonts-5.4.3-cmake4.patch b/media-fonts/oxygen-fonts/files/oxygen-fonts-5.4.3-cmake4.patch new file mode 100644 index 000000000000..ef75011d94d3 --- /dev/null +++ b/media-fonts/oxygen-fonts/files/oxygen-fonts-5.4.3-cmake4.patch @@ -0,0 +1,66 @@ +From c35d5cd4b8fee1d1edf1577b7abc04976a77cc5d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Tue, 25 Nov 2025 23:28:09 +0100 +Subject: [PATCH] Allow build with CMake-4, use GNUInstallDirs instead of + KDEInstallDirs + +Also port to CMakePackageConfigHelpers + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 499c0cad..22b7e2d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,28 +1,27 @@ ++cmake_minimum_required(VERSION 3.16...3.31) ++ + project(OxygenFont) + set(PROJECT_VERSION "5.4.3") +-cmake_minimum_required(VERSION 2.8.12) + + find_package(ECM 1.2.0 REQUIRED NO_MODULE) + +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + +-include(KDEInstallDirs) +-include(ECMPackageConfigHelpers) ++include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) + include(ECMSetupVersion) + include(FeatureSummary) + + # create a Config.cmake and a ConfigVersion.cmake file and install them +-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/OxygenFont") +- +-include(ECMPackageConfigHelpers) ++set(CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX OXYGENFONT + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/OxygenFontConfigVersion.cmake" + ) + +-ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/OxygenFontConfig.cmake.in" ++configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/OxygenFontConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/OxygenFontConfig.cmake" +- INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ++ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + ) + + install(FILES +@@ -32,7 +31,7 @@ install(FILES + COMPONENT Devel) + + if(NOT DEFINED OXYGEN_FONT_INSTALL_DIR) +- set(OXYGEN_FONT_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL_PREFIX}/fonts/truetype/oxygen) ++ set(OXYGEN_FONT_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/fonts/truetype/oxygen) + endif() + + find_program(FONTFORGE_EXECUTABLE NAMES fontforge) +-- +2.52.0 + diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild index 54930484447a..d7ed274f5191 100644 --- a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild +++ b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,14 +15,16 @@ KEYWORDS="amd64 ~arm ~loong x86" IUSE="" BDEPEND=" - >=dev-qt/qtcore-5.12.3:5 - >=kde-frameworks/extra-cmake-modules-5.60.0:0 + kde-frameworks/extra-cmake-modules:0 media-gfx/fontforge " DOCS=( README.md ) -PATCHES=( "${FILESDIR}/${P}-fix-d-and-t-accents.patch" ) +PATCHES=( + "${FILESDIR}/${P}-fix-d-and-t-accents.patch" + "${FILESDIR}/${P}-cmake4.patch" # bug 957482 +) src_configure() { xdg_environment_reset
