[neon/kde/kio/Neon/stable] debian/patches: remove obsolete -runtime_build_switch patch
Jonathan Esk-Riddell
null at kde.org
Tue Jan 23 10:15:17 GMT 2024
Git commit c9c9ab508082213eab4bedce8257356bc9d52f29 by Jonathan Esk-Riddell.
Committed on 23/01/2024 at 11:14.
Pushed by jriddell into branch 'Neon/stable'.
remove obsolete -runtime_build_switch patch
D +0 -49 debian/patches/runtime_build_switch
M +1 -2 debian/patches/series
https://invent.kde.org/neon/kde/kio/-/commit/c9c9ab508082213eab4bedce8257356bc9d52f29
diff --git a/debian/patches/runtime_build_switch b/debian/patches/runtime_build_switch
deleted file mode 100644
index b6bd7bc..0000000
--- a/debian/patches/runtime_build_switch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eed49daa9bca1bc9678b64e97d89acfeb4bd48ea..986652dc2b89a91122a2c356ca3dff31f32577b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,6 +38,7 @@ ecm_setup_version(
- set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
-
- option(KIOCORE_ONLY "Only compile KIOCore, not KIOWidgets or anything that depends on it. This will disable support for cookies and passwordhandling (prompting and storing)." OFF)
-+option(BUILD_RUNTIME_COMPONENTS "Build runtime components like kiod, kpasswdserver, or kioexec. Disable this if you are building two major versions for co-installability in the older variant." ON)
-
- # Enable state assertion by default on Jenkins and from-git builds.
- # This option should eventually be dropped and always be enabled.
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6e402ce743667a86285f7720389e7b42899b1083..25a249670a5d7321a7bd39b0e38519163943a472 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -6,9 +6,13 @@ add_subdirectory(kntlm)
- if (NOT ANDROID)
- add_subdirectory(ioslaves)
- add_subdirectory(kioworkers)
-- add_subdirectory(kiod)
-- add_subdirectory(kssld)
- add_subdirectory(schemehandlers)
-+
-+ if (NOT BUILD_RUNTIME_COMPONENTS)
-+ add_subdirectory(kiod)
-+ add_subdirectory(kssld)
-+ endif()
-+
- endif()
- add_subdirectory(kioslave)
-
-@@ -16,11 +20,14 @@ if (NOT KIOCORE_ONLY)
- add_subdirectory(gui)
- add_subdirectory(widgets)
- if (NOT ANDROID)
-- add_subdirectory(kpasswdserver)
- add_subdirectory(filewidgets)
-- add_subdirectory(kioexec)
- add_subdirectory(urifilters)
- add_subdirectory(kcms)
-+
-+ if (NOT BUILD_RUNTIME_COMPONENTS)
-+ add_subdirectory(kioexec)
-+ add_subdirectory(kpasswdserver)
-+ endif()
- endif()
-
- if(NOT WIN32 AND NOT ANDROID)
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 10724d5..00130ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ report_error_removing_dirs
wait_for_a_bit_longer
Disable-flaky-test.patch
Disable-baloo-dependant-tests.patch
-#Disable-flaky-test-1.patch
-runtime_build_switch
+
More information about the Neon-commits
mailing list