From 551fded38f17dae9a22c4621b1eee090e543099b Mon Sep 17 00:00:00 2001 From: Jeremy Messenger Date: Mon, 2 Apr 2007 16:57:48 +0000 Subject: Catch up with the latest CVS, fix the charset/locale stuff. Bump the PORTREVISION. Bug tracker: http://tinyurl.com/2hrvgn (berlios.de) Obtained from: LinuxDC++ CVS --- net-p2p/linuxdcpp/Makefile | 1 + net-p2p/linuxdcpp/files/patch-client_Text.cpp | 32 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 net-p2p/linuxdcpp/files/patch-client_Text.cpp (limited to 'net-p2p/linuxdcpp') diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile index 35cc9757a73f..4e6dcf1e8ed9 100644 --- a/net-p2p/linuxdcpp/Makefile +++ b/net-p2p/linuxdcpp/Makefile @@ -7,6 +7,7 @@ PORTNAME= linuxdcpp PORTVERSION= 0.0.1.20070324 #0.0.1.YYYYMMDD +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://people.freebsd.org/~mezz/distfiles/ diff --git a/net-p2p/linuxdcpp/files/patch-client_Text.cpp b/net-p2p/linuxdcpp/files/patch-client_Text.cpp new file mode 100644 index 000000000000..959bd01da306 --- /dev/null +++ b/net-p2p/linuxdcpp/files/patch-client_Text.cpp @@ -0,0 +1,32 @@ +=================================================================== +RCS file: /cvsroot/linuxdcpp/linuxdcpp/client/Text.cpp,v +retrieving revision 1.15 +retrieving revision 1.16 +diff -u -r1.15 -r1.16 +--- client/Text.cpp 2007/03/24 18:33:17 1.15 ++++ client/Text.cpp 2007/03/28 00:03:12 1.16 +@@ -25,6 +25,7 @@ + #ifndef _WIN32 + #include + #include ++#include + + #ifndef ICONV_CONST + #define ICONV_CONST +@@ -38,12 +39,16 @@ + void Text::initialize() { + setlocale(LC_ALL, ""); + ++#ifdef _WIN32 + char *ctype = setlocale(LC_CTYPE, NULL); + if(ctype) { + systemCharset = string(ctype); + } else { + dcdebug("Unable to determine the program's locale"); + } ++#else ++ systemCharset = string(nl_langinfo(CODESET)); ++#endif + } + + int Text::utf8ToWc(const char* str, wchar_t& c) { -- cgit v1.2.3