[neon/kde/kio/Neon/stable] debian: Revert "revert -DKF6_COMPAT_BUILD=ON in Neon/release for now"

[Jonathan Esk-Riddell]

Git commit 173c8648854a3a6004d67a1d69395e05a614ae05 by Jonathan Esk-Riddell.
Committed on 22/01/2024 at 17:22.
Pushed by jriddell into branch 'Neon/stable'.

Revert "revert -DKF6_COMPAT_BUILD=ON in Neon/release for now"

This reverts commit 2d98a9a42253d6f2b4f2365d3198426b0858a76d.

M  +0    -23   debian/copyright
M  +1    -8    debian/kio.install
M  +1    -0    debian/kio.lintian-overrides
M  +1    -1    debian/patches/series
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/kio/-/commit/173c8648854a3a6004d67a1d69395e05a614ae05

diff --git a/debian/copyright b/debian/copyright
index 8af89c4..ac7408e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -93,8 +93,6 @@ Files: autotests/deletejobtest.cpp
        src/core/commands_p.h
        src/core/dataprotocol.cpp
        src/core/dataprotocol_p.h
-       src/core/dataslave.cpp
-       src/core/dataslave_p.h
        src/core/filejob.cpp
        src/core/filejob.h
        src/core/global.cpp
@@ -152,20 +150,11 @@ Files: autotests/deletejobtest.cpp
        src/filewidgets/kfileplacesitem_p.h
        src/filewidgets/kfileplacesmodel.cpp
        src/filewidgets/kfileplacesmodel.h
-       src/filewidgets/kfileplacessharedbookmarks.cpp
-       src/filewidgets/kfileplacessharedbookmarks_p.h
        src/filewidgets/kfileplacesview.cpp
        src/filewidgets/kfileplacesview.h
        src/filewidgets/kfileplacesview_p.h
        src/filewidgets/kstatusbarofflineindicator.cpp
        src/filewidgets/kstatusbarofflineindicator.h
-       src/ioslaves/help/kio_help.cpp
-       src/ioslaves/http/httpfilter.cpp
-       src/ioslaves/http/httpfilter.h
-       src/ioslaves/http/kcookiejar/kcookiejar.h
-       src/ioslaves/http/kcookiejar/kcookieserver.h
-       src/ioslaves/mailto/kmailservice.cpp
-       src/kioslave/kioslave.cpp
        src/kntlm/kntlm.cpp
        src/kntlm/kntlm.h
        src/kpac/dhcp.h
@@ -191,8 +180,6 @@ Files: autotests/deletejobtest.cpp
        src/widgets/skipdialog.cpp
        src/widgets/skipdialog.h
        tests/kdirmodeltest_gui.cpp
-       tests/kioslavetest.cpp
-       tests/kioslavetest.h
        tests/kmountpoint_debug.cpp
        tests/kruntest.cpp
        tests/kruntest.h
@@ -237,16 +224,6 @@ License: LGPL-2
 
 Files: autotests/kurlnavigatortest.cpp
        autotests/kurlnavigatortest.h
-       src/ioslaves/http/kcookiejar/kcookiewin.h
-       src/ioslaves/telnet/ktelnetservice.cpp
-       src/ioslaves/trash/kcmtrash.cpp
-       src/ioslaves/trash/kcmtrash.h
-       src/kcms/kio/kcookiesmanagement.cpp
-       src/kcms/kio/kcookiesmanagement.h
-       src/kcms/kio/kcookiespolicies.cpp
-       src/kcms/kio/kcookiespolicies.h
-       src/kcms/kio/kcookiespolicyselectiondlg.cpp
-       src/kcms/kio/kcookiespolicyselectiondlg.h
        src/kcms/kio/main.cpp
        src/kcms/kio/useragentinfo.cpp
        src/kcms/kio/useragentinfo.h
diff --git a/debian/kio.install b/debian/kio.install
index dbbc2cf..e431187 100644
--- a/debian/kio.install
+++ b/debian/kio.install
@@ -4,30 +4,23 @@ usr/bin/ktelnetservice5
 usr/bin/ktrash5
 usr/bin/protocoltojson
 usr/lib/*/libexec/kf5/kio_http_cache_cleaner
-usr/lib/*/libexec/kf5/kiod5
-usr/lib/*/libexec/kf5/kioexec
 usr/lib/*/libexec/kf5/kioslave5
 usr/lib/*/libexec/kf5/kpac_dhcp_helper
 usr/lib/*/qt5/plugins/kcm_proxy.so
+usr/lib/*/qt5/plugins/kcm_trash.so
 usr/lib/*/qt5/plugins/kcm_webshortcuts.so
 usr/lib/*/qt5/plugins/kf5/kded/kcookiejar.so
 usr/lib/*/qt5/plugins/kf5/kded/proxyscout.so
 usr/lib/*/qt5/plugins/kf5/kded/remotenotifier.so
 usr/lib/*/qt5/plugins/kf5/kio/
-usr/lib/*/qt5/plugins/kf5/kiod/
 usr/lib/*/qt5/plugins/kf5/urifilters/
 usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_smb.so
 usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_cookies.so
 usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_netpref.so
 usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_proxy.so
 usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_webshortcuts.so
-usr/share/applications/kcm_trash.desktop
 usr/share/applications/ktelnetservice5.desktop
 usr/share/dbus-1/services/org.kde.kcookiejar5.service
-usr/share/dbus-1/services/org.kde.kiod5.service
-usr/share/dbus-1/services/org.kde.kioexecd.service
-usr/share/dbus-1/services/org.kde.kpasswdserver.service
-usr/share/dbus-1/services/org.kde.kssld5.service
 #usr/share/kconf_update/filepicker.upd
 #usr/share/kdevappwizard/templates/kioworker.tar.bz2
 usr/share/kf5/kcookiejar/domain_info
diff --git a/debian/kio.lintian-overrides b/debian/kio.lintian-overrides
index 2b08ed4..c139963 100644
--- a/debian/kio.lintian-overrides
+++ b/debian/kio.lintian-overrides
@@ -1,2 +1,3 @@
 kio: binary-without-manpage usr/bin/ktelnetservice5
 kio: binary-without-manpage usr/bin/ktrash5
+kio: unknown-locale-code tok
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index f1cbdb2..10724d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +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
+runtime_build_switch
diff --git a/debian/rules b/debian/rules
index 7185c98..8832c1b 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 -DBUILD_RUNTIME_COMPONENTS=OFF -DKF6_COMPAT_BUILD=ON
+	dh_auto_configure -- -DBUILD_QCH=ON -DKF6_COMPAT_BUILD=ON
 
 override_dh_shlibdeps:
 	dh_shlibdeps $(patsubst %,-p%,$(filter lib%,$(shell dh_listpackages))) -- -xkio