From 0d03f58c5dd381d64a1d8c5c0d56a540c6e860bd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 5 Oct 2019 03:58:15 +0000
Subject: user/weechat: bump to 2.6

---
 user/weechat/APKBUILD | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to 'user/weechat/APKBUILD')

diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index e5f49da9d..d18e9cf69 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: zlg <zlg+adelie@zlg.space>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=weechat
-pkgver=2.5
-pkgrel=1
+pkgver=2.6
+pkgrel=0
 pkgdesc="Fast, light, extensible ncurses-based chat client"
 url="https://www.weechat.org"
 arch="all"
@@ -17,7 +17,6 @@ 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
-	python.patch
 	"
 
 # secfixes:
@@ -26,22 +25,18 @@ source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz
 #   1.9.1-r0:
 #   - CVE-2017-14727
 
-prepare() {
-	cd "$builddir"
-	default_prepare
+build() {
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON -Bbuild .
+	make -C build
 }
 
-build() {
-	cd "$builddir"
-	mkdir -p build
-	cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON
-	make
+check() {
+	cd "$builddir"/build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir/" install
+	make DESTDIR="$pkgdir/" -C build install
 }
 
 _plugin() {
@@ -57,11 +52,5 @@ _plugin() {
 	mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir
 }
 
-check() {
-	cd "$builddir"/build
-	ctest -V
-}
-
-sha512sums="1bf16c76e63668fc6d4b72d521f71980717b08bd2abc5c7f0825af32e6de9327c5c967067bfb025a0404eee627f54cecdd9f1f2b3618ea7a08798d8510a2487b  weechat-2.5.tar.gz
-59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca  libintl-fix.patch
-b77bd5f31bf4547d1d5505fec5018b867f0b597ed0b6819d4ed0ff6a2b7f664f2308f6c1b094debc381673b4de6208f09ca36da3413eb72f40aca9924464d746  python.patch"
+sha512sums="47698f9b275c4fad68cc786cf0739e6f7355428abf57b94e64df84725b001546783f4e6389d0ed51ff5108c50c48dba344c22da9f43bc6f6f90acedacc3e84a5  weechat-2.6.tar.gz
+59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca  libintl-fix.patch"
-- 
cgit v1.2.3-70-g09d2