From dda2aea773fbf0414f944668d5b472483104c704 Mon Sep 17 00:00:00 2001 From: Karl R Grose Date: Fri, 26 Nov 2021 10:15:38 -0800 Subject: [PATCH] lumina: update to 1.6.1. --- srcpkgs/lumina/patches/checkpass.patch | 19 +++++++++++++++++++ srcpkgs/lumina/patches/mandir.patch | 11 ----------- srcpkgs/lumina/template | 8 ++++---- 3 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/lumina/patches/checkpass.patch delete mode 100644 srcpkgs/lumina/patches/mandir.patch diff --git a/srcpkgs/lumina/patches/checkpass.patch b/srcpkgs/lumina/patches/checkpass.patch new file mode 100644 index 000000000000..7534550b0019 --- /dev/null +++ b/srcpkgs/lumina/patches/checkpass.patch @@ -0,0 +1,19 @@ +--- a/src-qt5/core/lumina-checkpass/lumina-checkpass.pro ++++ b/src-qt5/core/lumina-checkpass/lumina-checkpass.pro +@@ -6,13 +6,13 @@ QT = + CONFIG += console + + TARGET = lumina-checkpass +-target.path = $$DESTDIR$${PREFIX}/sbin ++target.path = $$DESTDIR$${PREFIX}/bin + + LIBS += -lpam + + SOURCES += main.c + +-perms.path = $$DESTDIR$${PREFIX}/sbin +-perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass" ++perms.path = $$DESTDIR$${PREFIX}/bin ++perms.extra = "chmod 4555 $(INSTALL_ROOT)$$DESTDIR$${PREFIX}/bin/lumina-checkpass" + + INSTALLS += target perms diff --git a/srcpkgs/lumina/patches/mandir.patch b/srcpkgs/lumina/patches/mandir.patch deleted file mode 100644 index 9b9ce50a1e5d..000000000000 --- a/srcpkgs/lumina/patches/mandir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src-qt5/OS-detect.pri 2017-07-05 20:02:49.727200592 +0200 -+++ b/src-qt5/OS-detect.pri 2017-07-05 20:03:10.463911159 +0200 -@@ -94,7 +94,7 @@ - isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share } - isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include } - isEmpty(L_SESSDIR){ L_SESSDIR = $${L_SHAREDIR}/xsessions } -- isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/man } -+ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } - isEmpty(LRELEASE){ LRELEASE = $$[QT_INSTALL_BINS]/lrelease } - isEmpty(MAN_ZIP){ MAN_ZIP = "gzip -c" } - !exists(LRELEASE){ NO_I18N=true } #translations unavailable diff --git a/srcpkgs/lumina/template b/srcpkgs/lumina/template index ed7ef97adfba..5299c6ae9c54 100644 --- a/srcpkgs/lumina/template +++ b/srcpkgs/lumina/template @@ -1,11 +1,11 @@ # Template file for 'lumina' pkgname=lumina -version=1.6.0 -revision=2 +version=1.6.1 +revision=1 build_style=qmake configure_args="QT5LIBDIR=/usr/lib/qt5 L_ETCDIR=/etc CONFIG+=WITH_I18N" hostmakedepends="qt5-host-tools qt5-qmake" -makedepends="qt5-devel qt5-x11extras-devel qt5-multimedia-devel qt5-svg-devel +makedepends="qt5-devel qt5-x11extras-devel qt5-multimedia-devel qt5-svg-devel pam-devel qt5-declarative-devel libXrender-devel libXcomposite-devel libXcursor-devel libXdamage-devel xcb-util-devel xcb-util-wm-devel xcb-util-image-devel pulseaudio-devel poppler-qt5-devel" depends="fluxbox numlockx xbacklight alsa-utils acpi xscreensaver bsdtar qt5-svg qsudo" @@ -14,7 +14,7 @@ maintainer="hipperson0 " license="BSD-3-Clause" homepage="https://github.com/lumina-desktop/lumina" distfiles="https://github.com/lumina-desktop/lumina/archive/v${version}.tar.gz" -checksum=f3512fca4d05e3cf3a6ac106f0f16c9618bda9fa546f1d23ffb0eab9a5ce7c8a +checksum=2bc649c95da8f997bf943cc1e64af4a61921ddc5d63dd3c46fc0ba8708e29a92 replaces="lumina-git>=0" post_install() {