pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/boinc3-coreclient Work around for gcc 2.95 problems.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/85bb72e9a555
branches:  trunk
changeset: 481666:85bb72e9a555
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sat Oct 09 17:20:28 2004 +0000

description:
Work around for gcc 2.95 problems.

diffstat:

 net/boinc3-coreclient/distinfo         |   3 +-
 net/boinc3-coreclient/patches/patch-ae |  41 ++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r e5b79206a5c2 -r 85bb72e9a555 net/boinc3-coreclient/distinfo
--- a/net/boinc3-coreclient/distinfo    Sat Oct 09 16:59:18 2004 +0000
+++ b/net/boinc3-coreclient/distinfo    Sat Oct 09 17:20:28 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/19 20:09:15 drochner Exp $
+$NetBSD: distinfo,v 1.2 2004/10/09 17:20:28 kristerw Exp $
 
 SHA1 (boinc_public-cvs-2004-07-14.tar.gz) = 125ceba6a85d80e34de7fb2ee0de410d2cca20dc
 Size (boinc_public-cvs-2004-07-14.tar.gz) = 3463359 bytes
@@ -6,3 +6,4 @@
 SHA1 (patch-ab) = 48c23be13b932bb30046fee7a89ba1f47ad6db69
 SHA1 (patch-ac) = 2ade89a7d64cad3f2e476cba72ee987dcdb1ab3a
 SHA1 (patch-ad) = c8835343da8107f6b3cf23d6768f4c2cc3e3650f
+SHA1 (patch-ae) = fa5eee5343e2b585c3e18a249572f22accbe181c
diff -r e5b79206a5c2 -r 85bb72e9a555 net/boinc3-coreclient/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/boinc3-coreclient/patches/patch-ae    Sat Oct 09 17:20:28 2004 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-ae,v 1.1 2004/10/09 17:20:28 kristerw Exp $
+
+--- lib/util.C.orig    Sat Oct  9 19:09:16 2004
++++ lib/util.C Sat Oct  9 19:12:49 2004
+@@ -31,7 +31,11 @@
+ #include <algorithm>
+ #include <iterator>
+ #include <iostream>
++#if __GNUC__ == 2
++#include <locale.h>
++#else
+ #include <locale>
++#endif
+ #include <fstream>
+ #include <cctype>
+ #include <ctype.h>
+@@ -403,7 +407,7 @@
+     }
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && __GNUC__ != 2
+ // In order for toupper and tolower to work under certain conditions
+ //   it needs to know about local.
+ // See: http://linux-rep.fnal.gov/software/gcc/onlinedocs/libstdc++/22_locale/howto.html#7
+@@ -422,13 +426,13 @@
+ //   - Add a trailing slash if necessary
+ //
+ void canonicalize_master_url(string& url) {
+-#ifndef _WIN32
++#if !defined(_WIN32) && __GNUC__ != 2
+     Tolower      down ( std::locale("C") );
+ #endif
+     string::size_type p = url.find("://");
+     // lowercase http://
+     if (p != string::npos) {
+-#ifndef _WIN32
++#if !defined(_WIN32) && __GNUC__ != 2
+         transform(url.begin(), url.begin()+p, url.begin(), down);
+ #else
+         transform(url.begin(), url.begin()+p, url.begin(), tolower);



Home | Main Index | Thread Index | Old Index