diff --git a/packages/libwebsockets/build.sh b/packages/libwebsockets/build.sh index 0a9ab4725..bf53a3e42 100644 --- a/packages/libwebsockets/build.sh +++ b/packages/libwebsockets/build.sh @@ -1,11 +1,16 @@ TERMUX_PKG_HOMEPAGE=https://libwebsockets.org TERMUX_PKG_DESCRIPTION="Lightweight C websockets library" TERMUX_PKG_LICENSE="LGPL-2.0" -TERMUX_PKG_VERSION=3.2.99.1 -TERMUX_PKG_SRCURL=https://github.com/warmcat/libwebsockets/archive/0cd351d4c40687a4d40a42f04c1313498a918cd1.zip -TERMUX_PKG_SHA256=67471f41804680ca5a33ffe1428e3758e815e5c2c6887c6a524b90611decdb75 -TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_VERSION=3.2.99.3 +TERMUX_PKG_SRCURL=https://github.com/warmcat/libwebsockets/archive/4566979154ebe83472c69b8a5c09c92eff1dfdb4.zip +TERMUX_PKG_SHA256=40e2634739eaf17a94f7927622be44e615ed1a6505930c356b98671e51f8ec3d +TERMUX_PKG_DEPENDS="openssl, libuv, zlib" TERMUX_PKG_BREAKS="libwebsockets-dev" TERMUX_PKG_REPLACES="libwebsockets-dev" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLWS_WITHOUT_TESTAPPS=ON -DLWS_WITH_STATIC=OFF" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DLWS_WITHOUT_TESTAPPS=ON +-DLWS_WITH_STATIC=OFF +-DLWS_WITH_LIBUV=ON +-DLWS_WITHOUT_EXTENSIONS=OFF +" TERMUX_PKG_RM_AFTER_INSTALL="lib/pkgconfig/libwebsockets_static.pc" diff --git a/packages/ttyd/CMakeLists.txt.patch b/packages/ttyd/CMakeLists.txt.patch deleted file mode 100644 index a7efe33fc..000000000 --- a/packages/ttyd/CMakeLists.txt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../ttyd-1.4.2/CMakeLists.txt ./CMakeLists.txt ---- ../ttyd-1.4.2/CMakeLists.txt 2018-09-12 04:18:04.000000000 +0000 -+++ ./CMakeLists.txt 2018-09-14 19:21:53.229336188 +0000 -@@ -70,7 +70,7 @@ - list(APPEND SOURCE_FILES html.h) - - set(INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR} ${LIBWEBSOCKETS_INCLUDE_DIR} ${JSON-C_INCLUDE_DIR}) --set(LINK_LIBS pthread ${OPENSSL_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES} ${JSON-C_LIBRARY}) -+set(LINK_LIBS ${OPENSSL_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES} ${JSON-C_LIBRARY}) - - if(NOT APPLE) - list(APPEND LINK_LIBS util) diff --git a/packages/ttyd/build.sh b/packages/ttyd/build.sh index 1556aa9c8..ba521da3c 100644 --- a/packages/ttyd/build.sh +++ b/packages/ttyd/build.sh @@ -1,11 +1,10 @@ TERMUX_PKG_HOMEPAGE=https://tsl0922.github.io/ttyd/ TERMUX_PKG_DESCRIPTION="Command-line tool for sharing terminal over the web" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=1.5.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1.6.0 TERMUX_PKG_SRCURL=https://github.com/tsl0922/ttyd/archive/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=b5b62ec2ce08add0173e6d1dfdd879e55f02f9490043e89f389981a62e87d376 -TERMUX_PKG_DEPENDS="json-c, libwebsockets" +TERMUX_PKG_SHA256=d14740bc82be0d0760dd0a3c97acbcbde490412a4edc61edabe46d311b068f83 +TERMUX_PKG_DEPENDS="json-c, libuv, libwebsockets, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_XXD=$TERMUX_PKG_TMPDIR/xxd" termux_step_pre_configure() { diff --git a/packages/ttyd/src-utils.c.patch b/packages/ttyd/src-utils.c.patch deleted file mode 100644 index 97e42f2c8..000000000 --- a/packages/ttyd/src-utils.c.patch +++ /dev/null @@ -1,14 +0,0 @@ -Submitted for upstream in https://github.com/tsl0922/ttyd/pull/253 - -diff -u -r ../ttyd-1.4.2/src/utils.c ./src/utils.c ---- ../ttyd-1.4.2/src/utils.c 2018-09-12 04:18:04.000000000 +0000 -+++ ./src/utils.c 2018-09-14 19:18:03.508092637 +0000 -@@ -5,7 +5,7 @@ - #include - #include - --#ifdef __linux__ -+#if defined(__linux__) && !defined(__ANDROID__) - // https://github.com/karelzak/util-linux/blob/master/misc-utils/kill.c - const char *sys_signame[NSIG] = { - "zero", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "UNUSED",