pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add pcmanfm-qt: part of LXQt-2.0.x



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Tue May 28 13:32:36 2024 +0200
Changeset:	e1bcc05fd1ea02c3664a069a1d96f99998285c18

Modified Files:
	Makefile
Added Files:
	pcmanfm-qt/DESCR
	pcmanfm-qt/Makefile
	pcmanfm-qt/PLIST
	pcmanfm-qt/distinfo
	pcmanfm-qt/patches/patch-CMakeLists.txt
	pcmanfm-qt/patches/patch-autostart_CMakeLists.txt
	pcmanfm-qt/patches/patch-config_CMakeLists.txt
	pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt
	pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp

Log Message:
Add pcmanfm-qt: part of LXQt-2.0.x

Revert commit,
https://github.com/lxqt/pcmanfm-qt/commit/fcf22c3767c07cdbaa5a996f05b0d2b8d1dfd303
This needs layer-shell-qt from Plasma6 and it's only needed under Wayland.

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

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

diffstat:
 Makefile                                           |  1 +
 pcmanfm-qt/DESCR                                   |  3 ++
 pcmanfm-qt/Makefile                                | 41 ++++++++++++++++
 pcmanfm-qt/PLIST                                   | 56 ++++++++++++++++++++++
 pcmanfm-qt/distinfo                                | 10 ++++
 pcmanfm-qt/patches/patch-CMakeLists.txt            | 22 +++++++++
 pcmanfm-qt/patches/patch-autostart_CMakeLists.txt  | 14 ++++++
 pcmanfm-qt/patches/patch-config_CMakeLists.txt     | 14 ++++++
 pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt    | 14 ++++++
 pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp | 40 ++++++++++++++++
 10 files changed, 215 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index b3bbc2c93c..bb1a431b42 100644
--- a/Makefile
+++ b/Makefile
@@ -2933,6 +2933,7 @@ SUBDIR+=	payara41
 SUBDIR+=	pbbuttonsd
 SUBDIR+=	pbzx
 SUBDIR+=	pcem
+SUBDIR+=	pcmanfm-qt
 SUBDIR+=	pcp
 SUBDIR+=	pdb2ldif
 SUBDIR+=	pdcurses
