From f9604d1c29c0918cbb9f30f74ebc52a2a0b00783 Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Fri, 21 Oct 2016 09:01:10 +0000 Subject: math/cadabra2: update 2.0.816 -> 2.0.930 - Unbreaks GUI by applying two patches: - Patch in boost headers to prevent EINPROGRESS mishandling https://github.com/zaphoyd/websocketpp/issues/563 - Patch in websocketpp fixing IPv4 vs. IPv6 mismatch https://github.com/zaphoyd/websocketpp/issues/587 - GUI option is made default - Clones icons for the GUI app cadabra2-gui - Adds "USE_TEX=texmf texhash" to allow for unincluded latex macros, and to make tex hash local packages installed by cadabra2 - Verified that cadabra2 GUI now works fine - it is able to run many examples from their website. PR: 213329 Submitted by: Yuri Victorovich (maintainer) --- math/cadabra2/files/patch-CMakeLists.txt | 15 --------------- ...de_include_boost_asio_detail_impl_socket__ops.ipp | 19 +++++++++++++++++++ ...e_include_websocketpp_transport_asio_endpoint.hpp | 20 ++++++++++++++++++++ 3 files changed, 39 insertions(+), 15 deletions(-) delete mode 100644 math/cadabra2/files/patch-CMakeLists.txt create mode 100644 math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp create mode 100644 math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp (limited to 'math/cadabra2/files') diff --git a/math/cadabra2/files/patch-CMakeLists.txt b/math/cadabra2/files/patch-CMakeLists.txt deleted file mode 100644 index cbec85133cd9..000000000000 --- a/math/cadabra2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- CMakeLists.txt.orig 2016-06-20 20:19:43 UTC -+++ CMakeLists.txt -@@ -107,7 +107,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT - - add_subdirectory(core) - add_subdirectory(client_server) --add_subdirectory(frontend) - add_subdirectory(tests) - add_subdirectory(web2 EXCLUDE_FROM_ALL) - -+option(ENABLE_FRONTEND "Enable the UI frontend" OFF) -+if(ENABLE_FRONTEND) -+ add_subdirectory(frontend) -+endif() -+ diff --git a/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp b/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp new file mode 100644 index 000000000000..830cd763fa12 --- /dev/null +++ b/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp @@ -0,0 +1,19 @@ +--- override/include/boost/asio/detail/impl/socket_ops.ipp.orig 2016-10-09 22:39:18 UTC ++++ override/include/boost/asio/detail/impl/socket_ops.ipp +@@ -469,7 +469,15 @@ template + inline int call_connect(SockLenType msghdr::*, + socket_type s, const socket_addr_type* addr, std::size_t addrlen) + { +- return ::connect(s, addr, (SockLenType)addrlen); ++ int res = ::connect(s, addr, (SockLenType)addrlen); ++ if (res == -1 && errno==EINPROGRESS) { ++ fd_set write_fd; ++ FD_ZERO(&write_fd); ++ FD_SET(s, &write_fd); ++ res = ::select (s+1, NULL, &write_fd,NULL,NULL); ++ res = res > 0 ? 0 : res; ++ } ++ return res; + } + + int connect(socket_type s, const socket_addr_type* addr, diff --git a/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp b/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp new file mode 100644 index 000000000000..2bd5f5559f4e --- /dev/null +++ b/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp @@ -0,0 +1,20 @@ +--- override/include/websocketpp/transport/asio/endpoint.hpp.orig 2016-10-09 22:39:45 UTC ++++ override/include/websocketpp/transport/asio/endpoint.hpp +@@ -491,7 +491,7 @@ public: + * @param ec Set to indicate what error occurred, if any. + */ + void listen(uint16_t port, lib::error_code & ec) { +- listen(lib::asio::ip::tcp::v6(), port, ec); ++ listen(lib::asio::ip::tcp::v4(), port, ec); + } + + /// Set up endpoint for listening on a port +@@ -507,7 +507,7 @@ public: + * @param ec Set to indicate what error occurred, if any. + */ + void listen(uint16_t port) { +- listen(lib::asio::ip::tcp::v6(), port); ++ listen(lib::asio::ip::tcp::v4(), port); + } + + /// Set up endpoint for listening on a host and service (exception free) -- cgit v1.2.3