From 2d2a730f92988dc8ef8e5bc41cdd78a7ca1a9817 Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Fri, 4 Dec 2015 07:38:26 +0000
Subject: main/conky: upgrade to 1.10.1. Fixes #4919

---
 main/conky/APKBUILD | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'main/conky/APKBUILD')

diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index 3a3ca5ac87..347eaa8575 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=conky
-pkgver=1.10.0
-pkgrel=1
+pkgver=1.10.1
+pkgrel=0
 pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
 url="http://conky.sourceforge.net/"
 arch="all"
@@ -12,11 +12,7 @@ makedepends="alsa-lib-dev libxml2-dev curl-dev wireless-tools-dev
 	cairo-dev tolua++ ncurses-dev linux-headers cmake gawk
 	"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz
-	musl-fixes.patch
-	posix-awk.patch
-	0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -28,6 +24,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	sed -i -e '32 iinclude(CheckIncludeFile)' CMakeLists.txt 
 }
 
 build() {
@@ -53,15 +50,6 @@ package() {
 	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums="cdc0298e5f257829d574ae8114170d9b  conky-1.10.0.tar.gz
-033686de05697157dbd04f08f7b7eb03  musl-fixes.patch
-a2b1463fe06741f1e0707e130eb57700  posix-awk.patch
-9f6688a7ffe94b22ce4b30a2b493498c  0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch"
-sha256sums="f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb  conky-1.10.0.tar.gz
-5f5d7b0aaed99199ccc628d482b30ccce228e15fa4f9794bf01dda9a05587691  musl-fixes.patch
-c23d2df3c0250162ce16cb718fe4c87e171bc58baf29ad8898df5387888f1718  posix-awk.patch
-235ce40d1915a970b8962ff0cbbda71d0236cd57a8f764b9cbc63926b21bce49  0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch"
-sha512sums="08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf  conky-1.10.0.tar.gz
-8753e171d143cfcd4e34187d3edbe6b1d92846319c9732931dd9addd1c9da65d88e7318dc49244db08462100cf527e1a07ddd3e005d669c551460cbfaff19ed4  musl-fixes.patch
-7508ddbfa0610d54a030563bd173ec496d5a0279cab410308e15adc558416d14ff322687bd88d5a7b76d17d8d948e117993d655790a4cc6bb3650ab4ba530f9f  posix-awk.patch
-b5593dd088ac7c9351b4426b9ba55b87c819aecad5a62b48496325e0e8c1cca768559d2513cc29bf1dca273abbf6db5f80086b05016cc36a9870edc08184a002  0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch"
+md5sums="e871fd229a6e9804cfe23fc76d4bef11  conky-1.10.1.tar.gz"
+sha256sums="b4e66a71e8211d02b8dbe8cd4873af209af25326e63afd90c90ba9416c79cf21  conky-1.10.1.tar.gz"
+sha512sums="bcd3efa722fcd1d264157843fac0e9c5e5e0aa881f38b676cb1634efe57c3f07c535f063c0c9eba7bcd5deebf7b8e87099856fc5092cd01955c09b70e155cfd2  conky-1.10.1.tar.gz"
-- 
cgit v1.2.3