[csw-devel] SF.net SVN: gar:[13415] csw/mgar/pkg/aria2/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sun Feb 20 14:58:38 CET 2011
Revision: 13415
http://gar.svn.sourceforge.net/gar/?rev=13415&view=rev
Author: dmichelsen
Date: 2011-02-20 13:58:38 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
aria2: Add necessary patches
Modified Paths:
--------------
csw/mgar/pkg/aria2/trunk/Makefile
csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch
Added Paths:
-----------
csw/mgar/pkg/aria2/trunk/files/0003-Skip-Wall-for-Sun-Studio.patch
csw/mgar/pkg/aria2/trunk/files/0004-Include-string.h-if-available.patch
Modified: csw/mgar/pkg/aria2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/aria2/trunk/Makefile 2011-02-20 12:58:59 UTC (rev 13414)
+++ csw/mgar/pkg/aria2/trunk/Makefile 2011-02-20 13:58:38 UTC (rev 13415)
@@ -12,10 +12,15 @@
PATCHFILES += 0001-Remove-tailing-commas-in-enum.patch
PATCHFILES += 0002-Use-inttypes-if-stdint-is-not-available.patch
+PATCHFILES += 0003-Skip-Wall-for-Sun-Studio.patch
+PATCHFILES += 0004-Include-string.h-if-available.patch
# File name regex to get notifications about upstream software releases
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.xz
+EXTRA_CXXFLAGS += -library=stlport4
+EXTRA_CXXFLAGS += -features=zla
+
CONFIGURE_ARGS = $(DIRPATHS)
include gar/category.mk
Modified: csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch
===================================================================
--- csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch 2011-02-20 12:58:59 UTC (rev 13414)
+++ csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch 2011-02-20 13:58:38 UTC (rev 13415)
@@ -1,16 +1,21 @@
-From 226b1019fd220a305bc3e9f364685c3fb2ff584e Mon Sep 17 00:00:00 2001
+From 7aed90f76dc6fdebe217a61e3e7c6402cf4e0aae Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 2 Feb 2011 15:43:26 +0100
-Subject: [PATCH 2/2] Use inttypes if stdint is not available
+Date: Wed, 2 Feb 2011 16:51:41 +0100
+Subject: [PATCH] Use inttypes if stdint is not available
---
- src/DownloadResult.h | 8 +++++++-
- src/ProgressAwareEntry.h | 9 ++++++++-
- src/Segment.h | 9 ++++++++-
- src/TimeA2.h | 8 +++++++-
- src/TransferStat.h | 8 +++++++-
- src/common.h | 8 +++++++-
- 6 files changed, 44 insertions(+), 6 deletions(-)
+ src/DownloadResult.h | 8 +++++++-
+ src/FtpNegotiationCommand.cc | 13 ++++++++++++-
+ src/HttpResponse.h | 8 +++++++-
+ src/Piece.h | 9 ++++++++-
+ src/ProgressAwareEntry.h | 9 ++++++++-
+ src/Segment.h | 9 ++++++++-
+ src/SocketCore.cc | 4 ++++
+ src/TimeA2.h | 8 +++++++-
+ src/TransferStat.h | 8 +++++++-
+ src/common.h | 8 +++++++-
+ src/util.cc | 9 ++++++++-
+ 11 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/src/DownloadResult.h b/src/DownloadResult.h
index f224750..e62f925 100644
@@ -31,6 +36,69 @@
#include <string>
#include <vector>
+diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc
+index 7ad0934..514b19b 100644
+--- a/src/FtpNegotiationCommand.cc
++++ b/src/FtpNegotiationCommand.cc
+@@ -34,7 +34,18 @@
+ /* copyright --> */
+ #include "FtpNegotiationCommand.h"
+
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++# endif
++#endif
++
++#ifdef HAVE_STDLIB_H
++# include <stdlib.h>
++#endif
++
+ #include <cassert>
+ #include <utility>
+ #include <map>
+diff --git a/src/HttpResponse.h b/src/HttpResponse.h
+index f818e7c..30e9b7b 100644
+--- a/src/HttpResponse.h
++++ b/src/HttpResponse.h
+@@ -37,7 +37,13 @@
+
+ #include "common.h"
+
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++# endif
++#endif
+
+ #include "SharedHandle.h"
+ #include "TimeA2.h"
+diff --git a/src/Piece.h b/src/Piece.h
+index c9abbd3..4137101 100644
+--- a/src/Piece.h
++++ b/src/Piece.h
+@@ -37,7 +37,14 @@
+
+ #include "common.h"
+
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++# endif
++#endif
++
+ #include <vector>
+ #include <string>
+
diff --git a/src/ProgressAwareEntry.h b/src/ProgressAwareEntry.h
index 48f0ad0..d658ef1 100644
--- a/src/ProgressAwareEntry.h
@@ -71,6 +139,21 @@
#include <string>
#include "SharedHandle.h"
+diff --git a/src/SocketCore.cc b/src/SocketCore.cc
+index aba9db2..5ec281f 100644
+--- a/src/SocketCore.cc
++++ b/src/SocketCore.cc
+@@ -42,6 +42,10 @@
+ #include <cerrno>
+ #include <cstring>
+
++#ifdef HAVE_STRING_H
++# include <string.h>
++#endif // HAVE_STRING_H
++
+ #ifdef HAVE_LIBGNUTLS
+ # include <gnutls/x509.h>
+ #endif // HAVE_LIBGNUTLS
diff --git a/src/TimeA2.h b/src/TimeA2.h
index 97302a5..dd2a1fc 100644
--- a/src/TimeA2.h
@@ -127,6 +210,26 @@
+#endif
#endif // D_COMMON_H
+diff --git a/src/util.cc b/src/util.cc
+index 6bf66e6..9324f03 100644
+--- a/src/util.cc
++++ b/src/util.cc
+@@ -36,7 +36,14 @@
+
+ #include <signal.h>
+ #include <limits.h>
+-#include <stdint.h>
++
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++# endif
++#endif
+
+ #include <cerrno>
+ #include <cassert>
--
1.7.3.2
Added: csw/mgar/pkg/aria2/trunk/files/0003-Skip-Wall-for-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/aria2/trunk/files/0003-Skip-Wall-for-Sun-Studio.patch (rev 0)
+++ csw/mgar/pkg/aria2/trunk/files/0003-Skip-Wall-for-Sun-Studio.patch 2011-02-20 13:58:38 UTC (rev 13415)
@@ -0,0 +1,53 @@
+From 679e45b2d321b4ef82435dd378c4a1f22069ced7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 2 Feb 2011 16:27:53 +0100
+Subject: [PATCH] Skip -Wall for Sun Studio
+
+---
+ m4/libcares.m4 | 2 +-
+ src/Makefile.am | 2 +-
+ src/Makefile.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/m4/libcares.m4 b/m4/libcares.m4
+index 4273917..d737d4d 100644
+--- a/m4/libcares.m4
++++ b/m4/libcares.m4
+@@ -16,7 +16,7 @@ LIBS_save=$LIBS
+ CPPFLAGS_save=$CPPFLAGS
+
+ LIBS="-L$libcares_prefix_lib $LIBS"
+-CPPFLAGS="-I$libcares_prefix_include -Wall $CPPFLAGS"
++CPPFLAGS="-I$libcares_prefix_include $CPPFLAGS"
+
+ AC_CHECK_LIB([cares], [ares_init], [have_libcares=yes])
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b295483..22f4715 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -559,7 +559,7 @@ aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
+ @LIBCARES_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\
+ @SQLITE3_LIBS@ #-lprofiler
+ #aria2c_LDFLAGS = -pg
+-AM_CPPFLAGS = -Wall\
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/lib -I$(top_srcdir)/intl\
+ @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
+ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c7b0b97..7284e34 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1322,7 +1322,7 @@ aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
+ @SQLITE3_LIBS@ #-lprofiler
+
+ #aria2c_LDFLAGS = -pg
+-AM_CPPFLAGS = -Wall\
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/lib -I$(top_srcdir)/intl\
+ @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
+ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
+--
+1.7.3.2
+
Added: csw/mgar/pkg/aria2/trunk/files/0004-Include-string.h-if-available.patch
===================================================================
--- csw/mgar/pkg/aria2/trunk/files/0004-Include-string.h-if-available.patch (rev 0)
+++ csw/mgar/pkg/aria2/trunk/files/0004-Include-string.h-if-available.patch 2011-02-20 13:58:38 UTC (rev 13415)
@@ -0,0 +1,27 @@
+From 9bc60cdd312557c994f079597453de0eaa8dd4ea Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 2 Feb 2011 16:53:18 +0100
+Subject: [PATCH] Include string.h if available
+
+---
+ src/FtpConnection.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc
+index debde95..d08aad7 100644
+--- a/src/FtpConnection.cc
++++ b/src/FtpConnection.cc
+@@ -38,6 +38,10 @@
+ #include <cstdio>
+ #include <cassert>
+
++#ifdef HAVE_STRING_H
++# include <string.h>
++#endif // HAVE_STRING_H
++
+ #include "Request.h"
+ #include "Segment.h"
+ #include "Option.h"
+--
+1.7.3.2
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list