aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2016-10-31 09:48:57 +0100
committerCarlo Landmeter <clandmeter@gmail.com>2016-10-31 09:51:47 +0100
commit285730eace3379f85e1556b059083e82f4cf3330 (patch)
tree7e3a4e55126d8bca8a2fd58faf1a1158f55297d1
parentf2163c8639a2ba2a1559ab0feabcf0011f548d90 (diff)
downloadaports-285730eace3379f85e1556b059083e82f4cf3330.tar.bz2
aports-285730eace3379f85e1556b059083e82f4cf3330.tar.xz
community/domoticz: upgrade to 3.5837
-rw-r--r--community/domoticz/APKBUILD20
-rw-r--r--community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch60
2 files changed, 8 insertions, 72 deletions
diff --git a/community/domoticz/APKBUILD b/community/domoticz/APKBUILD
index edf16fb4d..511345366 100644
--- a/community/domoticz/APKBUILD
+++ b/community/domoticz/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=domoticz
-pkgver=3.4834
-pkgrel=5
+pkgver=3.5837
+pkgrel=0
pkgdesc="Open source Home Automation System"
url="http://www.domoticz.com/"
arch="all !armhf"
@@ -18,7 +18,6 @@ subpackages=""
source="domoticz-$pkgver.tar.gz::https://github.com/domoticz/domoticz/archive/$pkgver.tar.gz
domoticz.confd
domoticz.initd
- ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch
"
builddir="$srcdir/domoticz-$pkgver"
@@ -58,15 +57,12 @@ package() {
"$pkgdir"/etc/conf.d/$pkgname || return 1
}
-md5sums="fc3c396eadca9a8b622f69d86351ac37 domoticz-3.4834.tar.gz
+md5sums="782e57353f7c66e6227a7062f462691b domoticz-3.5837.tar.gz
e5ecebdcc238af91a89081a115530175 domoticz.confd
-c7a183cf8d3df2d0dd14380d13694847 domoticz.initd
-791bb99d93063a97e64026a27df1fbb9 ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch"
-sha256sums="02b4cdde8e376258aeae3d5621edf8bb6b3563c34282e50194db343fcec9c0f5 domoticz-3.4834.tar.gz
+c7a183cf8d3df2d0dd14380d13694847 domoticz.initd"
+sha256sums="4b2d59c2bd70e61c486b372059164a688c53b8aa9f1aedb4beb3316ae2a130c5 domoticz-3.5837.tar.gz
155e9c33c5a99bb32e925c834b2530451640a8a58e39aa63e358401711d67ff3 domoticz.confd
-4701360626f3951102e8b827031d2099f241a003123bc9114237ba67b24e2845 domoticz.initd
-9ca9368d20eb5f177e1b3deccba224ee5e743fb22af0ecf0585d1da815c15572 ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch"
-sha512sums="3527075c905d47a8774fe60f9b717665c47937f3bf0b9ec0ab2351e3215230d0e4e28b0fd1d1f921b849884a20c57ca0e8600019fb4c4fa82b8d3a3839098f95 domoticz-3.4834.tar.gz
+4701360626f3951102e8b827031d2099f241a003123bc9114237ba67b24e2845 domoticz.initd"
+sha512sums="49a6232f22143be53c3991a0ff18ffc065a63d92ce71da42ce4175c89d1573934b3472e1d8ff6e332de6bf97caa37c02be404e58dc89b62dd7db9eb652df6959 domoticz-3.5837.tar.gz
724440da335f1e22c8dc181df62dac9ad2bcca98b39bff059de4be5901a93a0a8cb6864d92262092041d796ee7d3933f62cf337316d35a800bbb44f84a1709e0 domoticz.confd
-3ddbd3848cce2247a52e4673307a078717d75cb3fea2937d9f2442d94dccd0efc63120f1b0324c7091ae158cd0ec4fd36334af43bb887d45ff4a93e6a96e9bd2 domoticz.initd
-b6bdc0f578728ed25edb80c9117c1744c4ce1945eeea3ed9618937a6e81c6c3712e8de33769c71a3767a7cf9314973cf9265d3e1d4dfd8907f2b0c0bcf382671 ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch"
+3ddbd3848cce2247a52e4673307a078717d75cb3fea2937d9f2442d94dccd0efc63120f1b0324c7091ae158cd0ec4fd36334af43bb887d45ff4a93e6a96e9bd2 domoticz.initd"
diff --git a/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch b/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch
deleted file mode 100644
index 6787482bb..000000000
--- a/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70 Mon Sep 17 00:00:00 2001
-From: irimi <irimi@gmx.de>
-Date: Mon, 7 Mar 2016 20:28:21 +0100
-Subject: [PATCH] ensure correct git repository path
-
----
- CMakeLists.txt | 2 +-
- getgit.cmake | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d3113f4..8532ab4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -152,7 +152,7 @@ FIND_PROGRAM(GIT_EXECUTABLE git
- DOC "git command line client")
-
- MACRO(Gitversion_GET_REVISION dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
-+ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-diff --git a/getgit.cmake b/getgit.cmake
-index 8d6821f..39af19b 100644
---- a/getgit.cmake
-+++ b/getgit.cmake
-@@ -8,28 +8,28 @@ if(NOT GIT_FOUND)
- endif()
-
- MACRO(Gitversion_GET_REVISION dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
-+ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDMACRO(Gitversion_GET_REVISION)
-
- MACRO(Gitversion_GET_HASH dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-+ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD
- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDMACRO(Gitversion_GET_HASH)
-
- MACRO(Gitversion_GET_DATE dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct
-+ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct
- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDMACRO(Gitversion_GET_DATE)
-
- MACRO(Gitversion_CHECK_DIRTY dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} diff-index -m --name-only HEAD
-+ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD
- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)