[neon/kde/libkscreen/Neon/unstable] debian/patches: patches begone

[Harald Sitter]

Git commit be6ebe90023761c96acc15ff2b2b6aaf7d7233cc by Harald Sitter.
Committed on 13/03/2023 at 12:17.
Pushed by sitter into branch 'Neon/unstable'.

patches begone

D  +0    -107  debian/patches/Make-kwayland-optional.patch
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/libkscreen/commit/be6ebe90023761c96acc15ff2b2b6aaf7d7233cc

diff --git a/debian/patches/Make-kwayland-optional.patch b/debian/patches/Make-kwayland-optional.patch
deleted file mode 100644
index af1245a..0000000
--- a/debian/patches/Make-kwayland-optional.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Tue, 20 Feb 2018 15:01:53 +0100
-Subject: Make kwayland optional
-
-This allows the build of libkscreen and its dependencies in non linux arches.
----
- CMakeLists.txt           |  2 +-
- autotests/CMakeLists.txt | 36 ++++++++++++++++++++----------------
- backends/CMakeLists.txt  |  4 +++-
- tests/CMakeLists.txt     |  4 +++-
- 4 files changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75515ef..ef7318f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@ include(GenerateExportHeader)
- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras)
- 
- # Wayland backend
--find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED)
-+find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
- add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's KWayland backend")
- 
- # xrandr backend
-diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
-index c0c5fe0..9888dbc 100644
---- a/autotests/CMakeLists.txt
-+++ b/autotests/CMakeLists.txt
-@@ -1,6 +1,9 @@
- add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/configs/")
- 
--include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/tests/kwayland/)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-+if(${KF5Wayland_FOUND})
-+    include_directories(${CMAKE_SOURCE_DIR}/tests/kwayland/)
-+endif()
- 
- macro(KSCREEN_ADD_TEST)
-     foreach(_testname ${ARGN})
-@@ -25,24 +28,25 @@ kscreen_add_test(testlog)
- kscreen_add_test(testmodelistchange)
- kscreen_add_test(testedid)
- 
--set(KSCREEN_WAYLAND_LIBS
--    KF5::WaylandServer KF5::WaylandClient
--)
--
--# For WaylandConfigReader and TestServer
--set(KSCREEN_WAYLAND_SRCS
--    ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandconfigreader.cpp
--    ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandtestserver.cpp
--)
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../backends/kwayland)
-+if(${KF5Wayland_FOUND})
-+    set(KSCREEN_WAYLAND_LIBS
-+        KF5::WaylandServer KF5::WaylandClient
-+    )
- 
--kscreen_add_test(testkwaylandbackend)
--kscreen_add_test(testkwaylandconfig)
--kscreen_add_test(testkwaylanddpms)
-+    # For WaylandConfigReader and TestServer
-+    set(KSCREEN_WAYLAND_SRCS
-+        ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandconfigreader.cpp
-+        ${CMAKE_SOURCE_DIR}/tests/kwayland/waylandtestserver.cpp
-+    )
-+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../backends/kwayland)
- 
--set(KSCREEN_WAYLAND_LIBS "")
--set(KSCREEN_WAYLAND_SRCS "")
-+    kscreen_add_test(testkwaylandbackend)
-+    kscreen_add_test(testkwaylandconfig)
-+    kscreen_add_test(testkwaylanddpms)
- 
-+    set(KSCREEN_WAYLAND_LIBS "")
-+    set(KSCREEN_WAYLAND_SRCS "")
-+endif()
- 
- if (ENABLE_XRANDR_TESTS)
-     kscreen_add_test(textxrandr)
-diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
-index 3563e13..5f44182 100644
---- a/backends/CMakeLists.txt
-+++ b/backends/CMakeLists.txt
-@@ -1,6 +1,8 @@
- add_subdirectory(fake)
- add_subdirectory(qscreen)
--add_subdirectory(kwayland)
-+if(${KF5Wayland_FOUND})
-+	add_subdirectory(kwayland)
-+endif()
- 
- if(${XCB_RANDR_FOUND})
-     message(STATUS "Will build xrandr backend.")
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 1489d21..e82f7f7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,4 +1,6 @@
- add_executable(printconfig testplugandplay.cpp testpnp.cpp)
- target_link_libraries(printconfig Qt5::Gui KF5::Screen)
- 
--add_subdirectory(kwayland)
-+if(${KF5Wayland_FOUND})
-+    add_subdirectory(kwayland)
-+endif()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7183ee1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Make-kwayland-optional.patch