From 395099e0a39bc705fbf64b691bdf54010ff8ce4a Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 23 Jul 2023 18:24:01 +0900
Subject: [PATCH] Add detection of libxmu-dev

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 ConfigureChecks.cmake |  8 ++++
 debian/control        |  2 +-
 debian/kommandorc     | 98 -------------------------------------------
 src/CMakeLists.txt    |  6 +--
 4 files changed, 12 insertions(+), 102 deletions(-)
 delete mode 100644 debian/kommandorc

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 0b84648..6f8c441 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -24,3 +24,11 @@ tde_setup_largefiles( )
 if( WITH_GCC_VISIBILITY )
   tde_setup_gcc_visibility( )
 endif( WITH_GCC_VISIBILITY )
+
+
+##### check required packages
+
+pkg_search_module( XMU xmu )
+if( NOT XMU_FOUND )
+  tde_message_fatal( "xmu is required, but was not found on your system" )
+endif( )
diff --git a/debian/control b/debian/control
index db8d453..b564151 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxmu-dev
 Standards-Version: 3.8.4
 
 Package: kommando-trinity
diff --git a/debian/kommandorc b/debian/kommandorc
deleted file mode 100644
index cdc13ba..0000000
--- a/debian/kommandorc
+++ /dev/null
@@ -1,98 +0,0 @@
-<root>
- <access method="shortcut" >Menu</access>
- <menubuttonsize>16</menubuttonsize>
- <navbuttonsize>22</navbuttonsize>
- <tintcolor>#000000</tintcolor>
- <opacity>0.17</opacity>
- <menuradius>72</menuradius>
- <scheme>Tiny</scheme>
- <menu appname="default" >
-  <button>
-   <command>konsole --workdir $HOME</command>
-   <icon>konsole</icon>
-  </button>
-  <button>
-   <command>gimp</command>
-   <icon>gimp</icon>
-  </button>
-  <button>
-   <command>kwrite</command>
-   <icon>kwrite</icon>
-  </button>
-  <button>
-   <command>konqueror</command>
-   <icon>konqueror</icon>
-  </button>
-  <button>
-   <command>kcalc</command>
-   <icon>kcalc</icon>
-  </button>
-  <button>
-   <command>kfmclient openProfile filemanagement</command>
-   <icon>kfm_home</icon>
-  </button>
-  <menu>
-   <icon>kmix</icon>
-   <button>
-    <command>kmix</command>
-    <icon>kmix</icon>
-   </button>
-   <button>
-    <command>k3b</command>
-    <icon>k3b</icon>
-   </button>
-   <button>
-    <command>amarok</command>
-    <icon>amarok</icon>
-   </button>
-   <button>
-    <command>kaffeine</command>
-    <icon>kaffeine</icon>
-   </button>
-  </menu>
- </menu>
- <menu appname="Kdevelop" >
-  <button>
-   <command>designer</command>
-   <icon>kdevdesigner</icon>
-  </button>
-  <button>
-   <command>umbrello</command>
-   <icon>umbrello</icon>
-  </button>
-  <button>
-   <command>cervisia</command>
-   <icon>cervisia</icon>
-  </button>
-  <button>
-   <command>kompare -o</command>
-   <icon>kompare</icon>
-  </button>
-  <button>
-   <command>kate</command>
-   <icon>kate</icon>
-  </button>
- </menu>
- <menu appname="Amarokapp" >
-  <button>
-   <command>dcop amarok player prev</command>
-   <icon>player_rew</icon>
-  </button>
-  <button>
-   <command>dcop amarok player play</command>
-   <icon>player_play</icon>
-  </button>
-  <button>
-   <command>dcop amarok player next</command>
-   <icon>player_fwd</icon>
-  </button>
-  <button>
-   <command>dcop amarok player pause</command>
-   <icon>player_pause</icon>
-  </button>
-  <button>
-   <command>dcop amarok player stop</command>
-   <icon>player_stop</icon>
-  </button>
- </menu>
-</root>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0facc66..2ca923d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,6 +5,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${TQT_INCLUDE_DIRS}
   ${TDE_INCLUDE_DIR}
+  ${XMU_INCLUDEDIR}
 )
 
 link_directories(
@@ -33,7 +34,7 @@ tde_add_library( kommando SHARED AUTOMOC
 ##### kommandod (kded module)
 tde_add_kpart( kded_kommandod AUTOMOC
   SOURCES kommandod.cpp kommandod.skel kommando.cpp
-  LINK tdeinit_kded-shared Xmu kommando-shared
+  LINK tdeinit_kded-shared ${XMU_LIBRARIES} kommando-shared DCOP-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -42,8 +43,7 @@ tde_add_kpart( kded_kommandod AUTOMOC
 tde_add_kpart( kcm_kommando MODULE AUTOMOC
   SOURCES configdialogimpl.cpp configdialog.ui kcmkommando.cpp servicemenu.cpp
   LINK
-    tdeinit_kded-shared tdecore-shared tdeui-shared Xmu kommando-shared
-    tdeio-shared
+    kommando-shared ${XMU_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )