File _service:obs_scm:0001-fix-build-error-of-ukui-k... of Package ukui-kwin

File _service:obs_scm:0001-fix-build-error-of-ukui-kwin-5.27.5.patch of Package ukui-kwin

From bf4b5741edfe46b6081e7824da4b9e99ea22a5bc Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 23 May 2024 17:47:52 +0800
Subject: [PATCH] fix build error of ukui-kwin-5.27.5

---
 autotests/CMakeLists.txt                       | 14 +++++++-------
 autotests/drm/CMakeLists.txt                   |  2 +-
 autotests/integration/CMakeLists.txt           |  4 ++--
 autotests/integration/dbus_interface_test.cpp  |  4 ++--
 autotests/integration/keyboard_layout_test.cpp |  4 ++--
 autotests/libkwineffects/CMakeLists.txt        |  2 +-
 src/libkwineffects/kcoreaddons_export.h        | 10 ++++++++--
 7 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 3e2f091..91002e5 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -11,7 +11,7 @@ add_subdirectory(drm)
 ########################################################
 set(testWindowPaintData_SRCS test_window_paint_data.cpp)
 add_executable(testWindowPaintData ${testWindowPaintData_SRCS})
-target_link_libraries(testWindowPaintData kwineffects Qt::Widgets Qt::Test )
+target_link_libraries(testWindowPaintData ukui-kwineffects Qt::Widgets Qt::Test )
 add_test(NAME kwin-testWindowPaintData COMMAND testWindowPaintData)
 ecm_mark_as_test(testWindowPaintData)
 
