[aria2/f17] 1.14.2 and gcc47 fixes
Tom Callaway
spot at fedoraproject.org
Wed Mar 21 20:48:40 UTC 2012
commit 11657d577bfde66ef9dcd24f772dede60481b07e
Author: Tom Callaway <spot at fedoraproject.org>
Date: Wed Mar 21 16:48:37 2012 -0400
1.14.2 and gcc47 fixes
aria2-1.14.2-gcc47.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++++
aria2.spec | 10 ++++++-
sources | 2 +-
3 files changed, 73 insertions(+), 3 deletions(-)
---
diff --git a/aria2-1.14.2-gcc47.patch b/aria2-1.14.2-gcc47.patch
new file mode 100644
index 0000000..f8a7b08
--- /dev/null
+++ b/aria2-1.14.2-gcc47.patch
@@ -0,0 +1,64 @@
+diff -up aria2-1.14.2/src/DHTConnection.h.gcc47 aria2-1.14.2/src/DHTConnection.h
+--- aria2-1.14.2/src/DHTConnection.h.gcc47 2012-03-21 16:40:43.254890487 -0400
++++ aria2-1.14.2/src/DHTConnection.h 2012-03-21 16:40:50.808828820 -0400
+@@ -37,6 +37,7 @@
+
+ #include "common.h"
+ #include <string>
++#include <unistd.h>
+
+ namespace aria2 {
+
+diff -up aria2-1.14.2/src/util.h.gcc47 aria2-1.14.2/src/util.h
+--- aria2-1.14.2/src/util.h.gcc47 2012-03-21 16:37:18.889559038 -0400
++++ aria2-1.14.2/src/util.h 2012-03-21 16:37:54.340269569 -0400
+@@ -111,6 +111,24 @@ std::string nativeToUtf8(const std::stri
+
+ namespace util {
+
++extern const std::string DEFAULT_STRIP_CHARSET;
++
++template<typename InputIterator>
++std::pair<InputIterator, InputIterator> stripIter
++(InputIterator first, InputIterator last,
++ const std::string& chars = DEFAULT_STRIP_CHARSET)
++{
++ for(; first != last &&
++ std::find(chars.begin(), chars.end(), *first) != chars.end(); ++first);
++ if(first == last) {
++ return std::make_pair(first, last);
++ }
++ InputIterator left = last-1;
++ for(; left != first &&
++ std::find(chars.begin(), chars.end(), *left) != chars.end(); --left);
++ return std::make_pair(first, left+1);
++}
++
+ template<typename InputIterator>
+ void divide
+ (std::pair<std::pair<InputIterator, InputIterator>,
+@@ -161,24 +179,6 @@ std::string itos(int64_t value, bool com
+ int64_t difftv(struct timeval tv1, struct timeval tv2);
+ int32_t difftvsec(struct timeval tv1, struct timeval tv2);
+
+-extern const std::string DEFAULT_STRIP_CHARSET;
+-
+-template<typename InputIterator>
+-std::pair<InputIterator, InputIterator> stripIter
+-(InputIterator first, InputIterator last,
+- const std::string& chars = DEFAULT_STRIP_CHARSET)
+-{
+- for(; first != last &&
+- std::find(chars.begin(), chars.end(), *first) != chars.end(); ++first);
+- if(first == last) {
+- return std::make_pair(first, last);
+- }
+- InputIterator left = last-1;
+- for(; left != first &&
+- std::find(chars.begin(), chars.end(), *left) != chars.end(); --left);
+- return std::make_pair(first, left+1);
+-}
+-
+ template<typename InputIterator>
+ InputIterator lstripIter
+ (InputIterator first, InputIterator last, char ch)
diff --git a/aria2.spec b/aria2.spec
index 07fc607..d799aa5 100644
--- a/aria2.spec
+++ b/aria2.spec
@@ -1,13 +1,14 @@
%define binname aria2c
Name: aria2
-Version: 1.14.0
-Release: 3%{?dist}
+Version: 1.14.2
+Release: 1%{?dist}
Summary: High speed download utility with resuming and segmented downloading
Group: Applications/Internet
License: GPLv2+ with exceptions
URL: http://aria2.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
+Patch0: aria2-1.14.2-gcc47.patch
BuildRequires: bison
BuildRequires: c-ares-devel cppunit-devel
BuildRequires: gettext gnutls-devel
@@ -37,6 +38,7 @@ Currently it has following features:
%prep
%setup -q
+%patch0 -p1 -b .gcc47
%build
%configure --enable-bittorrent \
@@ -67,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
%{_mandir}/*/man1/aria2c.1.gz
%changelog
+* Wed Mar 21 2012 Tom Callaway <spot at fedoraproject.org> - 1.14.2-1
+- update to 1.14.2
+- fix compile issues with gcc 4.7
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.0-3
- Rebuilt for c++ ABI breakage
diff --git a/sources b/sources
index d601a6f..4fe1fcb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a54546b20e67eff55dd79069d853f59 aria2-1.14.0.tar.xz
+906b91451a55bb101d86461356b2923c aria2-1.14.2.tar.xz
More information about the scm-commits
mailing list