[neon/kde/kio/Neon/unstable] debian: patch to disable runtime components

[Carlos De Maine]

Git commit 43bd304018c1c9c48f02c074abbf227a3bc17e41 by Carlos De Maine.
Committed on 30/08/2023 at 08:19.
Pushed by carlosdem into branch 'Neon/unstable'.

patch to disable runtime components

A  +49   -0    debian/patches/runtime_build_switch
M  +1    -0    debian/patches/series
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/kio/-/commit/43bd304018c1c9c48f02c074abbf227a3bc17e41

diff --git a/debian/patches/runtime_build_switch b/debian/patches/runtime_build_switch
new file mode 100644
index 0000000..b6bd7bc
--- /dev/null
+++ b/debian/patches/runtime_build_switch
@@ -0,0 +1,49 @@
+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 0e4fb57..f1cbdb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ wait_for_a_bit_longer
 Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
+runtime_build_switch
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 3d087df..516b0eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_QCH=ON
+	dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_RUNTIME_COMPONENTS=OFF
 
 override_dh_shlibdeps:
 	dh_shlibdeps $(patsubst %,-p%,$(filter lib%,$(shell dh_listpackages))) -- -xkio