summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkristerw <kristerw>2004-10-09 17:20:28 +0000
committerkristerw <kristerw>2004-10-09 17:20:28 +0000
commit6e6ce3a991a0c849bf3ca0c48ebeacd671a3318f (patch)
treef9fe4cc829542bfb2949ab88a34e37165288ad13
parent150b1a24e27ec5cc02d0d9fc59c7daedaa9ec370 (diff)
downloadpkgsrc-6e6ce3a991a0c849bf3ca0c48ebeacd671a3318f.tar.gz
Work around for gcc 2.95 problems.
-rw-r--r--net/boinc3-coreclient/distinfo3
-rw-r--r--net/boinc3-coreclient/patches/patch-ae41
2 files changed, 43 insertions, 1 deletions
diff --git a/net/boinc3-coreclient/distinfo b/net/boinc3-coreclient/distinfo
index 2b82f36c654..1cef87d75ab 100644
--- a/net/boinc3-coreclient/distinfo
+++ b/net/boinc3-coreclient/distinfo
@@ -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-aa) = 62fcec84fb5383568a32b69b80e77e465201323c
SHA1 (patch-ab) = 48c23be13b932bb30046fee7a89ba1f47ad6db69
SHA1 (patch-ac) = 2ade89a7d64cad3f2e476cba72ee987dcdb1ab3a
SHA1 (patch-ad) = c8835343da8107f6b3cf23d6768f4c2cc3e3650f
+SHA1 (patch-ae) = fa5eee5343e2b585c3e18a249572f22accbe181c
diff --git a/net/boinc3-coreclient/patches/patch-ae b/net/boinc3-coreclient/patches/patch-ae
new file mode 100644
index 00000000000..529fac1c6b0
--- /dev/null
+++ b/net/boinc3-coreclient/patches/patch-ae
@@ -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);