From 8d7664167939f4138354188ab4aa0ef9156cb84c Mon Sep 17 00:00:00 2001
From: David Korth <gerbilsoft@gerbilsoft.com>
Date: Sat, 17 Feb 2024 21:53:21 -0500
Subject: [PATCH] [kde] Move the KIO service menu for KF5/KF6 from kf5/ to
 kde/.

This service menu is used for both KF5 and KF6.

[debian] New package rom-properties-kio-servicemenus, which is
now selected by rom-properties-kf5. rom-properties-kf5 no longer
installs the service menu file.

TODO: Verify that the Conflicts: and Replaces: rules work correctly.
---
 debian/control                                 | 14 +++++++++++++-
 debian/rom-properties-kio-servicemenus.docs    |  5 +++++
 debian/rom-properties-kio-servicemenus.install |  1 +
 src/kde/CMakeLists.txt                         |  9 +++++++++
 src/kde/kf5/CMakeLists.txt                     |  6 ------
 src/kde/kf6/CMakeLists.txt                     |  7 -------
 6 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 debian/rom-properties-kio-servicemenus.docs
 create mode 100644 debian/rom-properties-kio-servicemenus.install

diff --git a/debian/control b/debian/control
index 29297e027b..0ddd06f150 100644
--- a/debian/control
+++ b/debian/control
@@ -71,9 +71,21 @@ Description: ROM Properties Page shell extension
  .
  This package contains the KDE 4 version.
 
+Package: rom-properties-kio-servicemenus
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata4, rom-properties-utils
+Conflicts: rom-properties-kf5 (< 2.3)
+Replaces: rom-properties-kf5 (< 2.3)
+Description: ROM Properties Page shell extension
+ This shell extension provides thumbnailing and property page functionality
+ for ROM images, disc images, and save files for various game consoles,
+ including Nintendo GameCube and Wii.
+ .
+ This package contains the KIO service menus for KF5 and KF6.
+
 Package: rom-properties-kf5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata4, rom-properties-utils, rom-properties-xdg
+Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata4, rom-properties-utils, rom-properties-xdg, rom-properties-kio-servicemenus
 Recommends: rom-properties-lang
 Conflicts: rom-properties-kde5
 Replaces: rom-properties-kde5
diff --git a/debian/rom-properties-kio-servicemenus.docs b/debian/rom-properties-kio-servicemenus.docs
new file mode 100644
index 0000000000..b580fff62b
--- /dev/null
+++ b/debian/rom-properties-kio-servicemenus.docs
@@ -0,0 +1,5 @@
+README.md
+NETWORK.md
+NEWS.md
+doc/keys.conf.example
+doc/rom-properties.conf.example
diff --git a/debian/rom-properties-kio-servicemenus.install b/debian/rom-properties-kio-servicemenus.install
new file mode 100644
index 0000000000..d6be328ca9
--- /dev/null
+++ b/debian/rom-properties-kio-servicemenus.install
@@ -0,0 +1 @@
+usr/share/kio/servicemenus/rp-convert-to-png.desktop
diff --git a/src/kde/CMakeLists.txt b/src/kde/CMakeLists.txt
index 71bf1bb1ff..8f731637db 100644
--- a/src/kde/CMakeLists.txt
+++ b/src/kde/CMakeLists.txt
@@ -198,6 +198,15 @@ IF(BUILD_KF6)
 	ADD_SUBDIRECTORY(kf6)
 ENDIF(BUILD_KF6)
 
+IF(BUILD_KF5 OR BUILD_KF6)
+	# Service menus
+	# KF5 and KF6 use the same servicemenus directory.
+	INSTALL(FILES servicemenus/rp-convert-to-png.desktop
+		DESTINATION "${CMAKE_INSTALL_PREFIX}/share/kio/servicemenus"
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+		COMPONENT "plugin")
+ENDIF(BUILD_KF5 OR BUILD_KF6)
+
 IF(BUILD_TESTING)
 	ADD_SUBDIRECTORY(tests)
 ENDIF(BUILD_TESTING)
diff --git a/src/kde/kf5/CMakeLists.txt b/src/kde/kf5/CMakeLists.txt
index 777617bad0..619bf0e214 100644
--- a/src/kde/kf5/CMakeLists.txt
+++ b/src/kde/kf5/CMakeLists.txt
@@ -288,12 +288,6 @@ IF(BUILD_KF5)
 	ENDIF(NOT HAVE_JSON_PLUGIN_LOADER)
 	# FIXME: Run kbuildsycoca5?
 
-	# Service menus
-	INSTALL(FILES ../servicemenus/rp-convert-to-png.desktop
-		DESTINATION "${CMAKE_INSTALL_PREFIX}/share/kio/servicemenus"
-		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-		COMPONENT "plugin")
-
 	# Check if a split debug file should be installed.
 	IF(INSTALL_DEBUG)
 		# FIXME: Generator expression $<TARGET_PROPERTY:${_target},PDB> didn't work with CPack-3.6.1.
diff --git a/src/kde/kf6/CMakeLists.txt b/src/kde/kf6/CMakeLists.txt
index ecbd4b783b..1961c22be7 100644
--- a/src/kde/kf6/CMakeLists.txt
+++ b/src/kde/kf6/CMakeLists.txt
@@ -252,13 +252,6 @@ IF(BUILD_KF6)
 		COMPONENT "plugin")
 	# FIXME: Run kbuildsycoca6?
 
-	# Service menus
-	# FIXME: Conflicts with KF6. Figure out how to fix this later.
-	#INSTALL(FILES ../servicemenus/rp-convert-to-png.desktop
-	#	DESTINATION "${CMAKE_INSTALL_PREFIX}/share/kio/servicemenus"
-	#	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-	#	COMPONENT "plugin")
-
 	# Check if a split debug file should be installed.
 	IF(INSTALL_DEBUG)
 		# FIXME: Generator expression $<TARGET_PROPERTY:${_target},PDB> didn't work with CPack-3.6.1.