aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-04-14 14:59:11 +0200
committerBart Ribbers <bribbers@disroot.org>2021-04-14 14:20:39 +0000
commit7fdc52198f3c4290e29c9333f8483ccfceda2973 (patch)
tree58049af4494212d53faae21aad93d3880e7e9c92
parentc8378a8434d0ecff2e0608ce056b0c20ae9fb8ac (diff)
downloadaports-7fdc52198f3c4290e29c9333f8483ccfceda2973.tar.gz
aports-7fdc52198f3c4290e29c9333f8483ccfceda2973.tar.bz2
aports-7fdc52198f3c4290e29c9333f8483ccfceda2973.tar.xz
testing/nemo-qml-plugin-devicelock: upgrade to 0.3.5
-rw-r--r--testing/nemo-qml-plugin-devicelock/0001-Add-option-to-disable-installation-of-systemd-servic.patch52
-rw-r--r--testing/nemo-qml-plugin-devicelock/APKBUILD11
2 files changed, 4 insertions, 59 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
deleted file mode 100644
index ec52aaaec3..0000000000
--- a/testing/nemo-qml-plugin-devicelock/0001-Add-option-to-disable-installation-of-systemd-servic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 possibility to not install systemd service files
-
-Some systems might use elogind instead and thus don't need the service
-files
----
- src/daemon/daemon.pro | 8 +++++---
- systemd/systemd.pri | 9 +++++----
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/daemon/daemon.pro b/src/daemon/daemon.pro
-index c52089a..dcc3109 100644
---- a/src/daemon/daemon.pro
-+++ b/src/daemon/daemon.pro
-@@ -39,6 +39,8 @@ systemd.files = \
- systemd/nemo-devicelock.service
- systemd.path= /usr/lib/systemd/system
-
--INSTALLS += \
-- systemd \
-- target
-+!no_systemd{
-+ INSTALLS += systemd
-+}
-+
-+INSTALLS += target
-diff --git a/systemd/systemd.pri b/systemd/systemd.pri
-index bb6fd8f..047272f 100644
---- a/systemd/systemd.pri
-+++ b/systemd/systemd.pri
-@@ -1,4 +1,3 @@
--
- systemd.files = \
- $$PWD/nemo-devicelock.socket
- systemd.path= /usr/lib/systemd/system
-@@ -7,6 +6,8 @@ policy.files = \
- $$PWD/org.nemomobile.devicelock.conf
- policy.path = /etc/dbus-1/system.d
-
--INSTALLS += \
-- policy \
-- systemd
-+!no_systemd{
-+ INSTALLS += systemd
-+}
-+
-+INSTALLS += policy
---
-2.23.0
-
diff --git a/testing/nemo-qml-plugin-devicelock/APKBUILD b/testing/nemo-qml-plugin-devicelock/APKBUILD
index fbda0a5302..ba0c75a89a 100644
--- a/testing/nemo-qml-plugin-devicelock/APKBUILD
+++ b/testing/nemo-qml-plugin-devicelock/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=nemo-qml-plugin-devicelock
-pkgver=0.3.4
-pkgrel=1
+pkgver=0.3.5
+pkgrel=0
pkgdesc="Nemo QML devicelock plugin"
url="https://git.sailfishos.org/mer-core/nemo-qml-plugin-devicelock"
arch="all !armhf" # nemo-qml-plugin-dbus
@@ -16,9 +16,7 @@ depends_dev="
"
makedepends="$depends_dev"
subpackages="$pkgname-static $pkgname-dev"
-source="https://git.sailfishos.org/mer-core/nemo-qml-plugin-devicelock/-/archive/$pkgver/nemo-qml-plugin-devicelock-$pkgver.tar.gz
- 0001-Add-option-to-disable-installation-of-systemd-servic.patch
- "
+source="https://git.sailfishos.org/mer-core/nemo-qml-plugin-devicelock/-/archive/$pkgver/nemo-qml-plugin-devicelock-$pkgver.tar.gz"
build() {
qmake-qt5 CONFIG+=no_systemd
@@ -29,5 +27,4 @@ package() {
INSTALL_ROOT="$pkgdir" make install
}
-sha512sums="3072d4f9b6d0ec7f885a97d8d5ae133be848f868799b5683628385afe4d7fee0cdddfece0a37862b4fd1349c5dcc048b0964af4eee8b9db66d896fb255e502e1 nemo-qml-plugin-devicelock-0.3.4.tar.gz
-42eabf7d5a4819b6b014034bca48c513caf0c0f48f86c65431058bdedd77bbe12d86e0dd74e8f3d4d4e703fae9bcd00e686921489c729ec5380efb8d52950213 0001-Add-option-to-disable-installation-of-systemd-servic.patch"
+sha512sums="3da85e11f77f84b377f9c5524ebc36852272ee7e70499b18b1711579d3d9df273f437d1a892073d22b24030a452827c9469888b48fa23d8ea9dde4881e87b0cb nemo-qml-plugin-devicelock-0.3.5.tar.gz"