diff --git a/recipes-lumina/lumina-desktop/lumina.bb b/recipes-lumina/lumina-desktop/lumina.bb index 8df22d63..ccd91345 100644 --- a/recipes-lumina/lumina-desktop/lumina.bb +++ b/recipes-lumina/lumina-desktop/lumina.bb @@ -17,10 +17,13 @@ DEPENDS += " \ qtsvg \ " -SRC_URI = "git://github.com/lumina-desktop/lumina.git" -SRCREV = "ee85f9b4254ee98a06d169d14fb3cbb37c74f098" +SRC_URI = " \ + git://github.com/lumina-desktop/lumina.git \ + file://0001-lumina-checkpass-Remove-chown-it-stoopped-working.patch \ +" +SRCREV = "6744cddd5de1f18c3713a68c85d740ae6d4a27de" S = "${WORKDIR}/git" -PV = "1.6.0" +PV = "1.6.1" do_configure:prepend() { # change paths by sed instead of endles escapes in 'DEFINES+=..' below @@ -29,6 +32,13 @@ do_configure:prepend() { sed -i 's:$${MAN_ZIP}:gzip -c:' `find ${S} -name *.pro` } +do_install:append() { + # with 1.6.1 we see for unknown reasons: + # chmod: cannot access '/usr/sbin/lumina-checkpass': No such file or directory + # did not find better: patch out chmod and do here + chmod 4555 ${D}${prefix}/sbin/lumina-checkpass +} + # Override magic in src-qt5/OS-detect.pri to our paths EXTRA_QMAKEVARS_PRE += ' \ OS=Linux \ @@ -53,8 +63,11 @@ FILES:${PN} += " \ ${datadir}/lumina-desktop/menu-scripts \ ${datadir}/lumina-desktop/syntax_rules \ ${datadir}/lumina-desktop/themes \ + ${datadir}/lumina-desktop/screensavers \ ${datadir}/lumina-desktop/fluxbox* \ ${datadir}/lumina-desktop/globs2 \ + ${datadir}/lumina-desktop/*.cfg \ + ${datadir}/lumina-desktop/*.png \ ${datadir}/lumina-desktop/*.ogg \ ${datadir}/lumina-desktop/*.conf \ ${datadir}/lumina-desktop/*.jpg \ diff --git a/recipes-lumina/lumina-desktop/lumina/0001-lumina-checkpass-Remove-chown-it-stoopped-working.patch b/recipes-lumina/lumina-desktop/lumina/0001-lumina-checkpass-Remove-chown-it-stoopped-working.patch new file mode 100644 index 00000000..40df94c3 --- /dev/null +++ b/recipes-lumina/lumina-desktop/lumina/0001-lumina-checkpass-Remove-chown-it-stoopped-working.patch @@ -0,0 +1,31 @@ +From 6cc40ae540d02e7cd3bc450aa523bb2c24c4e309 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 9 Oct 2021 20:51:51 +0200 +Subject: [PATCH] lumina-checkpass: Remove chown - it stoopped working +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate[Hack] + +Signed-off-by: Andreas Müller +--- + src-qt5/core/lumina-checkpass/lumina-checkpass.pro | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src-qt5/core/lumina-checkpass/lumina-checkpass.pro b/src-qt5/core/lumina-checkpass/lumina-checkpass.pro +index 981dcafa..7c4f9427 100644 +--- a/src-qt5/core/lumina-checkpass/lumina-checkpass.pro ++++ b/src-qt5/core/lumina-checkpass/lumina-checkpass.pro +@@ -12,7 +12,4 @@ LIBS += -lpam + + SOURCES += main.c + +-perms.path = $$DESTDIR$${PREFIX}/sbin +-perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass" +- +-INSTALLS += target perms ++INSTALLS += target +-- +2.31.1 +