From ada5eef088ec38bfc870e5c03d8f64ae51b944ce Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Mon, 10 Nov 2025 17:58:52 +0100 Subject: [PATCH] Remove outdated flatpak font config --- CMakeLists.txt | 4 ---- cmake/Flatpak.cmake | 14 ------------- cmake/Flatpak/99-noto-mono-color-emoji.conf | 23 --------------------- src/app/main.cpp | 6 ------ 4 files changed, 47 deletions(-) delete mode 100644 cmake/Flatpak.cmake delete mode 100644 cmake/Flatpak/99-noto-mono-color-emoji.conf diff --git a/CMakeLists.txt b/CMakeLists.txt index f339b5ef5..6e60e08d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,10 +46,6 @@ if (NOT ANDROID) include(KDEClangFormat) endif() -if(NEOCHAT_FLATPAK) - include(cmake/Flatpak.cmake) -endif() - set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE) ecm_set_disabled_deprecation_versions(Qt 6.9.0 KF 6.17.0) diff --git a/cmake/Flatpak.cmake b/cmake/Flatpak.cmake deleted file mode 100644 index fd35e49be..000000000 --- a/cmake/Flatpak.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-FileCopyrightText: 2020 Carl Schwan -# SPDX-License-Identifier: BSD-2-Clause - -include(GNUInstallDirs) - -# Include FontConfig config which uses the Emoji One font from the -# KDE Flatpak SDK. -install( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Flatpak/99-noto-mono-color-emoji.conf - DESTINATION - ${CMAKE_INSTALL_SYSCONFDIR}/fonts/local.conf -) - diff --git a/cmake/Flatpak/99-noto-mono-color-emoji.conf b/cmake/Flatpak/99-noto-mono-color-emoji.conf deleted file mode 100644 index 36cf12046..000000000 --- a/cmake/Flatpak/99-noto-mono-color-emoji.conf +++ /dev/null @@ -1,23 +0,0 @@ - - - - - serif - - Noto Color Emoji - - - - sans-serif - - Noto Color Emoji - - - - monospace - - Noto Color Emoji - - - - diff --git a/src/app/main.cpp b/src/app/main.cpp index ae71dd366..67f1086a7 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -162,12 +162,6 @@ int main(int argc, char *argv[]) Connection::setEncryptionDefault(true); Connection::setDirectChatEncryptionDefault(true); -#ifdef NEOCHAT_FLATPAK - // Copy over the included FontConfig configuration to the - // app's config dir: - QFile::copy(u"/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf"_s, u"/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"_s); -#endif - ColorSchemer colorScheme; QCommandLineParser parser;