summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-10-18 18:08:13 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-10-18 18:09:10 +0200
commitbabb4b8ed47e01f09cd965c8f384c6bda86646d5 (patch)
tree892ab18abaaac75baa58976d8b2aa5fefb1481e6
parent223f6b8f2f6bec7d3699adce6f35efdeb9302b1b (diff)
transmission: add a better patch
-rw-r--r--package/transmission/Makefile2
-rw-r--r--package/transmission/patches/0001-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch26
-rw-r--r--package/transmission/patches/patch-libtransmission_platform-quota_c11
3 files changed, 27 insertions, 12 deletions
diff --git a/package/transmission/Makefile b/package/transmission/Makefile
index c55760760..8fed6d204 100644
--- a/package/transmission/Makefile
+++ b/package/transmission/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= torrent client
PKG_SECTION:= app/p2p
PKG_DEPENDS:= libressl libevent libcurl
PKG_BUILDDEP:= libressl libevent curl
-PKG_NEEDS:= threads
+PKG_NEEDS:= threads c++
PKG_URL:= http://www.transmissionbt.com
PKG_SITES:= http://download.transmissionbt.com/files/
diff --git a/package/transmission/patches/0001-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch b/package/transmission/patches/0001-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
new file mode 100644
index 000000000..9ea364540
--- /dev/null
+++ b/package/transmission/patches/0001-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
@@ -0,0 +1,26 @@
+From e6f8e571c2014602d9edd68e1e58d38fed59c2b4 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@uclibc-ng.org>
+Date: Sun, 16 Oct 2016 17:33:23 +0200
+Subject: [PATCH] uClibc-ng since 1.0.18 has sys/quota.h synced with GNU libc
+
+Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
+---
+ libtransmission/platform-quota.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtransmission/platform-quota.c b/libtransmission/platform-quota.c
+index 58c518a..e14ec1b 100644
+--- a/libtransmission/platform-quota.c
++++ b/libtransmission/platform-quota.c
+@@ -284,7 +284,7 @@ getquota (const char * device)
+ spaceused = (int64_t) dq.dqb_curblocks >> 1;
+ #elif defined(__APPLE__)
+ spaceused = (int64_t) dq.dqb_curbytes;
+-#elif defined(__UCLIBC__)
++#elif defined (__UCLIBC__) && !TR_UCLIBC_CHECK_VERSION (1, 0, 17)
+ spaceused = (int64_t) btodb(dq.dqb_curblocks);
+ #elif defined(__sun) || (defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION < 2)
+ spaceused = (int64_t) dq.dqb_curblocks >> 1;
+--
+2.7.4 (Apple Git-66)
+
diff --git a/package/transmission/patches/patch-libtransmission_platform-quota_c b/package/transmission/patches/patch-libtransmission_platform-quota_c
deleted file mode 100644
index dd6c09760..000000000
--- a/package/transmission/patches/patch-libtransmission_platform-quota_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- transmission-2.92.orig/libtransmission/platform-quota.c 2015-03-27 13:44:20.469243994 +0100
-+++ transmission-2.92/libtransmission/platform-quota.c 2016-09-30 19:08:06.279386697 +0200
-@@ -285,8 +285,6 @@ getquota (const char * device)
- spaceused = (int64_t) dq.dqb_curblocks >> 1;
- #elif defined(__APPLE__)
- spaceused = (int64_t) dq.dqb_curbytes;
--#elif defined(__UCLIBC__)
-- spaceused = (int64_t) btodb(dq.dqb_curblocks);
- #elif defined(__sun) || (defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION < 2)
- spaceused = (int64_t) dq.dqb_curblocks >> 1;
- #else