@@ -25,7 +25,7 @@ set(testVirtualDesktops_SRCS
 add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
 
 target_link_libraries(testVirtualDesktops
-    kwin
+    ukui-kwin
 
     Qt::Test
     Qt::Widgets
@@ -183,7 +183,7 @@ add_executable(testX11TimestampUpdate test_x11_timestamp_update.cpp)
 target_link_libraries(testX11TimestampUpdate
     KF5::CoreAddons
     Qt::Test
-    kwin
+    ukui-kwin
 )
 add_test(NAME kwin-testX11TimestampUpdate COMMAND testX11TimestampUpdate)
 ecm_mark_as_test(testX11TimestampUpdate)
@@ -209,7 +209,7 @@ set(testXkb_SRCS
 qt_add_dbus_interface(testXkb_SRCS ${CMAKE_SOURCE_DIR}/src/org.freedesktop.DBus.Properties.xml dbusproperties_interface)
 add_executable(testXkb ${testXkb_SRCS})
 target_link_libraries(testXkb
-    kwin
+    ukui-kwin
 
     Qt::Gui
     Qt::Test
@@ -218,7 +218,7 @@ target_link_libraries(testXkb
     KF5::ConfigCore
     KF5::WindowSystem
 
-    kwineffects
+    ukui-kwineffects
 
     XKB::XKB
 )
@@ -236,7 +236,7 @@ ecm_mark_as_test(testXkb)
 add_executable(testFtrace test_ftrace.cpp)
 target_link_libraries(testFtrace
     Qt::Test
-    kwin
+    ukui-kwin
 )
 add_test(NAME kwin-testFtrace COMMAND testFtrace)
 ecm_mark_as_test(testFtrace)
@@ -247,7 +247,7 @@ ecm_mark_as_test(testFtrace)
 add_executable(testUtils test_utils.cpp)
 target_link_libraries(testUtils
     Qt::Test
-    kwin
+    ukui-kwin
 )
 add_test(NAME kwin-testUtils COMMAND testUtils)
 ecm_mark_as_test(testUtils)
diff --git a/autotests/drm/CMakeLists.txt b/autotests/drm/CMakeLists.txt
index 8a3aefe..5bbb9da 100644
--- a/autotests/drm/CMakeLists.txt
+++ b/autotests/drm/CMakeLists.txt
@@ -43,7 +43,7 @@ target_link_libraries(LibDrmTest
     XCB::XCB
     PkgConfig::Libxcvt
     gbm::gbm
-    kwin
+    ukui-kwin
 )
 target_include_directories(LibDrmTest
     PUBLIC
diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt
index 96d0baa..1c20d0c 100644
--- a/autotests/integration/CMakeLists.txt
+++ b/autotests/integration/CMakeLists.txt
@@ -69,7 +69,7 @@ target_link_libraries(KWinIntegrationTestFramework
         Qt::Test
         KF5::WaylandClient
         Wayland::Client
-        kwin
+        ukui-kwin
 
     PRIVATE
         # Own libraries
@@ -149,7 +149,7 @@ integrationTest(WAYLAND_ONLY NAME testOutputChanges SRCS outputchanges_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testTiles SRCS tiles_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testFractionalScaling SRCS fractional_scaling_test.cpp)
 
-qt_add_dbus_interfaces(DBUS_SRCS ${CMAKE_BINARY_DIR}/src/org.kde.kwin.VirtualKeyboard.xml)
+qt_add_dbus_interfaces(DBUS_SRCS ${CMAKE_BINARY_DIR}/src/org.ukui.kwin.VirtualKeyboard.xml)
 integrationTest(WAYLAND_ONLY NAME testVirtualKeyboardDBus SRCS test_virtualkeyboard_dbus.cpp ${DBUS_SRCS})
 integrationTest(WAYLAND_ONLY NAME testNightColor SRCS nightcolor_test.cpp LIBS KWinNightColorPlugin)
 
diff --git a/autotests/integration/dbus_interface_test.cpp b/autotests/integration/dbus_interface_test.cpp
index 77b1ae6..68488ab 100644
--- a/autotests/integration/dbus_interface_test.cpp
+++ b/autotests/integration/dbus_interface_test.cpp
@@ -35,9 +35,9 @@ using namespace KWin;
 
 static const QString s_socketName = QStringLiteral("wayland_test_kwin_dbus_interface-0");
 
-const QString s_destination{QStringLiteral("org.kde.KWin")};
+const QString s_destination{QStringLiteral("org.ukui.KWin")};
 const QString s_path{QStringLiteral("/KWin")};
-const QString s_interface{QStringLiteral("org.kde.KWin")};
+const QString s_interface{QStringLiteral("org.ukui.KWin")};
 
 class TestDbusInterface : public QObject
 {
diff --git a/autotests/integration/keyboard_layout_test.cpp b/autotests/integration/keyboard_layout_test.cpp
index d24c844..0b32fdb 100644
--- a/autotests/integration/keyboard_layout_test.cpp
+++ b/autotests/integration/keyboard_layout_test.cpp
@@ -120,9 +120,9 @@ auto KeyboardLayoutTest::changeLayout(uint index)
 
 void KeyboardLayoutTest::callSession(const QString &method)
 {
-    QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KWin"),
+    QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.ukui.KWin"),
                                                       QStringLiteral("/Session"),
-                                                      QStringLiteral("org.kde.KWin.Session"),
+                                                      QStringLiteral("org.ukui.KWin.Session"),
                                                       method);
     msg << QLatin1String(); // session name
     QVERIFY(QDBusConnection::sessionBus().call(msg).type() != QDBusMessage::ErrorMessage);
diff --git a/autotests/libkwineffects/CMakeLists.txt b/autotests/libkwineffects/CMakeLists.txt
index 090d18f..a803af9 100644
--- a/autotests/libkwineffects/CMakeLists.txt
+++ b/autotests/libkwineffects/CMakeLists.txt
@@ -4,7 +4,7 @@ macro(KWINEFFECTS_UNIT_TESTS)
    foreach(_testname ${ARGN})
       add_executable(${_testname} ${_testname}.cpp)
       add_test(NAME kwineffects-${_testname} COMMAND ${_testname})
-      target_link_libraries(${_testname} Qt::Test kwineffects)
+      target_link_libraries(${_testname} Qt::Test ukui-kwineffects)
       ecm_mark_as_test(${_testname})
    endforeach()
 endmacro()
diff --git a/src/libkwineffects/kcoreaddons_export.h b/src/libkwineffects/kcoreaddons_export.h
index b7e910a..a54cd77 100644
--- a/src/libkwineffects/kcoreaddons_export.h
+++ b/src/libkwineffects/kcoreaddons_export.h
@@ -84,7 +84,7 @@
 #define KCOREADDONS_BUILD_DEPRECATED_SINCE(major, minor) 1
 
 #ifdef KCOREADDONS_NO_DEPRECATED
-#  define KCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT 0x56b00
+#  define KCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT 0x57300
 #endif
 #ifdef KCOREADDONS_NO_DEPRECATED_WARNINGS
 #  define KCOREADDONS_DEPRECATED_WARNINGS_SINCE 0
@@ -94,7 +94,7 @@
 #  ifdef KCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT
 #    define KCOREADDONS_DEPRECATED_WARNINGS_SINCE KCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT
 #  else
-#    define KCOREADDONS_DEPRECATED_WARNINGS_SINCE 0x56b00
+#    define KCOREADDONS_DEPRECATED_WARNINGS_SINCE 0x57300
 #  endif
 #endif
 
@@ -233,6 +233,12 @@
 #else
 #  define KCOREADDONS_DEPRECATED_VERSION_5_104(text)
 #endif
+
+#if KCOREADDONS_DEPRECATED_WARNINGS_SINCE >= 0x57000
+#  define KCOREADDONS_DEPRECATED_VERSION_5_112(text) KCOREADDONS_DECL_DEPRECATED_TEXT(text)
+#else
+#  define KCOREADDONS_DEPRECATED_VERSION_5_112(text)
+#endif
 #define KCOREADDONS_DEPRECATED_VERSION_4(minor, text)      KCOREADDONS_DEPRECATED_VERSION_4_##minor(text)
 #define KCOREADDONS_DEPRECATED_VERSION_5(minor, text)      KCOREADDONS_DEPRECATED_VERSION_5_##minor(text)
 #define KCOREADDONS_DEPRECATED_VERSION(major, minor, text) KCOREADDONS_DEPRECATED_VERSION_##major(minor, "Since "#major"."#minor". " text)
-- 
2.43.0