x11-wm/lumina: bump to 1.6.1

Closes: https://bugs.gentoo.org/823792
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin@gentoo.org>

4 files changed, 137 insertions, 0 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 03c66fda5166..1f5a99c7b878 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1 +1,2 @@
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
+DIST lumina-1.6.1.tar.gz 20614263 BLAKE2B c0ad6a48d06ec9b2c0856a673319cb6a022416465e5f15fce47aac62d7e1817dc8b01acc7c55eaf3664217f2f27ef1b4d7a603a355cd9e22b707b481b322783a SHA512 ff4a77812e8d91478cbfd123ddc545e5a4aaabf3d9f96e6dedc769eb9490e4ac372c4243dca9444cdf986886c08e2eaa587470c9bc8a5a00bbe10ff80ad64c96
diff --git a/x11-wm/lumina/files/1.6.1-chmod.patch b/x11-wm/lumina/files/1.6.1-chmod.patch
new file mode 100644
index 000000000000..ca6460eb2dda
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-chmod.patch
@@ -0,0 +1,13 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro
+--- lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-12-05 12:55:00.656682056 +0700
+@@ -12,7 +12,7 @@
+ 
+ SOURCES += main.c
+ 
+-perms.path = $$DESTDIR$${PREFIX}/sbin
+-perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
++#perms.path = $$DESTDIR$${PREFIX}/sbin
++#perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
+ 
+ INSTALLS += target perms
diff --git a/x11-wm/lumina/files/1.6.1-desktop-files.patch b/x11-wm/lumina/files/1.6.1-desktop-files.patch
new file mode 100644
index 000000000000..33a7165b5901
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-desktop-files.patch
@@ -0,0 +1,33 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop	2021-12-05 11:42:18.142573885 +0700
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ Name[pt]=Informações do ambiente de trabalho
+ GenericName=Version and Legal Information
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop	2021-12-05 11:41:50.668573204 +0700
+@@ -3,7 +3,7 @@
+ URL=https://t.me/luminadesktop
+ Icon=Lumina-DE
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ Name[pt]=Suporte da comunidade
+ GenericName=Get Desktop Help
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop
+--- lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-12-05 11:42:58.002574873 +0700
+@@ -9,4 +9,4 @@
+ Name[pt]=Configurar ambiente de trabalho
+ Comment=Modify the desktop
+ Comment[pt]=Modificar ambiente de trabalho
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
diff --git a/x11-wm/lumina/lumina-1.6.1.ebuild b/x11-wm/lumina/lumina-1.6.1.ebuild
new file mode 100644
index 000000000000..3992057d88a8
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	desktop-utils? ( app-text/poppler[qt5] )"
+
+RDEPEND="${DEPEND}
+	app-admin/sysstat
+	media-sound/alsa-utils
+	sys-fs/inotify-tools
+	sys-power/acpi
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+	"${FILESDIR}/1.6.1-desktop-files.patch"
+	"${FILESDIR}/1.6.1-chmod.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	if ! use desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+
+	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+	chmod 4555 "${D}"/usr/sbin/lumina-checkpass
+	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
+	mv "${D}"/usr/share/icons/hicolor/scalable/apps/*.png "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot mv png icons"
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/lumina-session" lumina ||die
+
+	remove_locale() {
+		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
+	}
+	plocale_for_each_disabled_locale remove_locale
+}