x11-misc/pcmanfm-qt : version && EAPI bump

5 files changed, 75 insertions, 67 deletions

diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 9cb1b27f..280320d8 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1 +1 @@
-DIST pcmanfm-qt-0.13.0.tar.xz 104864 BLAKE2B 47e24ccb415bea27db9cb5f0ccd1ce6aebedc2f7140572939e533c3da9aca6aca29227a5be7954944ed82483b4420501adf22152628e3d44a206d4f9d5250412 SHA512 7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089
+DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
diff --git a/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.13.0-use_view_action_icons_from_theme.patch b/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.13.0-use_view_action_icons_from_theme.patch
deleted file mode 100644
index c9dccf4f..00000000
--- a/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.13.0-use_view_action_icons_from_theme.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur a/pcmanfm/mainwindow.cpp b/pcmanfm/mainwindow.cpp
---- a/pcmanfm/mainwindow.cpp	2018-05-21 20:14:54.000000000 +0100
-+++ b/pcmanfm/mainwindow.cpp	2019-02-02 12:12:29.726816339 +0000
-@@ -164,10 +164,10 @@
-     loadBookmarksMenu();
- 
-     // set generic icons for view actions
--    ui.actionIconView->setIcon(style()->standardIcon(QStyle::SP_FileDialogContentsView));
--    ui.actionThumbnailView->setIcon(style()->standardIcon(QStyle::SP_FileDialogInfoView));
--    ui.actionCompactView->setIcon(style()->standardIcon(QStyle::SP_FileDialogListView));
--    ui.actionDetailedList->setIcon(style()->standardIcon(QStyle::SP_FileDialogDetailedView));
-+    ui.actionIconView->setIcon(QIcon::fromTheme(QLatin1String("view-list-icons"), style()->standardIcon(QStyle::SP_FileDialogContentsView)));
-+    ui.actionThumbnailView->setIcon(QIcon::fromTheme(QLatin1String("view-list-thumbnails"), style()->standardIcon(QStyle::SP_FileDialogInfoView)));
-+    ui.actionCompactView->setIcon(QIcon::fromTheme(QLatin1String("view-list-text"), style()->standardIcon(QStyle::SP_FileDialogListView)));
-+    ui.actionDetailedList->setIcon(QIcon::fromTheme(QLatin1String("view-list-details"), style()->standardIcon(QStyle::SP_FileDialogDetailedView)));
- 
-     // Fix the menu groups which is not done by Qt designer
-     // To my suprise, this was supported in Qt designer 3 :-(
diff --git a/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.14.1-use_view_action_icons_from_theme.patch b/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.14.1-use_view_action_icons_from_theme.patch
new file mode 100644
index 00000000..81a7a08b
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/files/pcmanfm-qt-0.14.1-use_view_action_icons_from_theme.patch
@@ -0,0 +1,12 @@
+diff -Nur a/pcmanfm/mainwindow.cpp b/pcmanfm/mainwindow.cpp
+--- a/pcmanfm/mainwindow.cpp	2019-02-24 00:16:13.000000000 +0000
++++ b/pcmanfm/mainwindow.cpp	2019-06-01 12:31:10.004634642 +0100
+@@ -201,7 +201,7 @@
+ 
+     // use generic icons for view actions only if theme icons don't exist
+     ui.actionIconView->setIcon(QIcon::fromTheme(QLatin1String("view-list-icons"), style()->standardIcon(QStyle::SP_FileDialogContentsView)));
+-    ui.actionThumbnailView->setIcon(QIcon::fromTheme(QLatin1String("dialog-information"), style()->standardIcon(QStyle::SP_FileDialogInfoView)));
++    ui.actionThumbnailView->setIcon(QIcon::fromTheme(QLatin1String("view-list-thumbnails"), style()->standardIcon(QStyle::SP_FileDialogInfoView)));
+     ui.actionCompactView->setIcon(QIcon::fromTheme(QLatin1String("view-list-text"), style()->standardIcon(QStyle::SP_FileDialogListView)));
+     ui.actionDetailedList->setIcon(QIcon::fromTheme(QLatin1String("view-list-details"), style()->standardIcon(QStyle::SP_FileDialogDetailedView)));
+ 
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r3.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r3.ebuild
deleted file mode 100644
index 50414c9e..00000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="samba"
-
-PATCHES=( "${FILESDIR}/${P}-use_view_action_icons_from_theme.patch" )
-
-CDEPEND=">=dev-libs/glib-2.50.0:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/libfm-1.3.0:=
-	>=x11-libs/libfm-qt-0.13.1:=
-	x11-libs/libxcb:="
-RDEPEND="${CDEPEND}
-	samba? ( net-fs/samba
-		x11-misc/pcmanfm-qt-share
-	)
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=NO
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1.ebuild
new file mode 100644
index 00000000..df0694d8
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
+HOMEPAGE="https://lxqt.org/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="samba"
+
+PATCHES=( "${FILESDIR}/${P}-use_view_action_icons_from_theme.patch" )
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=lxqt-base/lxqt-build-tools-0.6.0
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	=x11-libs/libfm-qt-$(ver_cut 1-2)*
+	x11-libs/libxcb:=
+	x11-misc/xdg-utils
+	virtual/eject
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}
+	samba? ( net-fs/samba
+		x11-misc/pcmanfm-qt-share
+	)
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if ! has_version lxqt-base/lxqt-meta && ! has_version gnome-base/gvfs; then
+		elog
+		elog "To make use of the 'trash' functionality, please install"
+		elog "the 'gnome-base/gvfs' package."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}