diff options
| author | prspkt <prspkt@protonmail.com> | 2019-09-09 04:50:02 +0300 |
|---|---|---|
| committer | prspkt <prspkt@protonmail.com> | 2019-09-09 04:53:33 +0300 |
| commit | 56fabe44397f08a0ad88d7e81749d8c91c89b4b2 (patch) | |
| tree | c14046b17d6a81351d4a8ecda0c9269ba066237c /community | |
| parent | 546abdabac2a42913b7812eebca689efa63dd025 (diff) | |
| download | aports-56fabe44397f08a0ad88d7e81749d8c91c89b4b2.tar.bz2 aports-56fabe44397f08a0ad88d7e81749d8c91c89b4b2.tar.xz | |
community/weechat: modernize
* Patch for ruby version detection is not required, remove.
Signed-off-by: prspkt <prspkt@protonmail.com>
Diffstat (limited to 'community')
| -rw-r--r-- | community/weechat/APKBUILD | 6 | ||||
| -rw-r--r-- | community/weechat/detect-ruby2.5.patch | 32 |
2 files changed, 0 insertions, 38 deletions
diff --git a/community/weechat/APKBUILD b/community/weechat/APKBUILD index edd60d238e..40e0c194e9 100644 --- a/community/weechat/APKBUILD +++ b/community/weechat/APKBUILD @@ -13,7 +13,6 @@ makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-ruby:_plugin" source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" # secfixes: # 1.7.1-r0: @@ -22,7 +21,6 @@ builddir="$srcdir/$pkgname-$pkgver" # - CVE-2017-14727 build() { - cd "$builddir" mkdir -p build cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON @@ -40,9 +38,6 @@ _plugin() { pkgdesc="WeeChat $_name plugin" depends="weechat" - if [ "$_name" = python2 ]; then - depends="$depends python2" - fi # as of 2.5 aspell has been renamed to spell on weechat upstream # since it now supports enchant as well, rename the subpackage and @@ -57,7 +52,6 @@ _plugin() { } check() { - cd "$builddir" ./tools/build-test.sh cmake } diff --git a/community/weechat/detect-ruby2.5.patch b/community/weechat/detect-ruby2.5.patch deleted file mode 100644 index 33c04cb77e..0000000000 --- a/community/weechat/detect-ruby2.5.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cb98f528301c422bdf990bdba1108e53a86ea4db Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Tue, 26 Dec 2017 18:30:18 +0100 -Subject: [PATCH] core: add detection for Ruby 2.5 - -Upstream-Issue: https://github.com/weechat/weechat/pull/1122 ---- - cmake/FindRuby.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake -index 673dde716..49bce219a 100644 ---- a/cmake/FindRuby.cmake -+++ b/cmake/FindRuby.cmake -@@ -33,7 +33,7 @@ endif() - - find_package(PkgConfig) - if(PKG_CONFIG_FOUND) -- pkg_search_module(RUBY ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8) -+ pkg_search_module(RUBY ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8) - endif() - - if(RUBY_FOUND) -@@ -41,7 +41,7 @@ if(RUBY_FOUND) - mark_as_advanced(RUBY_LIB) - else() - find_program(RUBY_EXECUTABLE -- NAMES ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby -+ NAMES ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) - if(RUBY_EXECUTABLE) |