diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-05 11:17:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:15 +0000 |
| commit | 18e8655f9257e5827e138a466a7d11f28298d5e6 (patch) | |
| tree | b2361d867a9e0e9453a024468dedf216a2443a42 | |
| parent | 3ab1419e106d260ff6a837f6a328b02d42fc8d75 (diff) | |
| download | aports-18e8655f9257e5827e138a466a7d11f28298d5e6.tar.bz2 aports-18e8655f9257e5827e138a466a7d11f28298d5e6.tar.xz | |
community/domoticz: upgrade to 4.9700
| -rw-r--r-- | community/domoticz/APKBUILD | 16 | ||||
| -rw-r--r-- | community/domoticz/boost-1.66.patch | 46 |
2 files changed, 9 insertions, 53 deletions
diff --git a/community/domoticz/APKBUILD b/community/domoticz/APKBUILD index e9c2d608f3..59e209a5a3 100644 --- a/community/domoticz/APKBUILD +++ b/community/domoticz/APKBUILD @@ -1,20 +1,19 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=domoticz -pkgver=3.8153 -pkgrel=2 +pkgver=4.9700 +pkgrel=0 pkgdesc="Open source Home Automation System" url="http://www.domoticz.com/" arch="all !armhf !armv7" license="GPL" pkgusers="$pkgname" pkggroups="$pkgname" -makedepends="cmake libressl-dev zlib-dev curl-dev boost-dev sqlite-dev +makedepends="cmake openssl-dev zlib-dev curl-dev boost-dev sqlite-dev lua5.2-dev mosquitto-dev libusb-compat-dev openzwave-dev python3-dev " install="$pkgname.pre-install" source="domoticz-$pkgver.tar.gz::https://github.com/domoticz/domoticz/archive/$pkgver.tar.gz - boost-1.66.patch domoticz.confd domoticz.initd " @@ -31,7 +30,11 @@ build() { -DCMAKE_INSTALL_PREFIX=/var/lib/domoticz \ -DUSE_BUILTIN_LUA=OFF \ -DUSE_BUILTIN_MQTT=OFF \ - -DUSE_BUILTIN_SQLITE=OFF + -DUSE_BUILTIN_SQLITE=OFF \ + -DUSE_STATIC_BOOST=NO \ + -DUSE_STATIC_LIBSTDCXX=NO \ + -DUSE_STATIC_OPENZWAVE=NO \ + -DUSE_OPENSSL_STATIC=NO make } @@ -62,7 +65,6 @@ package() { "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="6c4e30b28fa4a5969ddf8a2c275e390394087b036af795921b114c7a734e966b546b33dd353b9aeefce39b30ce502067aadc8616c0fb25b3d97d58aa31922786 domoticz-3.8153.tar.gz -42f89bf2311f20ce6fc4e1d24d6f7443f1572936aa813e364319a1d8eccf539f6ade593cbb00aceb98d24350cefd127b06e3c1c78083edec3c3e108e4aca7a02 boost-1.66.patch +sha512sums="f677a082b5ac4057142a6b71998d0e08042481821ceb2760a07af3745fc8900279e6b469e244fd3a08bb2dabf9efd903dd1e0c54adc726a09754594484bb92f6 domoticz-4.9700.tar.gz 724440da335f1e22c8dc181df62dac9ad2bcca98b39bff059de4be5901a93a0a8cb6864d92262092041d796ee7d3933f62cf337316d35a800bbb44f84a1709e0 domoticz.confd 3ddbd3848cce2247a52e4673307a078717d75cb3fea2937d9f2442d94dccd0efc63120f1b0324c7091ae158cd0ec4fd36334af43bb887d45ff4a93e6a96e9bd2 domoticz.initd" diff --git a/community/domoticz/boost-1.66.patch b/community/domoticz/boost-1.66.patch deleted file mode 100644 index 31993c0c74..0000000000 --- a/community/domoticz/boost-1.66.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 388c7b51716cdb6221ec292cc2456ceca6ee9b02 Mon Sep 17 00:00:00 2001 -From: Rob Peters <ROb@DVBControl.com> -Date: Wed, 24 Jan 2018 12:03:24 +0100 -Subject: [PATCH] Make compatible with boost 1.66 - ---- - msbuild/domoticz.vcxproj | 2 +- - webserver/proxyclient.cpp | 2 +- - webserver/server.cpp | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp -index 6bd6b8771..86baef222 100644 ---- a/webserver/proxyclient.cpp -+++ b/webserver/proxyclient.cpp -@@ -639,7 +639,7 @@ - void CProxyManager::StartThread() - { - try { -- boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23); -+ boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23); - ctx.set_verify_mode(boost::asio::ssl::verify_none); - - proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm)); -diff --git a/webserver/server.cpp b/webserver/server.cpp -index fe001e811..c0eec2166 100644 ---- a/webserver/server.cpp -+++ b/webserver/server.cpp -@@ -152,7 +152,7 @@ void server::handle_accept(const boost::system::error_code& e) { - ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) : - server_base(ssl_settings, user_request_handler), - settings_(ssl_settings), -- context_(io_service_, ssl_settings.get_ssl_method()) -+ context_(ssl_settings.get_ssl_method()) - { - #ifdef DEBUG_WWW - _log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str()); -@@ -165,7 +165,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler - ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) : - server_base(settings, user_request_handler), - settings_(dynamic_cast<ssl_server_settings const &>(settings)), -- context_(io_service_, dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) { -+ context_(dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) { - #ifdef DEBUG_WWW - _log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str()); - #endif |