Hello community, here is the log from the commit of package aria2 for openSUSE:Factory checked in at 2012-03-22 12:31:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aria2 (Old) and /work/SRC/openSUSE:Factory/.aria2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aria2", Maintainer is "po...@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aria2/aria2.changes 2012-03-20 11:25:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aria2.new/aria2.changes 2012-03-22 12:31:11.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 20 21:44:22 UTC 2012 - bo...@steki.net + +- Add aria2-1.14.2-gcc47.patch: Fix build with gcc 4.7 + +------------------------------------------------------------------- New: ---- aria2-1.14.2-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aria2.spec ++++++ --- /var/tmp/diff_new_pack.8RHLWv/_old 2012-03-22 12:31:12.000000000 +0100 +++ /var/tmp/diff_new_pack.8RHLWv/_new 2012-03-22 12:31:12.000000000 +0100 @@ -50,6 +50,8 @@ Patch1: aria2-cares-static.patch Patch2: aria2-cares-lib64.patch Patch4: aria2-atoi.patch +# PATCH-FIX-UPSTREAM aria2-1.14.2-gcc47.patch -- fix for gcc 4.7 building issue +Patch5: aria2-1.14.2-gcc47.patch Url: http://sourceforge.net/projects/aria2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version:1} @@ -153,6 +155,7 @@ %endif #%_lib==lib64 %endif #cares %patch4 +%patch5 %build export CFLAGS="%{optflags} -DPIC -fPIC" ++++++ aria2-1.14.2-gcc47.patch ++++++ Index: src/util.h =================================================================== --- src/util.h.orig 2012-02-27 13:58:33.000000000 +0100 +++ src/util.h 2012-03-20 22:34:26.039899602 +0100 @@ -111,48 +111,6 @@ std::string nativeToUtf8(const std::stri namespace util { -template<typename InputIterator> -void divide -(std::pair<std::pair<InputIterator, InputIterator>, - std::pair<InputIterator, InputIterator> >& hp, - InputIterator first, - InputIterator last, - char delim) -{ - InputIterator dpos = std::find(first, last, delim); - if(dpos == last) { - hp.first = stripIter(first, last); - hp.second.first = hp.second.second; - } else { - hp.first = stripIter(first, dpos); - hp.second = stripIter(dpos+1, last); - } -} - -template<typename T> -std::string uitos(T value, bool comma = false) -{ - std::string str; - if(value == 0) { - str = "0"; - return str; - } - int count = 0; - while(value) { - ++count; - char digit = value%10+'0'; - if(comma && count > 3 && count%3 == 1) { - str += ","; - } - str += digit; - value /= 10; - } - std::reverse(str.begin(), str.end()); - return str; -} - -std::string itos(int64_t value, bool comma = false); - /** * Computes difference in micro-seconds between tv1 and tv2, * assuming tv1 is newer than tv2. @@ -204,6 +162,48 @@ InputIterator lstripIter DEFAULT_STRIP_CHARSET.begin(), DEFAULT_STRIP_CHARSET.end()); } +template<typename InputIterator> +void divide +(std::pair<std::pair<InputIterator, InputIterator>, + std::pair<InputIterator, InputIterator> >& hp, + InputIterator first, + InputIterator last, + char delim) +{ + InputIterator dpos = std::find(first, last, delim); + if(dpos == last) { + hp.first = stripIter(first, last); + hp.second.first = hp.second.second; + } else { + hp.first = stripIter(first, dpos); + hp.second = stripIter(dpos+1, last); + } +} + +template<typename T> +std::string uitos(T value, bool comma = false) +{ + std::string str; + if(value == 0) { + str = "0"; + return str; + } + int count = 0; + while(value) { + ++count; + char digit = value%10+'0'; + if(comma && count > 3 && count%3 == 1) { + str += ","; + } + str += digit; + value /= 10; + } + std::reverse(str.begin(), str.end()); + return str; +} + +std::string itos(int64_t value, bool comma = false); + std::string strip (const std::string& str, const std::string& chars = DEFAULT_STRIP_CHARSET); Index: src/common.h =================================================================== --- src/common.h.orig 2011-10-25 15:45:06.000000000 +0200 +++ src/common.h 2012-03-20 22:37:02.074961079 +0100 @@ -86,5 +86,6 @@ typedef _off_t off_t; #define __STDC_LIMIT_MACROS // included here for compatibility issues with old compiler/libraries. #include <stdint.h> - +// ssize_t req gcc 4.7 +#include<sys/types.h> #endif // D_COMMON_H -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
