aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-12-26 18:33:15 +0100
committerJakub Jirutka <jakub@jirutka.cz>2017-12-26 18:41:52 +0100
commit3b08d11b92dba14d7b938d6a49d0943d0644da8d (patch)
treeb9e28c69606c1ed772351da4a018a3a32788f815
parent5489caece42b351d7921479518686848fad1013e (diff)
downloadaports-3b08d11b92dba14d7b938d6a49d0943d0644da8d.tar.gz
aports-3b08d11b92dba14d7b938d6a49d0943d0644da8d.tar.bz2
aports-3b08d11b92dba14d7b938d6a49d0943d0644da8d.tar.xz
main/weechat: fix detection of ruby 2.5
-rw-r--r--main/weechat/APKBUILD6
-rw-r--r--main/weechat/detect-ruby2.5.patch32
2 files changed, 36 insertions, 2 deletions
diff --git a/main/weechat/APKBUILD b/main/weechat/APKBUILD
index ab43bae629..cc3034f8bb 100644
--- a/main/weechat/APKBUILD
+++ b/main/weechat/APKBUILD
@@ -11,7 +11,8 @@ 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"
+source="http://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz
+ detect-ruby2.5.patch"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
@@ -57,4 +58,5 @@ check() {
./tools/build-test.sh cmake
}
-sha512sums="e3ccea69aa71b055800bf1cd60f56511a934c227a7c2e17b5fd82d22cced89063c2e8ca4622489fcd2008c6618a00f7468d4a07f7c210f98a4dbe4969cf754b2 weechat-2.0.1.tar.gz"
+sha512sums="e3ccea69aa71b055800bf1cd60f56511a934c227a7c2e17b5fd82d22cced89063c2e8ca4622489fcd2008c6618a00f7468d4a07f7c210f98a4dbe4969cf754b2 weechat-2.0.1.tar.gz
+a7051f188730c380eed3f419513fc7b4666d6cd7efefc9f600c3ac0b430083558c64483d6b0c63b73293751c99d83d0a0926dd6cc2729e214a297369b294e6fd detect-ruby2.5.patch"
diff --git a/main/weechat/detect-ruby2.5.patch b/main/weechat/detect-ruby2.5.patch
new file mode 100644
index 0000000000..33c04cb77e
--- /dev/null
+++ b/main/weechat/detect-ruby2.5.patch
@@ -0,0 +1,32 @@
+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)