~alpine/aports

main/task: new upstream version 2.5.0 v1 PROPOSED

Christian Kampka: 1
 main/task: new upstream version 2.5.0

 2 files changed, 23 insertions(+), 27 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.alpinelinux.org/~alpine/aports/patches/1564/mbox | git am -3
Learn more about email & git

[alpine-aports] [PATCH] main/task: new upstream version 2.5.0 Export this patch

---
 main/task/APKBUILD       | 14 +++++++-------
 main/task/musl-fix.patch | 36 ++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/main/task/APKBUILD b/main/task/APKBUILD
index cfc24a6..56ace83 100644
--- a/main/task/APKBUILD
+++ b/main/task/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=task
pkgver=2.4.4
pkgver=2.5.0
pkgrel=0
pkgdesc="A command-line to do list manager"
url="http://taskwarrior.org"
@@ -40,9 +40,9 @@ package() {
	make install DESTDIR="$pkgdir"
}

md5sums="517450c4a23a5842df3e9905b38801b3  task-2.4.4.tar.gz
1e826dcc0aa6a0c08a6e2b7c450945cd  musl-fix.patch"
sha256sums="7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b  task-2.4.4.tar.gz
60ece7d726ad383434a802dbfb6d4479200457031e879af0c95e3dd416d562fb  musl-fix.patch"
sha512sums="23565dc21bb5a05af5fe44235756ac5ecbd3b7cd94b2edc2ed0b0bd4efc5a12739cc8e3474174878595188ba726428b865dee3a79f0ad2550d5a0bc25415b103  task-2.4.4.tar.gz
d9e704d47cb1e5a151b39d2733b40fe9a8503d08329bbc4dbe385c59b0dfe6fb60f59888aa10f5139937cd0012326606c9edbdd0677af444d1e66d8c867cceb7  musl-fix.patch"
md5sums="bca2a8a6f7727ccbcefd5e190d935910  task-2.5.0.tar.gz
b26dba3e7e248ec8c22d820bc7b269c4  musl-fix.patch"
sha256sums="4d8e67415a6993108c11b8eeef99b76a991af11b22874adbb7ae367e09334636  task-2.5.0.tar.gz
49b486a30c18660bb6b2544e920f0015db81a8cebee1bc22a3684ada2c0430ab  musl-fix.patch"
sha512sums="911ed33553c71d0578dda20774ff1c5762700957ed637ed849ef51c4cd00a53feabc18c477dbc4b618371d9ddc8fec71795f96d8474acbec8a91be8bb1ff1bfd  task-2.5.0.tar.gz
f82f9883ef6c885635890453fbb5c1dc4d4bf4b69926962a643bcaeadeb80874200329c3916b9796d26fd5f28eb9ad20f50fe7e4adc9f9ca635aa4b50be81911  musl-fix.patch"
diff --git a/main/task/musl-fix.patch b/main/task/musl-fix.patch
index 4cc5869..54a5167 100644
--- a/main/task/musl-fix.patch
+++ b/main/task/musl-fix.patch
@@ -1,20 +1,16 @@
diff --git a/src/Path.cpp b/src/Path.cpp
index 94657e2..6a82199 100644
--- a/src/Path.cpp
+++ b/src/Path.cpp
@@ -38,6 +38,15 @@
 #include <Directory.h>
 #include <Path.h>
 
+/* fixes build with musl libc */
+#ifndef GLOB_TILDE
+#define GLOB_TILDE 0
+#endif
+
+#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 std::ostream& operator<< (std::ostream& out, const Path& path)
 {
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index c67ed44..72da081 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -36,11 +36,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#if (defined OPENBSD || defined SOLARIS || defined NETBSD)
 #include <errno.h>
-#else
-#include <sys/errno.h>
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
-- 
2.6.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---