summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2018-03-29 20:40:13 +0200
committerMaxime Gauduin2018-03-29 20:40:13 +0200
commit4ec0688ff6396989d0461104ad10dc4816fd94d7 (patch)
treea96861a7be6bc98f3b7956ba8e010887de1a4d49
parent2194d03fc5ba87b7fd52bde065e96128921628cf (diff)
downloadaur-4ec0688ff6396989d0461104ad10dc4816fd94d7.tar.gz
Patch was merged
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--systemd-unit-install-dir.patch25
3 files changed, 5 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 18b9523cfaf..6ccd53e71f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Mar 27 20:00:53 UTC 2018
+# Thu Mar 29 18:40:13 UTC 2018
pkgbase = switchboard-plug-parental-controls-git
pkgdesc = Switchboard Parental Controls Plug
- pkgver = r407.669ee27
+ pkgver = r409.9e72211
pkgrel = 1
url = https://github.com/elementary/switchboard-plug-parental-controls
arch = x86_64
@@ -25,9 +25,7 @@ pkgbase = switchboard-plug-parental-controls-git
provides = switchboard-plug-parental-controls
conflicts = switchboard-plug-parental-controls
source = git+https://github.com/elementary/switchboard-plug-parental-controls.git
- source = systemd-unit-install-dir.patch
sha256sums = SKIP
- sha256sums = 18da068a732085d41255fb2fac2e390451d7499f6750dd36e8a14530d6b8072b
pkgname = switchboard-plug-parental-controls-git
diff --git a/PKGBUILD b/PKGBUILD
index 16eb1e9eedd..df5c9c2923a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=switchboard-plug-parental-controls-git
-pkgver=r407.669ee27
+pkgver=r409.9e72211
pkgrel=1
pkgdesc='Switchboard Parental Controls Plug'
arch=('x86_64')
@@ -14,10 +14,8 @@ depends=('accountsservice' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'libgee'
makedepends=('git' 'granite-git' 'meson' 'switchboard-git' 'vala')
provides=('switchboard-plug-parental-controls')
conflicts=('switchboard-plug-parental-controls')
-source=('git+https://github.com/elementary/switchboard-plug-parental-controls.git'
- 'systemd-unit-install-dir.patch')
-sha256sums=('SKIP'
- '18da068a732085d41255fb2fac2e390451d7499f6750dd36e8a14530d6b8072b')
+source=('git+https://github.com/elementary/switchboard-plug-parental-controls.git')
+sha256sums=('SKIP')
pkgver() {
cd switchboard-plug-parental-controls
@@ -30,10 +28,6 @@ prepare() {
rm -rf build
fi
mkdir build
-
- cd switchboard-plug-parental-controls
-
- patch -Np1 -i ../systemd-unit-install-dir.patch
}
build() {
diff --git a/systemd-unit-install-dir.patch b/systemd-unit-install-dir.patch
deleted file mode 100644
index c80eb6a2048..00000000000
--- a/systemd-unit-install-dir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3eadb164535e2226a96b4c21e9b55b58f14f1550 Mon Sep 17 00:00:00 2001
-From: Maxime Gauduin <alucryd@archlinux.org>
-Date: Tue, 27 Mar 2018 21:54:38 +0200
-Subject: [PATCH] Fix the systemd unit install dir
-
----
- data/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index b476760..727d93e 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -9,7 +9,7 @@ configure_file(
- input: 'pantheon-parental-controls.service.in',
- output: '@BASENAME@',
- configuration: configuration_data,
-- install_dir: join_paths('/', 'lib','systemd', 'system')
-+ install_dir: join_paths(get_option('libdir'),'systemd', 'system')
- )
-
- configure_file(
---
-2.16.3
-