aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-02-11 12:14:43 +0100
committerBart Ribbers <bribbers@disroot.org>2021-02-11 12:14:45 +0100
commit377e193fd3cd4b6067395134e572335c06b0fb1d (patch)
treeca8915b968143c94e485377b4e0914c7833d02e7
parentbeea6954c8528cfc323563882d18cd0299f1db42 (diff)
downloadaports-377e193fd3cd4b6067395134e572335c06b0fb1d.tar.gz
aports-377e193fd3cd4b6067395134e572335c06b0fb1d.tar.bz2
aports-377e193fd3cd4b6067395134e572335c06b0fb1d.tar.xz
testing/nemo-qml-plugin-devicelock: update patch from upstream
It has been merged upstream, so let's make sure we use the latest changes
-rw-r--r--testing/nemo-qml-plugin-devicelock/0001-Add-option-to-disable-installation-of-systemd-servic.patch38
-rw-r--r--testing/nemo-qml-plugin-devicelock/APKBUILD6
2 files changed, 16 insertions, 28 deletions
diff --git a/testing/nemo-qml-plugin-devicelock/0001-Add-option-to-disable-installation-of-systemd-servic.patch b/testing/nemo-qml-plugin-devicelock/0001-Add-option-to-disable-installation-of-systemd-servic.patch
index 6dc46d09bf..ec52aaaec3 100644
--- a/testing/nemo-qml-plugin-devicelock/0001-Add-option-to-disable-installation-of-systemd-servic.patch
+++ b/testing/nemo-qml-plugin-devicelock/0001-Add-option-to-disable-installation-of-systemd-servic.patch
@@ -1,45 +1,33 @@
-From ef1c0b45b8b4cc5c6da442d4a0f683272e41ff51 Mon Sep 17 00:00:00 2001
+From 2e392063c74a19101e5885665fbc1f6f986a3002 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Mon, 8 Feb 2021 10:16:30 +0100
-Subject: [PATCH] Add option to disable installation of systemd service files
+Subject: [PATCH] Add possibility to not install systemd service files
Some systems might use elogind instead and thus don't need the service
files
---
- rpm/nemo-qml-plugin-devicelock.spec | 2 +-
- src/daemon/daemon.pro | 6 +++---
- systemd/systemd.pri | 9 +++++----
- 3 files changed, 9 insertions(+), 8 deletions(-)
+ src/daemon/daemon.pro | 8 +++++---
+ systemd/systemd.pri | 9 +++++----
+ 2 files changed, 10 insertions(+), 7 deletions(-)
-diff --git a/rpm/nemo-qml-plugin-devicelock.spec b/rpm/nemo-qml-plugin-devicelock.spec
-index 23da2bc..cb76851 100644
---- a/rpm/nemo-qml-plugin-devicelock.spec
-+++ b/rpm/nemo-qml-plugin-devicelock.spec
-@@ -51,7 +51,7 @@ Requires: pkgconfig(nemodbus)
- %setup -q -n %{name}-%{version}
-
- %build
--%qmake5 "VERSION=%{version}"
-+%qmake5 "VERSION=%{version}" CONFIG+=SYSTEMD_ENABLED
- make %{?_smp_mflags}
-
- %install
diff --git a/src/daemon/daemon.pro b/src/daemon/daemon.pro
-index c52089a..d594a94 100644
+index c52089a..dcc3109 100644
--- a/src/daemon/daemon.pro
+++ b/src/daemon/daemon.pro
-@@ -39,6 +39,6 @@ systemd.files = \
+@@ -39,6 +39,8 @@ systemd.files = \
systemd/nemo-devicelock.service
systemd.path= /usr/lib/systemd/system
-INSTALLS += \
- systemd \
- target
-+SYSTEMD_ENABLED += systemd
++!no_systemd{
++ INSTALLS += systemd
++}
+
+INSTALLS += target
diff --git a/systemd/systemd.pri b/systemd/systemd.pri
-index bb6fd8f..ead2ad7 100644
+index bb6fd8f..047272f 100644
--- a/systemd/systemd.pri
+++ b/systemd/systemd.pri
@@ -1,4 +1,3 @@
@@ -54,11 +42,11 @@ index bb6fd8f..ead2ad7 100644
-INSTALLS += \
- policy \
- systemd
-+SYSTEMD_ENABLED{
++!no_systemd{
+ INSTALLS += systemd
+}
+
+INSTALLS += policy
--
-2.30.0
+2.23.0
diff --git a/testing/nemo-qml-plugin-devicelock/APKBUILD b/testing/nemo-qml-plugin-devicelock/APKBUILD
index 32929f0e64..fbda0a5302 100644
--- a/testing/nemo-qml-plugin-devicelock/APKBUILD
+++ b/testing/nemo-qml-plugin-devicelock/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=nemo-qml-plugin-devicelock
pkgver=0.3.4
-pkgrel=0
+pkgrel=1
pkgdesc="Nemo QML devicelock plugin"
url="https://git.sailfishos.org/mer-core/nemo-qml-plugin-devicelock"
arch="all !armhf" # nemo-qml-plugin-dbus
@@ -21,7 +21,7 @@ source="https://git.sailfishos.org/mer-core/nemo-qml-plugin-devicelock/-/archive
"
build() {
- qmake-qt5
+ qmake-qt5 CONFIG+=no_systemd
make
}
@@ -30,4 +30,4 @@ package() {
}
sha512sums="3072d4f9b6d0ec7f885a97d8d5ae133be848f868799b5683628385afe4d7fee0cdddfece0a37862b4fd1349c5dcc048b0964af4eee8b9db66d896fb255e502e1 nemo-qml-plugin-devicelock-0.3.4.tar.gz
-011606cba0b3bce656a5bd348e0e81b78f80a669f0fc77cacc2ef708040cf2341ca71620b40df2415c45590879c4872c1914980b2db0a82493d59893cc511b9b 0001-Add-option-to-disable-installation-of-systemd-servic.patch"
+42eabf7d5a4819b6b014034bca48c513caf0c0f48f86c65431058bdedd77bbe12d86e0dd74e8f3d4d4e703fae9bcd00e686921489c729ec5380efb8d52950213 0001-Add-option-to-disable-installation-of-systemd-servic.patch"