vtm: Update to 0.7.2

Co-authored-by: Luka Mamukashvili <ultraluka0@gmail.com>
Co-authored-by: Aditya Alok <dev.aditya.alok@gmail.com>
This commit is contained in:
Tee KOBAYASHI 2022-04-30 09:39:18 +09:00 committed by xtkoba
parent 5871fb93b0
commit 2b4ee11fba
3 changed files with 19 additions and 47 deletions

View File

@ -1,23 +1,11 @@
--- a/src/CMakeLists.txt 2022-02-14 16:50:27.000000000 +0000
+++ b/src/CMakeLists.txt 2022-04-17 10:11:34.852563956 +0000
@@ -14,13 +14,6 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@
#set (CMAKE_EXE_LINKER_FLAGS "/MANIFEST:NO")
set (CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /bigobj")
-else ()
elseif (NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Android")
- set (CMAKE_CXX_FLAGS "-pthread")
- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- #static linkage
- #set (CMAKE_CXX_FLAGS "-static-libstdc++ -static-libgcc -pthread -s")
- #set (CMAKE_CXX_FLAGS "-pthread -s")
- endif ()
endif ()
if (DEMO)
@@ -31,4 +24,4 @@
if (NOT WIN32)
install (TARGETS vtm DESTINATION bin)
-endif ()
\ No newline at end of file
+endif ()
+ #set (CMAKE_CXX_FLAGS "-pthread")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
#static linkage
#set (CMAKE_CXX_FLAGS "-static-libstdc++ -static-libgcc -pthread -s")

View File

@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Terminal multiplexer with TUI window manager and multi-p
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="../LICENSE"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.7.1"
TERMUX_PKG_VERSION="0.7.2"
TERMUX_PKG_SRCURL=https://github.com/netxs-group/vtm/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8047f7d9508b5c94f469ba9c9aa7b8bede1dccae21624608a00f3395df594d54
TERMUX_PKG_SHA256=6cfd34dfab202c87dea73a201f547a3ca394060fba82eba97a84376e440ae10a
TERMUX_PKG_DEPENDS="libandroid-spawn, libc++"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true

View File

@ -1,27 +1,11 @@
--- a/src/netxs/os/system.hpp 2022-02-14 16:50:27.000000000 +0000
+++ b/src/netxs/os/system.hpp 2022-04-17 10:03:16.743450407 +0000
@@ -81,7 +81,7 @@
#if defined(__linux__)
#include <sys/vt.h> // ::console_ioctl()
- #include <sys/kd.h> // ::console_ioctl()
+ #include <linux/kd.h> // ::console_ioctl()
#include <linux/keyboard.h> // ::keyb_ioctl()
#endif
@@ -1507,7 +1507,7 @@
--- a/src/netxs/os/system.hpp
+++ b/src/netxs/os/system.hpp
@@ -1696,7 +1696,7 @@
#elif defined(__linux__)
ucred cred = {};
- unsigned size = sizeof(cred);
+ socklen_t size = sizeof(cred);
if (!ok(::getsockopt(handle.h, SOL_SOCKET, SO_PEERCRED, &cred, &size), "getsockopt error"))
return faux;
@@ -2687,4 +2687,4 @@
};
}
-#endif // NETXS_SYSTEM_HPP
\ No newline at end of file
+#endif // NETXS_SYSTEM_HPP
auto cred = ucred{};
- #ifndef __ANDROID__
+ #ifdef __ANDROID__
socklen_t size = sizeof(cred);
#else
unsigned size = sizeof(cred);