summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornfnty2016-12-10 10:01:55 +0100
committernfnty2016-12-10 10:01:55 +0100
commit20c2fb17b7fe629056e063b1091d35f550775ac0 (patch)
treebe9e872cfdd85cc7bd422dea74cd645d9aed4731
parentf956e79f94c9b4934a5bc2e9ffc6ca68cbecf8a9 (diff)
downloadaur-20c2fb17b7fe629056e063b1091d35f550775ac0.tar.gz
Fix build errors
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--telldusd.service8
3 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 283aca8f6790..3a168d3ed50c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,7 +22,7 @@ pkgbase = telldus-core-git
source = uucp.patch
source = bin.patch
sha512sums = SKIP
- sha512sums = 6f1df90a7d073acc2825d480552dc25fc0ccbafc58295542278a1a69a42030c2df7221bb3915a96c7a37924b1c276b78fe9d821b371cbe84c6eb09f6e987ebde
+ sha512sums = 04a39fea3c37f797973b0790d6db3038fe40bcc700b87b6e9f774de4a1cd788b11daed5c336555fd8cd69dbebcaf63585699b33d95495920fde7975ce506c163
sha512sums = eb54e6cd62fbb3088827d92bb138b8fc88c2d76b6ec660bc6c88c5fda2b0d2493a2bb3509d24e5a6a871d42d335dff49c07721be955cbdbcda28e51df04bbb74
sha512sums = 0888e11a2a1080d0b5bad515534dc127f201ad25db427e45d4bbb981254608bbbdbc490c76b7aeaf65eea7e2699cbb62cab8ebf6f4e4048a9dc668a68d7b6ab5
sha512sums = 27178656d147481eb76c820bf49da0339714f7d27c413777e2ecfc0296de5ccfe9425d7e4bc5ea2dfbe530d6fe47a22e111618808cf296b3bfa21569af7512ec
diff --git a/PKGBUILD b/PKGBUILD
index 86ecb85e9d39..28963f7932e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2034,SC2154,SC2164
pkgname=('telldus-core-git')
_srcname='telldus'
pkgver='r1'
@@ -21,7 +22,7 @@ source=(
)
sha512sums=(
'SKIP'
- '6f1df90a7d073acc2825d480552dc25fc0ccbafc58295542278a1a69a42030c2df7221bb3915a96c7a37924b1c276b78fe9d821b371cbe84c6eb09f6e987ebde'
+ '04a39fea3c37f797973b0790d6db3038fe40bcc700b87b6e9f774de4a1cd788b11daed5c336555fd8cd69dbebcaf63585699b33d95495920fde7975ce506c163'
'eb54e6cd62fbb3088827d92bb138b8fc88c2d76b6ec660bc6c88c5fda2b0d2493a2bb3509d24e5a6a871d42d335dff49c07721be955cbdbcda28e51df04bbb74'
'0888e11a2a1080d0b5bad515534dc127f201ad25db427e45d4bbb981254608bbbdbc490c76b7aeaf65eea7e2699cbb62cab8ebf6f4e4048a9dc668a68d7b6ab5'
'27178656d147481eb76c820bf49da0339714f7d27c413777e2ecfc0296de5ccfe9425d7e4bc5ea2dfbe530d6fe47a22e111618808cf296b3bfa21569af7512ec'
@@ -49,6 +50,7 @@ prepare() {
build() {
cd "${srcdir}/${_srcname}/telldus-core"
+ export CXXFLAGS="${CXXFLAGS} -Wno-narrowing"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DFORCE_COMPILE_FROM_TRUNK=TRUE \
diff --git a/telldusd.service b/telldusd.service
index d61c7111aa8f..f03a6c6de338 100644
--- a/telldusd.service
+++ b/telldusd.service
@@ -1,14 +1,14 @@
-# Telldusd service unit file
-#
[Unit]
Description=Telldus-core service telldusd
After=basic.target
[Service]
Type=forking
-ExecStart=/usr/bin/telldusd
-ExecReload=/bin/kill -HUP $MAINPID
PIDFile=/run/telldusd.pid
+ExecStart=/usr/bin/telldusd
+
+ExecReload=/usr/bin/kill --signal HUP "${MAINPID}"
+
[Install]
WantedBy=multi-user.target