pcmanfm-qt: add layer-shell-qt6 support

[pin <voidpin%protonmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Jun 6 22:36:06 2024 +0200
Changeset:	1ddeb09b8ec78c70a2ce48635ed11c199205d8f3

Modified Files:
	pcmanfm-qt/Makefile
Removed Files:
	pcmanfm-qt/patches/patch-CMakeLists.txt
	pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt
	pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp

Log Message:
pcmanfm-qt: add layer-shell-qt6 support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1ddeb09b8ec78c70a2ce48635ed11c199205d8f3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pcmanfm-qt/Makefile                                |  1 +
 pcmanfm-qt/patches/patch-CMakeLists.txt            | 22 ------------
 pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt    | 14 --------
 pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp | 40 ----------------------
 4 files changed, 1 insertion(+), 76 deletions(-)

diffs:
diff --git a/pcmanfm-qt/Makefile b/pcmanfm-qt/Makefile
index 60cb3fa497..2b9f0014f4 100644
--- a/pcmanfm-qt/Makefile
+++ b/pcmanfm-qt/Makefile
@@ -35,6 +35,7 @@ TOOL_DEPENDS+=	qt6-qttools-[0-9]*:../../devel/qt6-qttools
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../wip/liblxqt/buildlink3.mk"
 .include "../../wip/libfm-qt/buildlink3.mk"
+.include "../../wip/layer-shell-qt6/buildlink3.mk"
 .include "../../x11/xcb-util-cursor/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
diff --git a/pcmanfm-qt/patches/patch-CMakeLists.txt b/pcmanfm-qt/patches/patch-CMakeLists.txt
deleted file mode 100644
index 6b45f682a7..0000000000
--- a/pcmanfm-qt/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Switch-off the use layer-shell-qt for Desktop under Wayland.
-
---- CMakeLists.txt.orig	2024-05-28 11:15:20.461623912 +0000
-+++ CMakeLists.txt
-@@ -17,7 +17,6 @@ set(PCMANFM_QT_VERSION ${PCMANFM_QT_VERS
- set(LIBFMQT_MINIMUM_VERSION "2.0.0")
- set(LXQTBT_MINIMUM_VERSION "2.0.0")
- set(QT_MINIMUM_VERSION "6.6.0")
--set(SHELLQT_MINIMUM_VERSION "6.0.0")
- 
- list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
- 
-@@ -26,7 +25,6 @@ find_package(Qt6LinguistTools ${QT_MINIM
- find_package(Qt6Widgets ${QT_MINIMUM_VERSION} REQUIRED)
- find_package(fm-qt6 ${LIBFMQT_MINIMUM_VERSION} REQUIRED)
- find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
--find_package(LayerShellQt ${SHELLQT_MINIMUM_VERSION} REQUIRED)
- 
- message(STATUS "Building ${PROJECT_NAME} with Qt ${Qt6Core_VERSION}")
- 
diff --git a/pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt b/pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt
deleted file mode 100644
index 76268810f8..0000000000
--- a/pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Switch-off the use layer-shell-qt for Desktop under Wayland.
-
---- pcmanfm/CMakeLists.txt.orig	2024-05-28 11:16:30.283818984 +0000
-+++ pcmanfm/CMakeLists.txt
-@@ -90,7 +90,6 @@ target_include_directories(pcmanfm-qt
- target_link_libraries(pcmanfm-qt
-     Qt6::Widgets
-     Qt6::DBus
--    LayerShellQtInterface
-     fm-qt6
- )
- 
diff --git a/pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp b/pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp
deleted file mode 100644
index d8e3573b75..0000000000
--- a/pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-Switch-off the use layer-shell-qt for Desktop under Wayland.
-
---- pcmanfm/desktopwindow.cpp.orig	2024-05-28 11:17:06.695422960 +0000
-+++ pcmanfm/desktopwindow.cpp
-@@ -43,9 +43,6 @@
- #include <QRandomGenerator>
- #include <QToolTip>
- 
--#include <LayerShellQt/shell.h>
--#include <LayerShellQt/window.h>
--
- #include "./application.h"
- #include "mainwindow.h"
- #include <libfm-qt6/foldermenu.h>
-@@ -190,23 +187,6 @@ DesktopWindow::DesktopWindow(int screenN
-     shortcut = new QShortcut(QKeySequence(Qt::SHIFT | Qt::Key_Delete), this); // force delete
-     connect(shortcut, &QShortcut::activated, this, &DesktopWindow::onDeleteActivated);
- 
--    // set the layer and anchors under Wayland
--    if(static_cast<Application*>(qApp)->underWayland()) {
--        winId();
--        if(QWindow* win = windowHandle()) {
--            if(LayerShellQt::Window* layershell = LayerShellQt::Window::get(win)) {
--                layershell->setLayer(LayerShellQt::Window::Layer::LayerBackground);
--                LayerShellQt::Window::Anchors anchors = {LayerShellQt::Window::AnchorTop
--                                                         | LayerShellQt::Window::AnchorBottom
--                                                         | LayerShellQt::Window::AnchorLeft
--                                                         | LayerShellQt::Window::AnchorRight};
--                layershell->setAnchors(anchors);
--                layershell->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityOnDemand);
--                layershell->setExclusiveZone(-1); // not moved to accommodate for other surfaces
--                layershell->setScope(QStringLiteral("desktop")); // just for distinguishing it
--            }
--        }
--    }
- }
- 
- DesktopWindow::~DesktopWindow() {