diff options
-rw-r--r-- | user/weechat/APKBUILD | 25 | ||||
-rw-r--r-- | user/weechat/libintl-fix.patch | 12 |
2 files changed, 15 insertions, 22 deletions
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index a19b53ddc..9daf1fd72 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,22 +2,23 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> pkgname=weechat -pkgver=2.6 +pkgver=2.7 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" arch="all" options="!check" # requires all plugins be built. license="GPL-3.0+" +depends="" depends_dev="cmake aspell-dev curl-dev gnutls-dev libgcrypt-dev lua5.3-dev - ncurses-dev perl-dev python3-dev zlib-dev" -makedepends="$depends_dev" + ncurses-dev perl-dev python3-dev ruby-dev tcl-dev zlib-dev guile-dev + tk-dev" checkdepends="cpputest" +makedepends="$depends_dev asciidoctor" subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin - $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang" -source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz - libintl-fix.patch - " + $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-ruby:_plugin + $pkgname-tcl:_plugin $pkgname-guile:_plugin $pkgname-doc $pkgname-lang" +source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz" # secfixes: # 1.7.1-r0: @@ -26,7 +27,12 @@ source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz # - CVE-2017-14727 build() { - cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON -Bbuild . + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_JAVASCRIPT=OFF \ + -DENABLE_MAN=ON \ + -DENABLE_PHP=OFF \ + -Bbuild . make -C build } @@ -52,5 +58,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="47698f9b275c4fad68cc786cf0739e6f7355428abf57b94e64df84725b001546783f4e6389d0ed51ff5108c50c48dba344c22da9f43bc6f6f90acedacc3e84a5 weechat-2.6.tar.gz -59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" +sha512sums="7a9205b6a3b7e338b14708e1b9aad4f2099506c46b1e86faf4fa94a105bc20b056a53ce3d003ae31ea1cdbab711ddd9dca7258a7d03f0f7af3703ebdbdfeb3d9 weechat-2.7.tar.gz" diff --git a/user/weechat/libintl-fix.patch b/user/weechat/libintl-fix.patch deleted file mode 100644 index a67cb37b6..000000000 --- a/user/weechat/libintl-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -libc gettext is never sufficient on musl - ---- weechat-1.9/CMakeLists.txt.old 2017-06-25 03:20:52.000000000 -0500 -+++ weechat-1.9/CMakeLists.txt 2017-09-13 02:30:43.577284569 -0500 -@@ -162,6 +162,7 @@ - find_package(Gettext) - if(GETTEXT_FOUND) - add_definitions(-DENABLE_NLS) -+ list(APPEND EXTRA_LIBS intl) - endif() - endif() - |