From 7f53c2a43fdaf01c33d9e889c2c08d69ece35da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 27 Dec 2021 13:43:36 +0100 Subject: [PATCH] lumina upgrade 1.6.1 -> 1.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-lumina/lumina-desktop/lumina.bb | 16 ++-------- ...ass-Remove-chown-it-stoopped-working.patch | 31 ------------------- 2 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 recipes-lumina/lumina-desktop/lumina/0001-lumina-checkpass-Remove-chown-it-stoopped-working.patch diff --git a/recipes-lumina/lumina-desktop/lumina.bb b/recipes-lumina/lumina-desktop/lumina.bb index fca0550b..da07298a 100644 --- a/recipes-lumina/lumina-desktop/lumina.bb +++ b/recipes-lumina/lumina-desktop/lumina.bb @@ -17,13 +17,10 @@ DEPENDS += " \ qtsvg \ " -SRC_URI = " \ - git://github.com/lumina-desktop/lumina.git;branch=master;protocol=https \ - file://0001-lumina-checkpass-Remove-chown-it-stoopped-working.patch \ -" -SRCREV = "6744cddd5de1f18c3713a68c85d740ae6d4a27de" +SRC_URI = "git://github.com/lumina-desktop/lumina.git;branch=master;protocol=https" +SRCREV = "92360ecb0f9ddb7109456abf3ea1fb9fe750d92a" S = "${WORKDIR}/git" -PV = "1.6.1" +PV = "1.6.2" do_configure:prepend() { # change paths by sed instead of endles escapes in 'DEFINES+=..' below @@ -32,13 +29,6 @@ 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 \ 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 deleted file mode 100644 index 40df94c3..00000000 --- a/recipes-lumina/lumina-desktop/lumina/0001-lumina-checkpass-Remove-chown-it-stoopped-working.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 -