File add-effect-config.patch of Package como

Overview Repositories Revisions Requests Users Attributes Meta

File add-effect-config.patch of Package como (Revision d3d687a1ef342ba0c3691add9f2566af)

Currently displaying revision d3d687a1ef342ba0c3691add9f2566af , Show latest

diff --git a/como/desktop/CMakeLists.txt b/como/desktop/CMakeLists.txt
index b0b2ec2df..4a8f32e9f 100644
--- a/como/desktop/CMakeLists.txt
+++ b/como/desktop/CMakeLists.txt
@@ -10,12 +10,12 @@ target_link_libraries(desktop
     base
 )
 
-qt6_add_dbus_interface(
+qt_add_dbus_interface(
   desktop_dbus_src
   ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf6_org.freedesktop.ScreenSaver.xml
   screenlocker_interface
 )
-qt6_add_dbus_interface(
+qt_add_dbus_interface(
   desktop_dbus_src
   ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml
   kscreenlocker_interface
@@ -34,7 +34,7 @@ target_sources(desktop
 
 add_library(desktop-kde SHARED)
 
-qt6_add_dbus_adaptor(desktop_kde_dbus_src
+qt_add_dbus_adaptor(desktop_kde_dbus_src
   kde/dbus/org.kde.KWin.xml
   kde/dbus/kwin.h
   como::desktop::kde::kwin
diff --git a/como/render/CMakeLists.txt b/como/render/CMakeLists.txt
index bfe06efe5..8d2b80a88 100644
--- a/como/render/CMakeLists.txt
+++ b/como/render/CMakeLists.txt
@@ -2,16 +2,17 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-qt6_add_dbus_interface(effects_interface_src effect/interface/org.kde.kwin.Effects.xml kwineffects_interface)
+set(como_effects_dbus_xml ${CMAKE_CURRENT_SOURCE_DIR}/effect/interface/org.kde.kwin.Effects.xml)
+qt_add_dbus_interface(effects_interface_src ${como_effects_dbus_xml} kwineffects_interface)
 
 add_library(effects-interface STATIC ${effects_interface_src})
+set_target_properties(effects-interface PROPERTIES
+  POSITION_INDEPENDENT_CODE ON
+)
 target_link_libraries(effects-interface
   Qt::DBus
   base
 )
-set_target_properties(effects-interface PROPERTIES
-  POSITION_INDEPENDENT_CODE ON
-)
 
 add_library(render SHARED)
 
@@ -146,21 +147,21 @@ target_sources(render
     cursor.h
 )
 
-qt6_add_resources(render gl/resources.qrc)
+qt_add_resources(render gl/resources.qrc)
 kconfig_add_kcfg_files(render config/render_settings.kcfgc)
 kconfig_add_kcfg_files(render post/kconfig/color_correct_settings.kcfgc)
 
-qt6_add_dbus_adaptor(render_dbus_SRCS
+qt_add_dbus_adaptor(render_dbus_SRCS
   dbus/org.kde.kwin.Compositing.xml
   dbus/compositing.h
   como::render::dbus::compositing_qobject
 )
-qt6_add_dbus_adaptor(render_dbus_SRCS
+qt_add_dbus_adaptor(render_dbus_SRCS
   dbus/org.kde.KWin.NightLight.xml
   post/color_correct_dbus_interface.h
   como::render::post::color_correct_dbus_interface
 )
-qt6_add_dbus_adaptor(render_dbus_SRCS
+qt_add_dbus_adaptor(render_dbus_SRCS
   effect/interface/org.kde.kwin.Effects.xml
   effects.h
   como::render::effects_handler_wrap
diff --git a/como/script/CMakeLists.txt b/como/script/CMakeLists.txt
index 84260867a..a2f6c6edc 100644
--- a/como/script/CMakeLists.txt
+++ b/como/script/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(script
     win
 )
 
-qt6_add_dbus_adaptor(script_dbus_srcs
+qt_add_dbus_adaptor(script_dbus_srcs
   org.kde.kwin.Script.xml
   script.h
   como::scripting::abstract_script
diff --git a/como/win/CMakeLists.txt b/como/win/CMakeLists.txt
index b303f0786..39e63dd7d 100644
--- a/como/win/CMakeLists.txt
+++ b/como/win/CMakeLists.txt
@@ -176,17 +176,17 @@ if (COMO_BUILD_TABBOX)
   target_link_libraries(win PRIVATE Qt::GuiPrivate)
 endif()
 
-qt6_add_dbus_adaptor(win_dbus_src
+qt_add_dbus_adaptor(win_dbus_src
   dbus/org.kde.KWin.VirtualDesktopManager.xml
   dbus/virtual_desktop_manager.h
   como::win::dbus::subspace_manager_wrap
 )
-qt6_add_dbus_interface(win_dbus_src dbus/org.kde.kappmenu.xml appmenu_interface)
-qt6_add_dbus_interface(win_dbus_src
+qt_add_dbus_interface(win_dbus_src dbus/org.kde.kappmenu.xml appmenu_interface)
+qt_add_dbus_interface(win_dbus_src
   ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf6_org.freedesktop.ScreenSaver.xml
   screenlocker_interface
 )
-qt6_add_dbus_adaptor(win_dbus_src
+qt_add_dbus_adaptor(win_dbus_src
   dbus/org.kde.KWin.Session.xml
   dbus/session_manager.h
   como::win::dbus::session_manager
diff --git a/plugins/effects/CMakeLists.txt b/plugins/effects/CMakeLists.txt
index b2c9d1c1d..a6cb480d2 100644
--- a/plugins/effects/CMakeLists.txt
+++ b/plugins/effects/CMakeLists.txt
@@ -15,8 +15,6 @@ ecm_setup_qtplugin_macro_names(
         PACKAGE_SETUP_KWINEFFECTS_AUTOMOC_VARIABLES
 )
 
-add_subdirectory(private)
-
 function(kwin_add_effect_config name)
     list(REMOVE_ITEM ARGV ${name})
     kcoreaddons_add_plugin(${name} INSTALL_NAMESPACE "kwin/effects/configs" SOURCES ${ARGV})
@@ -62,13 +60,15 @@ function(kwin_add_scripted_effect name source)
     file(COPY ${source}/contents ${source}/metadata.json DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/${name})
 endfunction()
 
+add_subdirectory(private)
+
 add_subdirectory(backgroundcontrast)
 add_subdirectory(blendchanges)
 add_subdirectory(blur)
 add_subdirectory(colorblindnesscorrection)
 add_subdirectory(colorpicker)
-add_subdirectory(cube)
-add_subdirectory(cubeslide)
+# add_subdirectory(cube)
+# add_subdirectory(cubeslide)
 add_subdirectory(dialogparent)
 add_subdirectory(diminactive)
 add_subdirectory(dimscreen)
diff --git a/plugins/effects/blur/CMakeLists.txt b/plugins/effects/blur/CMakeLists.txt
index bd627aeea..9488faf18 100644
--- a/plugins/effects/blur/CMakeLists.txt
+++ b/plugins/effects/blur/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(blur PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_blur_config_SRCS blur_config.cpp)
     ki18n_wrap_ui(kwin_blur_config_SRCS blur_config.ui)
     kconfig_add_kcfg_files(kwin_blur_config_SRCS blurconfig.kcfgc)
diff --git a/plugins/effects/colorblindnesscorrection/CMakeLists.txt b/plugins/effects/colorblindnesscorrection/CMakeLists.txt
index 03b89506e..89772bffb 100644
--- a/plugins/effects/colorblindnesscorrection/CMakeLists.txt
+++ b/plugins/effects/colorblindnesscorrection/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(colorblindnesscorrection PRIVATE
 )
 
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
   kcmutils_add_qml_kcm(kwin_colorblindnesscorrection_config
     SOURCES colorblindnesscorrection_config.cpp
     INSTALL_NAMESPACE "kwin/effects/configs"
diff --git a/plugins/effects/cube/CMakeLists.txt b/plugins/effects/cube/CMakeLists.txt
index f2920652e..665028de2 100644
--- a/plugins/effects/cube/CMakeLists.txt
+++ b/plugins/effects/cube/CMakeLists.txt
@@ -25,7 +25,7 @@ install(FILES data/cubecap.png DESTINATION ${KDE_INSTALL_DATADIR}/kwin)
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
   set(kwin_cube_config_SRCS cube_config.cpp)
   ki18n_wrap_ui(kwin_cube_config_SRCS cube_config.ui)
   kconfig_add_kcfg_files(kwin_cube_config_SRCS cubeconfig.kcfgc)
diff --git a/plugins/effects/cubeslide/CMakeLists.txt b/plugins/effects/cubeslide/CMakeLists.txt
index cbaaa2400..bd9169d4a 100644
--- a/plugins/effects/cubeslide/CMakeLists.txt
+++ b/plugins/effects/cubeslide/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(cubeslide PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
   set(kwin_cubeslide_config_SRCS cubeslide_config.cpp)
   ki18n_wrap_ui(kwin_cubeslide_config_SRCS cubeslide_config.ui)
   kconfig_add_kcfg_files(kwin_cubeslide_config_SRCS cubeslideconfig.kcfgc)
diff --git a/plugins/effects/diminactive/CMakeLists.txt b/plugins/effects/diminactive/CMakeLists.txt
index 531b8e2fc..6231760c8 100644
--- a/plugins/effects/diminactive/CMakeLists.txt
+++ b/plugins/effects/diminactive/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(diminactive PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_diminactive_config_SRCS diminactive_config.cpp)
     ki18n_wrap_ui(kwin_diminactive_config_SRCS diminactive_config.ui)
     kconfig_add_kcfg_files(kwin_diminactive_config_SRCS diminactiveconfig.kcfgc)
diff --git a/plugins/effects/glide/CMakeLists.txt b/plugins/effects/glide/CMakeLists.txt
index 7488cbaac..6b42afda8 100644
--- a/plugins/effects/glide/CMakeLists.txt
+++ b/plugins/effects/glide/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(glide PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_glide_config_SRCS glide_config.cpp)
     ki18n_wrap_ui(kwin_glide_config_SRCS glide_config.ui)
     kconfig_add_kcfg_files(kwin_glide_config_SRCS glideconfig.kcfgc)
diff --git a/plugins/effects/invert/CMakeLists.txt b/plugins/effects/invert/CMakeLists.txt
index b45242ef4..a805893a3 100644
--- a/plugins/effects/invert/CMakeLists.txt
+++ b/plugins/effects/invert/CMakeLists.txt
@@ -20,7 +20,7 @@ target_link_libraries(invert PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_invert_config_SRCS invert_config.cpp)
 
     kwin_add_effect_config(kwin_invert_config ${kwin_invert_config_SRCS})
diff --git a/plugins/effects/lookingglass/CMakeLists.txt b/plugins/effects/lookingglass/CMakeLists.txt
index 6acbad2df..28ca2e254 100644
--- a/plugins/effects/lookingglass/CMakeLists.txt
+++ b/plugins/effects/lookingglass/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(lookingglass PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_lookingglass_config_SRCS lookingglass_config.cpp)
     ki18n_wrap_ui(kwin_lookingglass_config_SRCS lookingglass_config.ui)
     kconfig_add_kcfg_files(kwin_lookingglass_config_SRCS lookingglassconfig.kcfgc)
diff --git a/plugins/effects/magiclamp/CMakeLists.txt b/plugins/effects/magiclamp/CMakeLists.txt
index b5033c171..e93b1812b 100644
--- a/plugins/effects/magiclamp/CMakeLists.txt
+++ b/plugins/effects/magiclamp/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(magiclamp PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_magiclamp_config_SRCS magiclamp_config.cpp)
     ki18n_wrap_ui(kwin_magiclamp_config_SRCS magiclamp_config.ui)
     kconfig_add_kcfg_files(kwin_magiclamp_config_SRCS magiclampconfig.kcfgc)
diff --git a/plugins/effects/magnifier/CMakeLists.txt b/plugins/effects/magnifier/CMakeLists.txt
index 9f931f8a7..5899b6312 100644
--- a/plugins/effects/magnifier/CMakeLists.txt
+++ b/plugins/effects/magnifier/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(magnifier PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_magnifier_config_SRCS magnifier_config.cpp)
     ki18n_wrap_ui(kwin_magnifier_config_SRCS magnifier_config.ui)
     kconfig_add_kcfg_files(kwin_magnifier_config_SRCS magnifierconfig.kcfgc)
diff --git a/plugins/effects/mouseclick/CMakeLists.txt b/plugins/effects/mouseclick/CMakeLists.txt
index 2886b0562..ac9fbe3bd 100644
--- a/plugins/effects/mouseclick/CMakeLists.txt
+++ b/plugins/effects/mouseclick/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(mouseclick PRIVATE
 ##########################
 ## configurtion dialog
 ##########################
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_mouseclick_config_SRCS mouseclick_config.cpp)
     ki18n_wrap_ui(kwin_mouseclick_config_SRCS mouseclick_config.ui)
     kconfig_add_kcfg_files(kwin_mouseclick_config_SRCS mouseclickconfig.kcfgc)
diff --git a/plugins/effects/mousemark/CMakeLists.txt b/plugins/effects/mousemark/CMakeLists.txt
index d78c22637..81bb4ca3f 100644
--- a/plugins/effects/mousemark/CMakeLists.txt
+++ b/plugins/effects/mousemark/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(mousemark PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_mousemark_config_SRCS mousemark_config.cpp)
     ki18n_wrap_ui(kwin_mousemark_config_SRCS mousemark_config.ui)
     kconfig_add_kcfg_files(kwin_mousemark_config_SRCS mousemarkconfig.kcfgc)
diff --git a/plugins/effects/overview/CMakeLists.txt b/plugins/effects/overview/CMakeLists.txt
index cc2b226be..0ca88039c 100644
--- a/plugins/effects/overview/CMakeLists.txt
+++ b/plugins/effects/overview/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     add_subdirectory(kcm)
 endif()
 
diff --git a/plugins/effects/overview/kcm/CMakeLists.txt b/plugins/effects/overview/kcm/CMakeLists.txt
index 29e7b1db9..bf0d1001a 100644
--- a/plugins/effects/overview/kcm/CMakeLists.txt
+++ b/plugins/effects/overview/kcm/CMakeLists.txt
@@ -10,5 +10,8 @@ kwin_add_effect_config(kwin_overview_config ${kwin_overview_config_SOURCES})
 target_link_libraries(kwin_overview_config
   KF6::CoreAddons
   KF6::GlobalAccel
+  KF6::I18n
+  KF6::KCMUtils
   KF6::XmlGui
+  effects-interface
 )
diff --git a/plugins/effects/overview/overviewconfig.kcfgc b/plugins/effects/overview/overviewconfig.kcfgc
index fd1666b14..190c216e2 100644
--- a/plugins/effects/overview/overviewconfig.kcfgc
+++ b/plugins/effects/overview/overviewconfig.kcfgc
@@ -7,4 +7,4 @@ ClassName=OverviewConfig
 NameSpace=como
 Singleton=true
 Mutators=true
-IncludeFiles=como/render/effect/interface/types.h
+IncludeFiles=\"como/render/effect/interface/types.h\"
diff --git a/plugins/effects/showpaint/CMakeLists.txt b/plugins/effects/showpaint/CMakeLists.txt
index ab437e2bf..cad1fc9fc 100644
--- a/plugins/effects/showpaint/CMakeLists.txt
+++ b/plugins/effects/showpaint/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(showpaint PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_showpaint_config_SRCS showpaint_config.cpp)
     ki18n_wrap_ui(kwin_showpaint_config_SRCS showpaint_config.ui)
 
diff --git a/plugins/effects/slide/CMakeLists.txt b/plugins/effects/slide/CMakeLists.txt
index 8c1788173..5fb73a3d6 100644
--- a/plugins/effects/slide/CMakeLists.txt
+++ b/plugins/effects/slide/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(slide PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_slide_config_SRCS slide_config.cpp)
     ki18n_wrap_ui(kwin_slide_config_SRCS slide_config.ui)
     kconfig_add_kcfg_files(kwin_slide_config_SRCS slideconfig.kcfgc)
diff --git a/plugins/effects/thumbnailaside/CMakeLists.txt b/plugins/effects/thumbnailaside/CMakeLists.txt
index 3988cd19a..361f3e5d1 100644
--- a/plugins/effects/thumbnailaside/CMakeLists.txt
+++ b/plugins/effects/thumbnailaside/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(thumbnailaside PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_thumbnailaside_config_SRCS thumbnailaside_config.cpp)
     ki18n_wrap_ui(kwin_thumbnailaside_config_SRCS thumbnailaside_config.ui)
     kconfig_add_kcfg_files(kwin_thumbnailaside_config_SRCS thumbnailasideconfig.kcfgc)
diff --git a/plugins/effects/trackmouse/CMakeLists.txt b/plugins/effects/trackmouse/CMakeLists.txt
index ee0f8d1cd..82c02a435 100644
--- a/plugins/effects/trackmouse/CMakeLists.txt
+++ b/plugins/effects/trackmouse/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(trackmouse PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_trackmouse_config_SRCS trackmouse_config.cpp)
     ki18n_wrap_ui(kwin_trackmouse_config_SRCS trackmouse_config.ui)
     kconfig_add_kcfg_files(kwin_trackmouse_config_SRCS trackmouseconfig.kcfgc)
diff --git a/plugins/effects/windowview/CMakeLists.txt b/plugins/effects/windowview/CMakeLists.txt
index e13a1b86a..183a837d4 100644
--- a/plugins/effects/windowview/CMakeLists.txt
+++ b/plugins/effects/windowview/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     add_subdirectory(kcm)
 endif()
 
diff --git a/plugins/effects/wobblywindows/CMakeLists.txt b/plugins/effects/wobblywindows/CMakeLists.txt
index a660b4e39..ce9e12f63 100644
--- a/plugins/effects/wobblywindows/CMakeLists.txt
+++ b/plugins/effects/wobblywindows/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(wobblywindows PRIVATE
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_wobblywindows_config_SRCS wobblywindows_config.cpp)
     ki18n_wrap_ui(kwin_wobblywindows_config_SRCS wobblywindows_config.ui)
     kconfig_add_kcfg_files(kwin_wobblywindows_config_SRCS wobblywindowsconfig.kcfgc)
diff --git a/plugins/effects/zoom/CMakeLists.txt b/plugins/effects/zoom/CMakeLists.txt
index 102e70991..6dc3e14de 100644
--- a/plugins/effects/zoom/CMakeLists.txt
+++ b/plugins/effects/zoom/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 
 #######################################
 # Config
-if (KWIN_BUILD_KCMS)
+if (COMO_BUILD_KCMS)
     set(kwin_zoom_config_SRCS zoom_config.cpp)
     ki18n_wrap_ui(kwin_zoom_config_SRCS zoom_config.ui)
     kconfig_add_kcfg_files(kwin_zoom_config_SRCS zoomconfig.kcfgc)

Places

File add-effect-config.patch of Package como (Revision d3d687a1ef342ba0c3691add9f2566af)

Places