From 56cbcd0be0adbc747f668138d952a8f81e092cdf Mon Sep 17 00:00:00 2001 From: isaackwy Date: Tue, 2 Jan 2024 03:07:34 -0800 Subject: desktop/lxqt-panel: Do not install files that conflict with lxqt-menu-data Signed-off-by: Willy Sudiarto Raharjo --- .../lxqt-panel/lxqt-do_not_require_lxmenu_data.patch | 20 ++++++++++++++++++++ desktop/lxqt-panel/lxqt-panel.SlackBuild | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 desktop/lxqt-panel/lxqt-do_not_require_lxmenu_data.patch diff --git a/desktop/lxqt-panel/lxqt-do_not_require_lxmenu_data.patch b/desktop/lxqt-panel/lxqt-do_not_require_lxmenu_data.patch new file mode 100644 index 0000000000000..114c0ecdbc989 --- /dev/null +++ b/desktop/lxqt-panel/lxqt-do_not_require_lxmenu_data.patch @@ -0,0 +1,20 @@ +--- a/menu/CMakeLists.txt ++++ b/menu/CMakeLists.txt +@@ -8,17 +8,3 @@ + ) + add_custom_target(desktop_directories_files ALL DEPENDS ${DIRECTORY_FILES}) + #************************************************ +- +-install(FILES +- ${DIRECTORY_FILES} +- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/desktop-directories" +- COMPONENT Runtime +-) +- +-install(FILES +- lxqt-applications.menu +- lxqt-applications-compact.menu +- lxqt-applications-simple.menu +- DESTINATION "${LXQT_ETC_XDG_DIR}/menus" +- COMPONENT Runtime +-) diff --git a/desktop/lxqt-panel/lxqt-panel.SlackBuild b/desktop/lxqt-panel/lxqt-panel.SlackBuild index 4ea95a82387a6..c4253665b2c80 100644 --- a/desktop/lxqt-panel/lxqt-panel.SlackBuild +++ b/desktop/lxqt-panel/lxqt-panel.SlackBuild @@ -82,6 +82,9 @@ find -L . \ # Build with libsysstat as optional dependency (enable System Stats plugin) [ ${LIBSYSSTAT:-no} = yes ] && ENABLE_SYSSTAT=YES || ENABLE_SYSSTAT=NO +# lxqt-panel should not install files already included within lxqt-menu-data +patch -p1 < $CWD/lxqt-do_not_require_lxmenu_data.patch + mkdir build cd build cmake \ -- cgit v1.2.3