summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2018-03-27 22:00:53 +0200
committerMaxime Gauduin2018-03-27 22:00:53 +0200
commit2194d03fc5ba87b7fd52bde065e96128921628cf (patch)
tree387ac79237460f033ae27ec0e30ce6f1450953d7
parent87f22fcbd8480cfeb92c16932055d31cfdb139e8 (diff)
downloadaur-2194d03fc5ba87b7fd52bde065e96128921628cf.tar.gz
Switch to meson
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD27
-rw-r--r--systemd-service-install-dir.patch9
-rw-r--r--systemd-unit-install-dir.patch25
4 files changed, 42 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87fee3d281c..18b9523cfaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
# Generated by mksrcinfo v8
-# Mon May 1 20:53:04 UTC 2017
+# Tue Mar 27 20:00:53 UTC 2018
pkgbase = switchboard-plug-parental-controls-git
pkgdesc = Switchboard Parental Controls Plug
- pkgver = r334.db7f66c
+ pkgver = r407.669ee27
pkgrel = 1
url = https://github.com/elementary/switchboard-plug-parental-controls
- arch = i686
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
makedepends = git
makedepends = granite-git
+ makedepends = meson
makedepends = switchboard-git
makedepends = vala
depends = accountsservice
@@ -26,9 +25,9 @@ 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-service-install-dir.patch
+ source = systemd-unit-install-dir.patch
sha256sums = SKIP
- sha256sums = 73d98773379872f7fe8ac570faf8d3ce01ab2495784fac4569ac596f77706591
+ sha256sums = 18da068a732085d41255fb2fac2e390451d7499f6750dd36e8a14530d6b8072b
pkgname = switchboard-plug-parental-controls-git
diff --git a/PKGBUILD b/PKGBUILD
index df19ced6b3f..16eb1e9eedd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=switchboard-plug-parental-controls-git
-pkgver=r334.db7f66c
+pkgver=r407.669ee27
pkgrel=1
pkgdesc='Switchboard Parental Controls Plug'
arch=('x86_64')
@@ -11,13 +11,13 @@ groups=('pantheon-unstable')
depends=('accountsservice' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'libgee'
'polkit'
'libgranite.so' 'libswitchboard-2.0.so')
-makedepends=('cmake' 'git' 'granite-git' 'switchboard-git' 'vala')
+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-service-install-dir.patch')
+ 'systemd-unit-install-dir.patch')
sha256sums=('SKIP'
- '73d98773379872f7fe8ac570faf8d3ce01ab2495784fac4569ac596f77706591')
+ '18da068a732085d41255fb2fac2e390451d7499f6750dd36e8a14530d6b8072b')
pkgver() {
cd switchboard-plug-parental-controls
@@ -26,30 +26,27 @@ pkgver() {
}
prepare() {
- cd switchboard-plug-parental-controls
-
if [[ -d build ]]; then
rm -rf build
fi
mkdir build
- patch -Np1 -i ../systemd-service-install-dir.patch
+ cd switchboard-plug-parental-controls
+
+ patch -Np1 -i ../systemd-unit-install-dir.patch
}
build() {
- cd switchboard-plug-parental-controls/build
+ cd build
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_INSTALL_LIBDIR='/usr/lib'
- make
+ arch-meson ../switchboard-plug-parental-controls
+ ninja
}
package() {
- cd switchboard-plug-parental-controls/build
+ cd build
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja install
}
# vim: ts=2 sw=2 et:
diff --git a/systemd-service-install-dir.patch b/systemd-service-install-dir.patch
deleted file mode 100644
index 602808a5996..00000000000
--- a/systemd-service-install-dir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -rupN switchboard-plug-parental-controls.orig/data/CMakeLists.txt switchboard-plug-parental-controls/data/CMakeLists.txt
---- switchboard-plug-parental-controls.orig/data/CMakeLists.txt 2017-05-01 22:50:23.207664431 +0200
-+++ switchboard-plug-parental-controls/data/CMakeLists.txt 2017-05-01 22:50:42.357135219 +0200
-@@ -7,4 +7,4 @@ install (FILES ${CMAKE_CURRENT_BINARY_DI
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service DESTINATION share/dbus-1/system-services)
- install (FILES org.pantheon.ParentalControls.conf DESTINATION /etc/dbus-1/system.d)
- install (FILES pantheon-parental-controls-client.desktop DESTINATION share/applications)
--install (FILES ${CMAKE_CURRENT_BINARY_DIR}/data/pantheon-parental-controls.service DESTINATION /lib/systemd/system)
-+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/data/pantheon-parental-controls.service DESTINATION lib/systemd/system)
diff --git a/systemd-unit-install-dir.patch b/systemd-unit-install-dir.patch
new file mode 100644
index 00000000000..c80eb6a2048
--- /dev/null
+++ b/systemd-unit-install-dir.patch
@@ -0,0 +1,25 @@
+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
+