diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-05-25 10:29:52 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-05-25 10:30:08 +0000 |
| commit | c08b9ea1fb5b14a88ec231d0bec646fe535c9c5a (patch) | |
| tree | 0e23abe5af1041b8499395f49dc2e450a464d559 | |
| parent | f80e732bdfcd12d610e4719d70f66283b8b828a7 (diff) | |
| download | aports-c08b9ea1fb5b14a88ec231d0bec646fe535c9c5a.tar.bz2 aports-c08b9ea1fb5b14a88ec231d0bec646fe535c9c5a.tar.xz | |
main/weechat: upgrade to 1.8
| -rw-r--r-- | main/weechat/APKBUILD | 11 | ||||
| -rw-r--r-- | main/weechat/ruby2.4.patch | 33 |
2 files changed, 4 insertions, 40 deletions
diff --git a/main/weechat/APKBUILD b/main/weechat/APKBUILD index d58876c2a5..6f6dfe52cf 100644 --- a/main/weechat/APKBUILD +++ b/main/weechat/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=weechat -pkgver=1.7.1 -pkgrel=1 +pkgver=1.8 +pkgrel=0 pkgdesc="A fast, light, extensible ncurses-based chat client" url="http://www.weechat.org" arch="all" @@ -12,9 +12,7 @@ depends_dev="cmake libintl ncurses-dev gnutls-dev libgcrypt-dev curl-dev makedepends="$depends_dev" 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 - ruby2.4.patch - " +source="http://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" # secfixes: @@ -53,5 +51,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="8fda4391c628874d10c2086cc671eda091d413a4d5aa6d6328b9d247b8e031e889a9e06b0a30931b3749c542bc4a4c327e41a2eb12c780e6f6e1cea45ecc78ea weechat-1.7.1.tar.gz -1ba2c7990b758bd58562983f186251061669ba1b00d5d4b4c03e3c88f2642006cdcbff28933b50288c95998e432ae37cefeac861044af2e0e43a28e8ae847aac ruby2.4.patch" +sha512sums="315074f6eb1495e7a0366d825657db48897c119842381d12da280b1ba6032eaee729b1b9c22cfb65b032d62a2c782bfd3c51c4cc06922373dc915b70f4801b10 weechat-1.8.tar.gz" diff --git a/main/weechat/ruby2.4.patch b/main/weechat/ruby2.4.patch deleted file mode 100644 index 6c23517921..0000000000 --- a/main/weechat/ruby2.4.patch +++ /dev/null @@ -1,33 +0,0 @@ -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) |