pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/meta-pkgs/boost Do not assume swprintf is in std::, as...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/97a9912204d2
branches:  trunk
changeset: 495580:97a9912204d2
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Jun 14 16:57:49 2005 +0000

description:
Do not assume swprintf is in std::, as it breaks the build under NetBSD
3.99.5 (at least).  Closes PR pkg/30380 by wiz@.

diffstat:

 meta-pkgs/boost/distinfo         |   3 ++-
 meta-pkgs/boost/patches/patch-ac |  29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 45318278e8c9 -r 97a9912204d2 meta-pkgs/boost/distinfo
--- a/meta-pkgs/boost/distinfo  Tue Jun 14 16:38:17 2005 +0000
+++ b/meta-pkgs/boost/distinfo  Tue Jun 14 16:57:49 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2005/02/26 22:48:34 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2005/06/14 16:57:49 jmmv Exp $
 
 SHA1 (boost_1_32_0.tar.bz2) = bb193b381d8e1c8321ee7d77f01c88837edc3e56
 RMD160 (boost_1_32_0.tar.bz2) = 9a51660e01d5047b08a753a7fa38028d8aa171ec
 Size (boost_1_32_0.tar.bz2) = 10181552 bytes
 SHA1 (patch-aa) = 6f0b64da37de35b2b3d2eb5884608bd8f9a906fd
 SHA1 (patch-ab) = 197c51ac67d74923d02f8a9746b5d2e0f7b84736
+SHA1 (patch-ac) = 3d44a1a368b614d86aff57406363fba57e33a0ba
diff -r 45318278e8c9 -r 97a9912204d2 meta-pkgs/boost/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/boost/patches/patch-ac  Tue Jun 14 16:57:49 2005 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ac,v 1.1 2005/06/14 16:57:49 jmmv Exp $
+
+--- libs/regex/src/wide_posix_api.cpp.orig     2003-12-16 14:06:00.000000000 +0100
++++ libs/regex/src/wide_posix_api.cpp
+@@ -28,6 +28,8 @@
+ #include <cstring>
+ #include <cstdio>
+ 
++using namespace std; // For swprintf, in case it is there.
++
+ namespace boost{
+ 
+ namespace {
+@@ -142,13 +144,13 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_C
+       {
+          if(std::wcscmp(e->re_endp, wnames[i]) == 0)
+          {
+-            std::swprintf(localbuf, 5, L"%d", i);
++            swprintf(localbuf, 5, L"%d", i);
+             if(std::wcslen(localbuf) < buf_size)
+                std::wcscpy(buf, localbuf);
+             return std::wcslen(localbuf) + 1;
+          }
+       }
+-      std::swprintf(localbuf, 5, L"%d", 0);
++      swprintf(localbuf, 5, L"%d", 0);
+       if(std::wcslen(localbuf) < buf_size)
+          std::wcscpy(buf, localbuf);
+       return std::wcslen(localbuf) + 1;



Home | Main Index | Thread Index | Old Index