Update IXWebSocket

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b92cd42..45ba823 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,12 +63,6 @@ option(WITH_TOOLS "Build utility tools"  NO)
 add_subdirectory(src/additional/libqrencode)
 add_subdirectory(src/additional/IXWebSocket)
 
-# Apply patch for IXWebSocket issue
-execute_process (
-    COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/src/additional/fix_cerrno.sh"
-    OUTPUT_VARIABLE outIxVar
-)
-
 # Set default root path for berkeley db
 if (NOT BerkeleyDB_ROOT)
 set(BerkeleyDB_ROOT /usr)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91626be..230defa 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,12 +47,6 @@ set(OPENSSL_USE_STATIC_LIBS ON)
 find_package(OpenSSL REQUIRED)
 add_subdirectory(additional/IXWebSocket)
 
-# Apply patch for IXWebSocket issue
-execute_process (
-    COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/additional/fix_cerrno.sh"
-    OUTPUT_VARIABLE outIxVar
-)
-
 # Set default root path for berkeley db
 if (NOT BerkeleyDB_ROOT)
 set(BerkeleyDB_ROOT /usr)

diff --git a/src/additional/IXWebSocket b/src/additional/IXWebSocket
index 8c15405..e12a6dd 160000 (submodule)
--- a/src/additional/IXWebSocket
+++ b/src/additional/IXWebSocket
@@ -1 +1 @@
-Subproject commit 8c15405ed03987e31f0b2da056751eaf1902b6ee
+Subproject commit e12a6ddbdddc7464421a55e79292f6393d6f4d63

diff --git a/src/additional/cerrno_include.patch b/src/additional/cerrno_include.patch
deleted file mode 100644 (file)
index 52ce953..0000000
--- a/src/additional/cerrno_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ixwebsocket/IXNetSystem.h b/ixwebsocket/IXNetSystem.h
-index 21131b4..7ca58f4 100644
---- a/ixwebsocket/IXNetSystem.h
-+++ b/ixwebsocket/IXNetSystem.h
-@@ -17,6 +17,7 @@
- #include <basetsd.h>
- #include <io.h>
- #include <ws2def.h>
-+#include <cerrno>
- 
- #undef EWOULDBLOCK
- #undef EAGAIN

diff --git a/src/additional/fix_cerrno.sh b/src/additional/fix_cerrno.sh
deleted file mode 100755 (executable)
index 722e09d..0000000
--- a/src/additional/fix_cerrno.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-realpath() {
-    [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
-}
-
-PREVDIR=$(pwd)
-SCRIPT=$(realpath $0)
-ROOT=`dirname $SCRIPT`
-
-cd $ROOT/IXWebSocket
-git reset --hard 8c15405
-patch -s -p1 < ../cerrno_include.patch
-git -c user.name='CryptoManiac' -c user.email='balthazar@yandex.ru' commit -a -m 'Fix cerrno'
-cd $PREVDIR