diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2014-06-18 12:23:54 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2014-06-18 12:23:54 +0000 |
| commit | 8598b0c728bd048bbbb670edd55c5167ca16f2d4 (patch) | |
| tree | b13ab789338df5f64b85c19f40f576b66cd9cff9 /net-p2p/linuxdcpp/files | |
| parent | - Update to 0.51 (diff) | |
Fix port so it builds again. Did some minor housekeeping while being there.
PR: 190600
Reviewed by: bapt
Approved by: bapt
Diffstat (limited to 'net-p2p/linuxdcpp/files')
| -rw-r--r-- | net-p2p/linuxdcpp/files/patch-BufferSocket.cpp | 11 | ||||
| -rw-r--r-- | net-p2p/linuxdcpp/files/patch-SConstruct | 12 |
2 files changed, 23 insertions, 0 deletions
diff --git a/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp b/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp new file mode 100644 index 000000000000..a00d597f6bd5 --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp @@ -0,0 +1,11 @@ +--- dcpp/BufferedSocket.cpp.orig 2014-06-18 00:29:48.737534795 +0200 ++++ dcpp/BufferedSocket.cpp 2011-04-17 19:57:09.000000000 +0200 +@@ -478,7 +478,7 @@ + + void BufferedSocket::addTask(Tasks task, TaskData* data) { + dcassert(task == DISCONNECT || task == SHUTDOWN || task == UPDATED || sock.get()); +- tasks.push_back(make_pair(task, data)); taskSem.signal(); ++ tasks.push_back(make_pair(task, boost::shared_ptr<TaskData>(data))); taskSem.signal(); + } + + } // namespace dcpp diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct index 360a88eeced2..20fa13e02dd2 100644 --- a/net-p2p/linuxdcpp/files/patch-SConstruct +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -17,6 +17,18 @@ BoolVariable('profile', 'Compile the program with profiling information', 0), PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir), ('FAKE_ROOT', 'Make scons install the program under a fake root', '') +@@ -131,7 +131,10 @@ + env['CC'] = os.environ['CC'] + + if os.environ.has_key('CXXFLAGS'): +- env['CPPFLAGS'] = env['CXXFLAGS'] = os.environ['CXXFLAGS'].split() ++ env['CXXFLAGS'] = os.environ['CXXFLAGS'].split() ++ ++if os.environ.has_key('CPPFLAGS'): ++ env['CPPFLAGS'] = os.environ['CPPFLAGS'].split() + + if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] = os.environ['LDFLAGS'].split() @@ -139,6 +140,12 @@ if os.environ.has_key('CFLAGS'): env['CFLAGS'] = os.environ['CFLAGS'].split() |