diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-02-13 17:24:37 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-02-13 17:25:19 +0100 |
| commit | dedd3000322b939e1c62898f7e8bcb7af671db42 (patch) | |
| tree | 81f5b544250d7cedea317533240d57d5096b5c51 /main | |
| parent | 754d1d2a03eb0467f5f7a7933f0305346bb21b2e (diff) | |
| download | aports-dedd3000322b939e1c62898f7e8bcb7af671db42.tar.bz2 aports-dedd3000322b939e1c62898f7e8bcb7af671db42.tar.xz | |
main/weechat: add support for ruby-2.4 and clean-up abuild
Diffstat (limited to 'main')
| -rw-r--r-- | main/weechat/APKBUILD | 20 | ||||
| -rw-r--r-- | main/weechat/ruby2.4.patch | 33 |
2 files changed, 42 insertions, 11 deletions
diff --git a/main/weechat/APKBUILD b/main/weechat/APKBUILD index e98ca240d4..7efb64fa69 100644 --- a/main/weechat/APKBUILD +++ b/main/weechat/APKBUILD @@ -7,18 +7,17 @@ pkgdesc="A fast, light, extensible ncurses-based chat client" url="http://www.weechat.org" arch="all" license="GPL3+" -depends="" depends_dev="cmake libintl ncurses-dev gnutls-dev libgcrypt-dev curl-dev - aspell-dev lua-dev perl-dev python2-dev ruby-dev" + aspell-dev lua-dev perl-dev python2-dev ruby-dev" makedepends="$depends_dev" -install="" subpackages="$pkgname-dev $pkgname-aspell:_plugin $pkgname-lua:_plugin - $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-ruby:_plugin" -source="http://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz" + $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-ruby:_plugin" +source="http://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz + ruby2.4.patch" +builddir="$srcdir/$pkgname-$pkgver" -_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" + cd "$builddir" mkdir -p build cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON || return 1 @@ -26,7 +25,7 @@ build() { } package() { - cd "$_builddir"/build + cd "$builddir"/build make DESTDIR="$pkgdir/" install || return 1 } @@ -44,6 +43,5 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -md5sums="a3fc944779f9fe99675d80859ed801a0 weechat-1.7.tar.gz" -sha256sums="d761aa50141cbd5f3e375665c7b84ee5da4516ee467831633b68adbc374d42eb weechat-1.7.tar.gz" -sha512sums="a717be0ab2735f5a8c30e343f6620e671fbcbcf24d49bf6946c86c85481da2ea2c5257e016d5475255bbb33d6f38949998b1d040435ea87bd1d6599bb0e98e39 weechat-1.7.tar.gz" +sha512sums="a717be0ab2735f5a8c30e343f6620e671fbcbcf24d49bf6946c86c85481da2ea2c5257e016d5475255bbb33d6f38949998b1d040435ea87bd1d6599bb0e98e39 weechat-1.7.tar.gz +1ba2c7990b758bd58562983f186251061669ba1b00d5d4b4c03e3c88f2642006cdcbff28933b50288c95998e432ae37cefeac861044af2e0e43a28e8ae847aac ruby2.4.patch" diff --git a/main/weechat/ruby2.4.patch b/main/weechat/ruby2.4.patch new file mode 100644 index 0000000000..6c23517921 --- /dev/null +++ b/main/weechat/ruby2.4.patch @@ -0,0 +1,33 @@ +From 9ed4f2a9a68e77e6919b9659684fca6d20c4d8ac Mon Sep 17 00:00:00 2001 +From: Tim Harder <radhermit@gmail.com> +Date: Tue, 24 Jan 2017 14:33:02 -0500 +Subject: [PATCH] core: add detection for Ruby 2.4 + +Alpine notes: +* Backported from upstream: https://github.com/weechat/weechat/pull/895 +--- + cmake/FindRuby.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake +index 650251b..673dde7 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.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8) ++ 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) + endif() + + if(RUBY_FOUND) +@@ -41,7 +41,7 @@ if(RUBY_FOUND) + mark_as_advanced(RUBY_LIB) + else() + find_program(RUBY_EXECUTABLE +- NAMES 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.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) |