From 5573f2b8adc4e4b9ae0221c045e95276277401d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Fri, 29 Jan 2016 23:01:34 +0100 Subject: testing/tint2: upgrade to 0.12.6 --- testing/tint2/APKBUILD | 26 ++++++++++++++++++++------ testing/tint2/musl-fixes.patch | 16 ++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 testing/tint2/musl-fixes.patch diff --git a/testing/tint2/APKBUILD b/testing/tint2/APKBUILD index be3cb1036..bfaf040db 100644 --- a/testing/tint2/APKBUILD +++ b/testing/tint2/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel # Maintainer: pkgname=tint2 -pkgver=0.12.3 +pkgver=0.12.6 pkgrel=0 pkgdesc="tint2 is a simple unintrusive panel/taskbar" url="https://gitlab.com/o9000/tint2" @@ -16,9 +16,20 @@ depends_dev="cmake imlib2-dev glib-dev pango-dev cairo-dev makedepends="$depends_dev" install="" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://gitlab.com/o9000/${pkgname}/repository/archive.tar.gz?ref=${pkgver}" +source="$pkgname-$pkgver.tar.gz::https://gitlab.com/o9000/${pkgname}/repository/archive.tar.gz?ref=${pkgver} + musl-fixes.patch" + +_builddir="$srcdir"/$pkgname-$pkgver-117ffb2bfda625b44d4c833f882b727eddeb6add +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p0 -i "$srcdir"/$i || return 1;; + esac + done +} -_builddir="$srcdir"/$pkgname-$pkgver-5f4154408953a75458e7c5125ef3b9fdfe86ff0a build() { cd "$_builddir" cmake \ @@ -37,6 +48,9 @@ package() { make DESTDIR="${pkgdir}" install || return 1 } -md5sums="b0ec14b4f0c9dfd61a6956be1b0cc01e tint2-0.12.3.tar.gz" -sha256sums="7f1f7cdb8eecfaaac620589c327bf29def457a9d38cee587769c93aacd2a3e36 tint2-0.12.3.tar.gz" -sha512sums="f847691e2b9ba9148374fe24836655d25ef05ae9a04525593d4595d647e404c68b619308a0b9da77ccc9b2633547bec16b57e77b859a56161ca91754bbd8416e tint2-0.12.3.tar.gz" +md5sums="f46484d777640965f4deaa36e5b27306 tint2-0.12.6.tar.gz +cfbb1a843981f796e7c50b510b167844 musl-fixes.patch" +sha256sums="7f40cf36f0e579b9d81651aff09e470b4cbae496accc905e91cdda1fdaf57e9f tint2-0.12.6.tar.gz +03d4ae8516d59fc58d992b5b134c8cae11bf74b55b52832063dd684694bec696 musl-fixes.patch" +sha512sums="7e8a476163ccd2902acb53db361af1739f047ba41d72f22c7836856126e6ed17ac62f06bb2f62a93642979f1b916b6b99d72e64a1b73e24fc53bca4dfc3c8016 tint2-0.12.6.tar.gz +6dc60882cadcc3b5acb9b12cd894024daef9be9854716826b74977d5c476fd0c0ddafe11a2ed18f4368a73e2c53f3bd97cadace350a04de7d81a7ee52d4809be musl-fixes.patch" diff --git a/testing/tint2/musl-fixes.patch b/testing/tint2/musl-fixes.patch new file mode 100644 index 000000000..6d1aeee7b --- /dev/null +++ b/testing/tint2/musl-fixes.patch @@ -0,0 +1,16 @@ +--- src/util/common.c.orig 2016-01-29 08:21:02.000701749 +0100 ++++ src/util/common.c 2016-01-29 08:21:49.545577920 +0100 +@@ -38,9 +38,12 @@ + #include + #include + #include +-#include + #include + ++#if !defined(__linux__) || defined(__linux__) && defined(__GLIBC__) ++#include ++#endif ++ + #ifdef HAVE_RSVG + #include + #endif -- cgit v1.2.3