diff --git a/pcmanfm-qt/DESCR b/pcmanfm-qt/DESCR
new file mode 100644
index 0000000000..aedb9d8acb
--- /dev/null
+++ b/pcmanfm-qt/DESCR
@@ -0,0 +1,3 @@
+PCManFM-Qt is the Qt port of PCManFM, the file manager of LXDE.
+In LXQt sessions it is in addition used to handle the desktop.
+Nevertheless it can be used independently of LXQt as well.
diff --git a/pcmanfm-qt/Makefile b/pcmanfm-qt/Makefile
new file mode 100644
index 0000000000..60cb3fa497
--- /dev/null
+++ b/pcmanfm-qt/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.37 2024/04/06 08:06:44 wiz Exp $
+
+DISTNAME=	pcmanfm-qt-2.0.0
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_GITHUB:=lxqt/}
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/lxqt/pcmanfm-qt/
+COMMENT=	LXQt pcmanfm Qt frontend
+LICENSE=	gnu-lgpl-v2.1
+
+USE_CMAKE=	yes
+USE_TOOLS+=	pkg-config perl
+USE_LANGUAGES=	c c++
+
+LDFLAGS.SunOS+=	-lsocket
+
+AUTOSTART_CONF=		share/examples/autostart
+SETTINGS_CONF=		share/examples/pcmanfm-qt/lxqt
+PKG_SYSCONFSUBDIR=	xdg
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/autostart \
+			${PKG_SYSCONFDIR}/pcmanfm-qt/lxqt
+
+CONF_FILES+=		${AUTOSTART_CONF}/lxqt-desktop.desktop \
+			${PKG_SYSCONFDIR}/autostart/lxqt-desktop.desktop
+CONF_FILES+=		${SETTINGS_CONF}/settings.conf \
+			${PKG_SYSCONFDIR}/pcmanfm-qt/lxqt/settings.conf
+
+DEPENDS+=	lxqt-menu-data-[0-9]*:../../wip/lxqt-menu-data
+TOOL_DEPENDS+=	lxqt-build-tools>=2.0.0:../../wip/lxqt2-build-tools
+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 "../../x11/xcb-util-cursor/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pcmanfm-qt/PLIST b/pcmanfm-qt/PLIST
new file mode 100644
index 0000000000..a5da0f1419
--- /dev/null
+++ b/pcmanfm-qt/PLIST
@@ -0,0 +1,56 @@
+@comment $NetBSD: PLIST,v 1.10 2024/02/13 17:26:41 gutteridge Exp $
+bin/pcmanfm-qt
+man/man1/pcmanfm-qt.1
+share/applications/pcmanfm-qt-desktop-pref.desktop
+share/applications/pcmanfm-qt.desktop
+share/examples/autostart/lxqt-desktop.desktop
+share/examples/pcmanfm-qt/lxqt/settings.conf
+share/icons/hicolor/scalable/apps/pcmanfm-qt.svg
+share/pcmanfm-qt/translations/pcmanfm-qt_ar.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_arn.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_ast.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_bg.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_ca.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_cs.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_cy.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_da.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_de.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_el.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_en_GB.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_es.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_et.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_eu.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_fi.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_fil.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_fr.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_ga.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_gl.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_he.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_hi.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_hr.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_hu.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_id.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_it.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_ja.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_kk.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_ko.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_lg.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_lt.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_lv.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_nb_NO.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_nl.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_oc.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_pl.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_pt.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_pt_BR.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_ro.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_ru.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_si.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_sk_SK.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_sl.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_sv.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_tr.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_uk.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_vi.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_zh_CN.qm
+share/pcmanfm-qt/translations/pcmanfm-qt_zh_TW.qm
diff --git a/pcmanfm-qt/distinfo b/pcmanfm-qt/distinfo
new file mode 100644
index 0000000000..0c5b4b1e1f
--- /dev/null
+++ b/pcmanfm-qt/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.15 2024/02/13 17:26:41 gutteridge Exp $
+
+BLAKE2s (pcmanfm-qt-2.0.0.tar.xz) = 1f852252b4b43b71d95a8302ef83386b65ae21582b900b218640740f5ad4d1d9
+SHA512 (pcmanfm-qt-2.0.0.tar.xz) = b4f46245d8e14874546bd95d47fdab41988a6caef3fef45509e3fd12f11d79ab71a0d44a60ca755b097caf7471bc3cd1160078f020270fd6a7cbf58283a4bda3
+Size (pcmanfm-qt-2.0.0.tar.xz) = 395756 bytes
+SHA1 (patch-CMakeLists.txt) = a4b14884c521b66d6e80bd12574c442382af8b52
+SHA1 (patch-autostart_CMakeLists.txt) = cde2e8a24d2b0518476512f6762f84769b1dc6c0
+SHA1 (patch-config_CMakeLists.txt) = c3a99b1fc660131d94df4e9daf500dee8e65a7df
+SHA1 (patch-pcmanfm_CMakeLists.txt) = c122458d305f98e1e3f96210e9d0aba12d82009e
+SHA1 (patch-pcmanfm_desktopwindow.cpp) = 8542d9dd10b9e5ed95a42e3b24e4d6b457437bc7
diff --git a/pcmanfm-qt/patches/patch-CMakeLists.txt b/pcmanfm-qt/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..6b45f682a7
--- /dev/null
+++ b/pcmanfm-qt/patches/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+$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-autostart_CMakeLists.txt b/pcmanfm-qt/patches/patch-autostart_CMakeLists.txt
new file mode 100644
index 0000000000..5c3d459913
--- /dev/null
+++ b/pcmanfm-qt/patches/patch-autostart_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Install config file to proper location.
+
+--- autostart/CMakeLists.txt.orig	2024-05-28 09:45:30.421623919 +0000
++++ autostart/CMakeLists.txt
+@@ -11,6 +11,6 @@ add_custom_target(autostart_desktop_file
+ 
+ install(FILES
+     ${DESKTOP_FILES}
+-    DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
++    DESTINATION "share/examples/autostart"
+     COMPONENT Runtime
+ )
diff --git a/pcmanfm-qt/patches/patch-config_CMakeLists.txt b/pcmanfm-qt/patches/patch-config_CMakeLists.txt
new file mode 100644
index 0000000000..ca93fd07ef
--- /dev/null
+++ b/pcmanfm-qt/patches/patch-config_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: patch-config_CMakeLists.txt,v 1.2 2020/12/07 11:43:30 pin Exp $
+
+Install settings file to proper location
+
+--- config/CMakeLists.txt.orig	2020-11-02 22:27:00.000000000 +0000
++++ config/CMakeLists.txt
+@@ -3,6 +3,6 @@
+ configure_file(pcmanfm-qt/lxqt/settings.conf.in pcmanfm-qt/lxqt/settings.conf @ONLY)
+ install(FILES
+     "${CMAKE_CURRENT_BINARY_DIR}/pcmanfm-qt/lxqt/settings.conf"
+-    DESTINATION "${CMAKE_INSTALL_DATADIR}/pcmanfm-qt/lxqt"
++    DESTINATION "share/examples/pcmanfm-qt/lxqt"
+     COMPONENT Runtime
+ )
diff --git a/pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt b/pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt
new file mode 100644
index 0000000000..76268810f8
--- /dev/null
+++ b/pcmanfm-qt/patches/patch-pcmanfm_CMakeLists.txt
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 0000000000..d8e3573b75
--- /dev/null
+++ b/pcmanfm-qt/patches/patch-pcmanfm_desktopwindow.cpp
@@ -0,0 +1,40 @@
+$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() {


Home | Main Index | Thread Index | Old Index