Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (d074e62869ddc701b0f6848780e26fc1e71096f8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (d074e62869ddc701b0f6848780e26fc1e71096f8)
  • Date: Thu, 14 May 2009 03:23:50 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

ftp-libs/libtorrent/DEPENDS | 10 +--
ftp-libs/libtorrent/HISTORY | 8 ++
ftp-libs/libtorrent/PRE_BUILD | 1
ftp-libs/libtorrent/gcc44.patch | 53 +++++++++++++++++++
ftp/rtorrent/DEPENDS | 7 +-
ftp/rtorrent/DETAILS | 2
ftp/rtorrent/HISTORY | 7 ++
ftp/rtorrent/PRE_BUILD | 3 +
ftp/rtorrent/gcc44.patch | 109
++++++++++++++++++++++++++++++++++++++++
9 files changed, 189 insertions(+), 11 deletions(-)

New commits:
commit d074e62869ddc701b0f6848780e26fc1e71096f8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libtorrent: Removed extra whitespace

commit 02f9604f037a80e525d3b20f2033c6e51471ed86
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libtorrent: Optional dependencies go after hard dependencies

commit ea35acf76d5fc75f814cab69250cbcb2edd558ed
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rtorrent: Removed whitespace

commit d759aaa91212fc0de6b304f412bcf3ddfd337583
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rtorrent: Fix compilation with GCC 4.4.0
From

http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch?rev=1.2

commit 01c886acd90592708cc77ef6610e444dff84ab91
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libtorrent: Fix compilation with GCC 4.4.0
Patch from

http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch?rev=1.2

diff --git a/ftp-libs/libtorrent/DEPENDS b/ftp-libs/libtorrent/DEPENDS
index aee8abb..83a1965 100755
--- a/ftp-libs/libtorrent/DEPENDS
+++ b/ftp-libs/libtorrent/DEPENDS
@@ -1,5 +1,5 @@
-optional_depends "openssl" "" "--disable-openssl" "Needed for \
-encryption" &&
-depends libsigc++3 &&
-depends automake &&
-depends libtool
+depends libsigc++3 &&
+depends automake &&
+depends libtool &&
+
+optional_depends "openssl" "" "--disable-openssl" "Needed for encryption"
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index dae3ef8..bece867 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,9 @@
+2009-05-14 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optional dependencies go after hard dependencies
+ * PRE_BUILD: Apply gcc44.patch
+ * gcc44.patch: Fix compilation with GCC 4.4.0
+ From
http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch?rev=1.2
+
2008-11-19 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.12.4

@@ -27,7 +33,7 @@

2007-10-26 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.11.9
- * CONFIGURE, PRE_BUILD: disabled dht patch
+ * CONFIGURE, PRE_BUILD: disabled dht patch

2007-10-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DEPENDS: better explanation for openssl
diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
index ea304d2..0be0c42 100755
--- a/ftp-libs/libtorrent/PRE_BUILD
+++ b/ftp-libs/libtorrent/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc44.patch &&
./autogen.sh
diff --git a/ftp-libs/libtorrent/gcc44.patch b/ftp-libs/libtorrent/gcc44.patch
new file mode 100644
index 0000000..fd534d8
--- /dev/null
+++ b/ftp-libs/libtorrent/gcc44.patch
@@ -0,0 +1,53 @@
+#
+# From
http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch?rev=1.2
+#
+diff -Nurp libtorrent-0.12.4.old/src/torrent/poll_epoll.cc
libtorrent-0.12.4/src/torrent/poll_epoll.cc
+--- libtorrent-0.12.4.old/src/torrent/poll_epoll.cc 2008-10-28
06:49:47.000000000 -0500
++++ libtorrent-0.12.4/src/torrent/poll_epoll.cc 2009-02-04
09:45:22.000000000 -0600
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <cerrno>
++#include <cstdio>
+ #include <cstring>
+
+ #include <unistd.h>
+
+
+diff -Nurp libtorrent-0.12.4.old/src/protocol/extensions.cc
libtorrent-0.12.4/src/protocol/extensions.cc
+--- libtorrent-0.12.4.old/src/protocol/extensions.cc 2008-08-26
15:15:15.000000000 -0500
++++ libtorrent-0.12.4/src/protocol/extensions.cc 2009-02-04
09:47:07.000000000 -0600
+@@ -36,6 +36,7 @@
+
+ #include "config.h"
+
++#include <cstdio>
+ #include <limits>
+ #include <sstream>
+
+diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_dht.cc
libtorrent-0.12.4/src/tracker/tracker_dht.cc
+--- libtorrent-0.12.4.old/src/tracker/tracker_dht.cc 2008-08-26
15:18:34.000000000 -0500
++++ libtorrent-0.12.4/src/tracker/tracker_dht.cc 2009-02-04
09:48:49.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <sstream>
+
+ #include "dht/dht_router.h"
+
+diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_udp.cc
libtorrent-0.12.4/src/tracker/tracker_udp.cc
+--- libtorrent-0.12.4.old/src/tracker/tracker_udp.cc 2008-05-07
07:19:13.000000000 -0500
++++ libtorrent-0.12.4/src/tracker/tracker_udp.cc 2009-02-04
09:49:24.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <sigc++/adaptors/bind.h>
+ #include <torrent/connection_manager.h>
+
+
diff --git a/ftp/rtorrent/DEPENDS b/ftp/rtorrent/DEPENDS
index 0eec520..3a5341e 100755
--- a/ftp/rtorrent/DEPENDS
+++ b/ftp/rtorrent/DEPENDS
@@ -1,7 +1,8 @@
-depends libtorrent &&
-depends curl &&
+depends libtorrent &&
+depends curl &&
+
optional_depends xmlrpc-c \
"--with-xmlrpc-c" \
"--without-xmlrpc-c" \
- "for XMLRPC interface"
+ "for XMLRPC interface"

diff --git a/ftp/rtorrent/DETAILS b/ftp/rtorrent/DETAILS
index dd73f3d..106a98b 100755
--- a/ftp/rtorrent/DETAILS
+++ b/ftp/rtorrent/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
WEB_SITE=http://libtorrent.rakshasa.no
- ENTERED=20050214
+ ENTERED=20050214
LICENSE[0]=GPL

SOURCE_HASH=sha512:f434a2a477ca6453b476af52c6c15e488561042c5fb8a615fdf6eb4efa1fe3de84431a37a09c0f0ca1a8ecc5da7042752655904f2fdb176bcd6534f98ec75382
KEYWORDS="bittorrent ftp"
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index ddf5869..0924828 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,8 @@
+2009-05-14 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc44.patch
+ * gcc44.patch: Fix compilation with GCC 4.4.0
+ From
http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch?rev=1.2
+
2008-11-19 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.8.4

@@ -22,7 +27,7 @@
2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DEPENDS, rm CONFIGURE, PRE_BUILD, dht.diff: not needed anymore
because dht support now built-in
-
+
2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.8.0

diff --git a/ftp/rtorrent/PRE_BUILD b/ftp/rtorrent/PRE_BUILD
new file mode 100755
index 0000000..31dcdd5
--- /dev/null
+++ b/ftp/rtorrent/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc44.patch
diff --git a/ftp/rtorrent/gcc44.patch b/ftp/rtorrent/gcc44.patch
new file mode 100644
index 0000000..7faa662
--- /dev/null
+++ b/ftp/rtorrent/gcc44.patch
@@ -0,0 +1,109 @@
+#
+# From
http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch?rev=1.2
+#
+diff -Nurp rtorrent-0.8.4.old/src/rpc/scgi_task.cc
rtorrent-0.8.4/src/rpc/scgi_task.cc
+--- rtorrent-0.8.4.old/src/rpc/scgi_task.cc 2008-05-07
07:19:10.000000000 -0500
++++ rtorrent-0.8.4/src/rpc/scgi_task.cc 2009-02-04 10:23:31.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <rak/error_number.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+
+
+diff -Nurp rtorrent-0.8.4.old/src/command_peer.cc
rtorrent-0.8.4/src/command_peer.cc
+--- rtorrent-0.8.4.old/src/command_peer.cc 2008-05-07
07:19:11.000000000 -0500
++++ rtorrent-0.8.4/src/command_peer.cc 2009-02-04 10:26:53.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <rak/error_number.h>
+ #include <rak/path.h>
+ #include <rak/socket_address.h>
+
+
+
+diff -Nurp rtorrent-0.8.4.old/src/display/utils.cc
rtorrent-0.8.4/src/display/utils.cc
+--- rtorrent-0.8.4.old/src/display/utils.cc 2008-08-27
03:25:01.000000000 -0500
++++ rtorrent-0.8.4/src/display/utils.cc 2009-02-04 10:20:34.000000000 -0600
+@@ -36,6 +36,7 @@
+
+ #include "config.h"
+
++#include <cstdio>
+ #include <cstring>
+ #include <sstream>
+ #include <iomanip>
+
+
+diff -Nurp rtorrent-0.8.4.old/src/rpc/parse.cc
rtorrent-0.8.4/src/rpc/parse.cc
+--- rtorrent-0.8.4.old/src/rpc/parse.cc 2008-08-26 15:14:33.000000000 -0500
++++ rtorrent-0.8.4/src/rpc/parse.cc 2009-02-04 10:23:06.000000000 -0600
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <cstring>
++#include <cstdio>
+ #include <locale>
+ #include <rak/path.h>
+ #include <torrent/exceptions.h>
+
+ diff -Nurp rtorrent-0.8.4.old/src/utils/lockfile.cc
rtorrent-0.8.4/src/utils/lockfile.cc
+--- rtorrent-0.8.4.old/src/utils/lockfile.cc 2008-05-07
07:19:11.000000000 -0500
++++ rtorrent-0.8.4/src/utils/lockfile.cc 2009-02-04
10:25:10.000000000 -0600
+@@ -40,6 +40,7 @@
+ #include <cctype>
+ #include <cerrno>
+ #include <cstring>
++#include <cstdio>
+ #include <sstream>
+ #include <fcntl.h>
+ #include <signal.h>
+
+diff -Nurp rtorrent-0.8.4.old/src/command_download.cc
rtorrent-0.8.4/src/command_download.cc
+--- rtorrent-0.8.4.old/src/command_download.cc 2008-11-19
11:01:20.000000000 -0600
++++ rtorrent-0.8.4/src/command_download.cc 2009-02-04
10:25:32.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <functional>
+ #include <unistd.h>
+ #include <rak/file_stat.h>
+
+
+diff -Nurp rtorrent-0.8.4.old/src/command_events.cc
rtorrent-0.8.4/src/command_events.cc
+--- rtorrent-0.8.4.old/src/command_events.cc 2008-11-11
04:37:20.000000000 -0600
++++ rtorrent-0.8.4/src/command_events.cc 2009-02-04
10:25:58.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <functional>
+ #include <rak/file_stat.h>
+ #include <rak/path.h>
+
+diff -Nurp rtorrent-0.8.4.old/src/command_network.cc
rtorrent-0.8.4/src/command_network.cc
+--- rtorrent-0.8.4.old/src/command_network.cc 2008-08-27
03:25:01.000000000 -0500
++++ rtorrent-0.8.4/src/command_network.cc 2009-02-04
10:26:22.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <functional>
+ #include <rak/address_info.h>
+ #include <rak/path.h>
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (d074e62869ddc701b0f6848780e26fc1e71096f8), Eric Sandall, 05/14/2009

Archive powered by MHonArc 2.6.24.

Top of Page