mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Catch up with the latest CVS, fix the charset/locale stuff. Bump the

Browse Source 
PORTREVISION.

Bug tracker:	http://tinyurl.com/2hrvgn (berlios.de)
Obtained from:	LinuxDC++ CVS
This commit is contained in:
Jeremy Messenger 2007-04-02 16:57:48 +00:00
parent cf6b4e340f
commit 551fded38f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=189023
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net-p2p/linuxdcpp/Makefile
View File

@ -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/

32
net-p2p/linuxdcpp/files/patch-client_Text.cpp Normal file
View File

@ -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 <errno.h>
#include <iconv.h>
+#include <langinfo.h>
#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) {