vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make KF6 NotifyConfig build on Redox

Browse Source
This commit is contained in:
Vasilito
2026-05-07 08:11:48 +01:00
parent d8d26eaff3
commit e811f4fc23
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/recipes/kde/kf6-notifyconfig/recipe.toml
+4 -1
View File
@@ -29,12 +29,16 @@ sed -i "s/^ecm_install_po_files_as_qm/#ecm_install_po_files_as_qm/" \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
sed -i 's/^ki18n_install(po)/#ki18n_install(po)/' \ sed -i 's/^ki18n_install(po)/#ki18n_install(po)/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
sed -i 's/find_package(Qt6 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets)/find_package(Qt6 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets Network)/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
sed -i '/if (BUILD_TESTING)/,/endif()/s/^/#/' \ sed -i '/if (BUILD_TESTING)/,/endif()/s/^/#/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
sed -i 's/find_package(Canberra)/# find_package(Canberra disabled on Redox)/' \ sed -i 's/find_package(Canberra)/# find_package(Canberra disabled on Redox)/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
sed -i 's/find_package(Qt6 REQUIRED COMPONENTS Multimedia)/# find_package(Qt6Multimedia disabled on Redox)/' \ sed -i 's/find_package(Qt6 REQUIRED COMPONENTS Multimedia)/# find_package(Qt6Multimedia disabled on Redox)/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true "${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
sed -i 's/find_package(Qt6Multimedia REQUIRED)/set(Qt6Multimedia_FOUND FALSE)/' \
"${COOKBOOK_SOURCE}/CMakeLists.txt" 2>/dev/null || true
rm -f CMakeCache.txt rm -f CMakeCache.txt
rm -rf CMakeFiles rm -rf CMakeFiles
@@ -47,7 +51,6 @@ cmake "${COOKBOOK_SOURCE}" \
-DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \ -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \
-DBUILD_TESTING=OFF \ -DBUILD_TESTING=OFF \
-DBUILD_QCH=OFF \ -DBUILD_QCH=OFF \
-DBUILD_DESIGNERPLUGIN=OFF \
-Wno-dev -Wno-dev
cmake --build . -j${COOKBOOK_MAKE_JOBS} cmake --build . -j${COOKBOOK_MAKE_JOBS}
local/recipes/kde/kf6-notifyconfig/source/CMakeLists.txt
+7 -8
View File
@@ -28,7 +28,7 @@ include(ECMDeprecationSettings)
# Required Qt components to build this framework # Required Qt components to build this framework
set(REQUIRED_QT_VERSION 6.6.0) set(REQUIRED_QT_VERSION 6.6.0)
find_package(Qt6 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets) find_package(Qt6 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets Network)
# shall we use DBus? # shall we use DBus?
# enabled per default on Linux & BSD systems # enabled per default on Linux & BSD systems
@@ -48,16 +48,15 @@ find_package(KF6Config ${KF_DEP_VERSION} REQUIRED)
find_package(KF6I18n ${KF_DEP_VERSION} REQUIRED) find_package(KF6I18n ${KF_DEP_VERSION} REQUIRED)
find_package(KF6KIO ${KF_DEP_VERSION} REQUIRED) find_package(KF6KIO ${KF_DEP_VERSION} REQUIRED)
find_package(Canberra) # find_package(Canberra disabled on Redox)
set_package_properties(Canberra PROPERTIES set_package_properties(Canberra PROPERTIES
PURPOSE "Needed to preview notification sounds" PURPOSE "Needed to preview notification sounds"
TYPE OPTIONAL) TYPE OPTIONAL)
if (NOT Canberra_FOUND) if (NOT Canberra_FOUND)
# This is REQUIRED since you cannot tell CMake "either one of those two optional ones are required" # Redox does not package Qt6Multimedia yet. KNotifyConfig guards the sound
find_package(Qt6Multimedia REQUIRED) # preview implementation with HAVE_QTMULTIMEDIA, so keep notification
set_package_properties(Qt6Multimedia PROPERTIES # configuration available and disable only preview playback on this target.
DESCRIPTION "Qt multimedia library" set(Qt6Multimedia_FOUND FALSE)
PURPOSE "Needed to preview notification sounds when Canberra isn't available")
endif() endif()
# ECM setup # ECM setup
@@ -79,7 +78,7 @@ ecm_set_disabled_deprecation_versions(
# Subdirectories # Subdirectories
add_definitions(-DTRANSLATION_DOMAIN=\"knotifyconfig6\") add_definitions(-DTRANSLATION_DOMAIN=\"knotifyconfig6\")
ki18n_install(po) #ki18n_install(po)
add_subdirectory(src) add_subdirectory(src)
if(BUILD_TESTING) if(BUILD_TESTING)
add_subdirectory(tests) add_subdirectory(tests)