gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

media-fonts/oxygen-fonts: Fix build w/ cmake-4, drop Qt5 dep

Browse Source 
... 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@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-11-25 23:38:32 +01:00
parent 7828e062dd
commit 88d6c4da18
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
2 changed files with 72 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
media-fonts/oxygen-fonts/files/oxygen-fonts-5.4.3-cmake4.patch Normal file
View File

@ -0,0 +1,66 @@
From c35d5cd4b8fee1d1edf1577b7abc04976a77cc5d Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
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 <asturm@gentoo.org>
---
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

10
media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
View File

@ -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