diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-02-12 10:58:25 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-02-12 11:59:31 -0300 |
| commit | 8b4ef97cee541a0bbb815d15d6be2fb1f7e38b21 (patch) | |
| tree | 73554d50e0819a8a2822de5160bac44d7a5d7ae6 | |
| parent | dcf0532b217ff0324dd9cb5440045fffa603c1c0 (diff) | |
| download | aports-8b4ef97cee541a0bbb815d15d6be2fb1f7e38b21.tar.bz2 aports-8b4ef97cee541a0bbb815d15d6be2fb1f7e38b21.tar.xz | |
community/ttyd: upgrade to 1.6.0
| -rw-r--r-- | community/ttyd/APKBUILD | 13 | ||||
| -rw-r--r-- | community/ttyd/fix-cmake.patch | 23 |
2 files changed, 15 insertions, 21 deletions
diff --git a/community/ttyd/APKBUILD b/community/ttyd/APKBUILD index 172ee358c1..aef094482b 100644 --- a/community/ttyd/APKBUILD +++ b/community/ttyd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ttyd -pkgver=1.5.2 +pkgver=1.6.0 pkgrel=0 pkgdesc="Share your terminal over the web" url="https://tsl0922.github.io/ttyd" @@ -9,10 +9,11 @@ arch="all" license="MIT" # Note: vim is needed for tool xxd. makedepends="cmake json-c-dev bsd-compat-headers openssl-dev libwebsockets-dev - vim zlib-dev" + vim zlib-dev libuv-dev" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/tsl0922/$pkgname/archive/$pkgver.tar.gz - fix-cmake.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/tsl0922/ttyd/archive/$pkgver.tar.gz + fix-cmake.patch + " build() { mkdir -p build && cd build @@ -34,5 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1b2931fed58d338fc73b531afe7ae097b30e84d761137068207d0ebd13dd19a330d9d2ec919c0436a9244d2cbfb8e42f1f4bcf9a095fb04934defd08ba78203 ttyd-1.5.2.tar.gz -677f71abfec9e74db8f7976e6cb8c4eba052df71162390fa26e7c31f064a179d8587f07088eb0a5ada507a345b11af8d663162c77aad5e7fd129503eb15f83af fix-cmake.patch" +sha512sums="f713ebfc4b36784a9a66b2ed1c11386c6edb2acfe8030e60f589f0d4325a9c237001d47c0de9938fa3d4c8d58cd8e233ec7fe9760fcda6b9fa5a518a4f4b7c90 ttyd-1.6.0.tar.gz +c489436c976c0a598763d3ebedcd42a7b3715b2c07967d74aaaad1fca345f85699f78ca3b62f0d810da0a1c91e868b8011cd3f9b62b5d5ad0a6185a8c5b6075f fix-cmake.patch" diff --git a/community/ttyd/fix-cmake.patch b/community/ttyd/fix-cmake.patch index 274bfcb7ef..82d5cb87d5 100644 --- a/community/ttyd/fix-cmake.patch +++ b/community/ttyd/fix-cmake.patch @@ -1,20 +1,13 @@ -find_package doesn't find Libwebsockets (with capital "L"). Eventually it finds -libwebsockets with pkg-config, but includes libwebsockets.a on the path first, -so the resulting library links libwebsockets statically. - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8061f47..f9382ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13,11 +13,11 @@ - set(SOURCE_FILES src/server.c src/http.c src/protocol.c src/utils.c) +@@ -53,7 +53,7 @@ endif() find_package(OpenSSL REQUIRED) --find_package(Libwebsockets ${LIBWEBSOCKETS_MIN_VERSION} QUIET) -+find_package(libwebsockets ${LIBWEBSOCKETS_MIN_VERSION} QUIET) + find_package(ZLIB REQUIRED) +-find_package(Libwebsockets 1.7.0 QUIET) ++find_package(libwebsockets 1.7.0 QUIET) - find_package(PkgConfig) - --if(Libwebsockets_FOUND) -+if(libwebsockets_FOUND) - set(LIBWEBSOCKETS_INCLUDE_DIR ${LIBWEBSOCKETS_INCLUDE_DIR} ${LIBWEBSOCKETS_INCLUDE_DIRS}) - else() # try to find libwebsockets with pkg-config - pkg_check_modules(Libwebsockets REQUIRED libwebsockets>=${LIBWEBSOCKETS_MIN_VERSION}) + if(NOT Libwebsockets_FOUND) # for libwebsockets-dev on ubuntu 16.04 + find_path(LIBWEBSOCKETS_INCLUDE_DIR NAMES libwebsockets.h) |