diff options
author | Jeremy Messenger <mezz@FreeBSD.org> | 2006-07-29 17:46:11 +0000 |
---|---|---|
committer | Jeremy Messenger <mezz@FreeBSD.org> | 2006-07-29 17:46:11 +0000 |
commit | ded61394acb679bec96e378366f943f87b14997b (patch) | |
tree | 0034cc83f87d4d01533e0cbc46ea536b1ba984f5 /net-p2p/linuxdcpp/files | |
parent | Mark all 1.6 and 1.8 versions as vulnerable, we do not have a fix (diff) |
Linuxdcpp is a port of the win32 DC++ direct connect client to POSIX-like
systems. Despite the name, it does run on other platforms beside Linux.
Linuxdcpp uses the gtk2 toolkit.
WWW: http://linuxdcpp.berlios.de/
Diffstat (limited to 'net-p2p/linuxdcpp/files')
-rw-r--r-- | net-p2p/linuxdcpp/files/patch-SConstruct | 91 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/files/patch-client_stdinc.h | 10 | ||||
-rw-r--r-- | net-p2p/linuxdcpp/files/patch-disable_binreloc | 34 |
3 files changed, 135 insertions, 0 deletions
diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct new file mode 100644 index 000000000000..e62cfef80ee5 --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -0,0 +1,91 @@ +--- SConstruct.orig Sun Jul 16 11:18:33 2006 ++++ SConstruct Sun Jul 16 11:22:24 2006 +@@ -38,28 +38,12 @@ + context.Result(ret) + return ret + +-def CheckCXXVersion(context, name, major, minor): +- context.Message('Checking for %s >= %d.%d...' % (name, major, minor)) +- ret = commands.getoutput('%s -dumpversion' % name) +- +- retval = 0 +- try: +- if ((string.atoi(ret[0]) == major and string.atoi(ret[2]) >= minor) +- or (string.atoi(ret[0]) > major)): +- retval = 1 +- except ValueError: +- print "Oops! No C++ compiler found!" +- +- context.Result(retval) +- return retval +- +- + # Initialize the environment and configure variables + +-env = Environment(ENV = os.environ) ++env = Environment(ENV = os.environ, CC = '%%CC%%', CXX = '%%CXX%%') + + conf = Configure(env, +- custom_tests = {'CheckPKGConfig' : CheckPKGConfig, 'CheckPKG' : CheckPKG, 'CheckCXXVersion' : CheckCXXVersion}, ++ custom_tests = {'CheckPKGConfig' : CheckPKGConfig, 'CheckPKG' : CheckPKG}, + conf_dir = 'build/sconf', + log_file = 'build/sconf/config.log') + +@@ -68,27 +52,6 @@ + + # Check for dependencies + +-# This looks up the CXX enviroment variable so that people can specify +-# what g++ to use on the command line (eg. prompt:> CXX=foo scons) +-cxx = conf.env.Dictionary()['CXX'] +-if not conf.CheckCXXVersion(cxx, 3, 4): +- if WhereIs('g++-3.4') != None: +- print 'Found g++-3.4' +- cxx = 'g++-3.4' +- else: +- print 'Compiler version check failed. g++ 3.4 or later is needed' +- Exit(1) +- +-# Add support for compiler caches to speed-up compilation. +-if os.popen('distcc 2> /dev/null').read(): +- cxx = 'distcc ' + cxx +- print 'Enabling distcc...' +-if os.popen('ccache 2> /dev/null').read(): +- cxx = 'ccache ' + cxx +- print 'Enabling ccache...' +- +-conf.env.Replace(CXX = cxx) +- + if not conf.CheckPKGConfig(): + print 'pkg-config not found.' + Exit(1) +@@ -120,11 +83,6 @@ + print 'Can\'t live without it, sorry' + Exit(1) + +-if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'c'): +- print 'Did not find the pthread library, exiting!' +- print 'Note: You might have the lib but not the headers' +- Exit(1) +- + if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'): + print 'Did not find the z library (gzip/z compression)' + print 'Can\'t live without it, exiting' +@@ -138,7 +96,7 @@ + Exit(1) + + env = conf.Finish() +-env.Append(CXXFLAGS = ['-I.', '-D_GNU_SOURCE', '-DENABLE_BINRELOC', '-D_FILE_OFFSET_BITS=64']) ++env.Append(CXXFLAGS = ['-I.', '-D_GNU_SOURCE', '-D_FILE_OFFSET_BITS=64']) + + + # Parse command line parameters +@@ -150,7 +108,7 @@ + + release = ARGUMENTS.get('release', 0) + if int(release): +- env.Append(CXXFLAGS = '-O3') ++ env.Append(CXXFLAGS = '%%CXXFLAGS%%') + + profile = ARGUMENTS.get('profile', 0) + if int(profile): diff --git a/net-p2p/linuxdcpp/files/patch-client_stdinc.h b/net-p2p/linuxdcpp/files/patch-client_stdinc.h new file mode 100644 index 000000000000..23fa2ef705c0 --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-client_stdinc.h @@ -0,0 +1,10 @@ +--- client/stdinc.h.orig Sun Jun 25 16:11:55 2006 ++++ client/stdinc.h Sun Jun 25 16:12:05 2006 +@@ -47,6 +47,7 @@ + + #else + #include <unistd.h> ++#include <stdint.h> + #endif + + #include <stdio.h> diff --git a/net-p2p/linuxdcpp/files/patch-disable_binreloc b/net-p2p/linuxdcpp/files/patch-disable_binreloc new file mode 100644 index 000000000000..8e4efac42fab --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-disable_binreloc @@ -0,0 +1,34 @@ +--- linux/SConstruct.orig Sun Jul 16 11:25:22 2006 ++++ linux/SConstruct Sun Jul 16 11:25:57 2006 +@@ -8,7 +8,6 @@ + 'hashdialog.cc', + 'hub.cc', + 'mainwindow.cc', +- 'prefix.cc', + 'privatemessage.cc', + 'publichubs.cc', + 'search.cc', +--- linux/wulformanager.cc.orig Sun Jul 16 11:25:32 2006 ++++ linux/wulformanager.cc Sun Jul 16 11:26:29 2006 +@@ -17,7 +17,6 @@ + */ + + #include "wulformanager.hh" +-#include "prefix.hh" + #include "publichubs.hh" + #include "downloadqueue.hh" + #include "hub.hh" +@@ -230,13 +229,7 @@ + + string WulforManager::getPath() + { +-#ifdef _DATADIR + string ret = string(_DATADIR) + PATH_SEPARATOR_STR + "ldcpp"; +-#else +- char *temp = br_extract_dir(SELFPATH); +- string ret = string(temp); +- free(temp); +-#endif + return ret; + } + |