From a2beb464fdbec9fd42f949a98c6a93b6992d0a6e Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Fri, 25 Jan 2008 18:41:08 +0000
Subject: The first of a series of patches for gcc4.

---
 misc/openoffice/distinfo         |  4 ++--
 misc/openoffice/patches/patch-ap | 23 +++++++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index 251345af671..035db14fdb2 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2006/09/27 15:28:50 rillig Exp $
+$NetBSD: distinfo,v 1.36 2008/01/25 18:41:08 rillig Exp $
 
 SHA1 (openoffice-1.1.5/OOo_1.1.5_src.tar.gz) = 55b316209eaabf151a59ead2abc3c621502058ea
 RMD160 (openoffice-1.1.5/OOo_1.1.5_src.tar.gz) = 4f0759d0e3951dd511487f1ed774649dcc94e0db
@@ -56,7 +56,7 @@ SHA1 (patch-al) = 8da112628aa1760edf26504b24860a12e688bc56
 SHA1 (patch-am) = 546afda0b6b5f223b5edf3933f769ab1064a46a2
 SHA1 (patch-an) = e030f5ae1dd3ad2bcb5bab21684df2ed8eaf717e
 SHA1 (patch-ao) = 68d21a0daf48d47c7a1ab398bb98c48d7f002c4e
-SHA1 (patch-ap) = 8f885c569f09ba3d66481e8d3b60238a50fd38bb
+SHA1 (patch-ap) = 8d17edff40020fa748e1ce911dac08e5efccf554
 SHA1 (patch-aq) = 82285ade1af0a0c5e84d322d5a3a925c095103bb
 SHA1 (patch-ar) = f185c705cda716e1b52e5b6ca6d9c5d2a9b341bc
 SHA1 (patch-as) = 81cd7e2a6ff24729a0276d397b285b07c9694205
diff --git a/misc/openoffice/patches/patch-ap b/misc/openoffice/patches/patch-ap
index f1223db8a80..b9f8c95c4ba 100644
--- a/misc/openoffice/patches/patch-ap
+++ b/misc/openoffice/patches/patch-ap
@@ -1,8 +1,27 @@
-$NetBSD: patch-ap,v 1.4 2004/11/12 06:39:20 jlam Exp $
+$NetBSD: patch-ap,v 1.5 2008/01/25 18:41:08 rillig Exp $
 
 --- ../stlport/STLport-4.5.patch.orig	2004-04-17 20:08:34.000000000 +0200
 +++ ../stlport/STLport-4.5.patch
-@@ -404,3 +404,68 @@
+@@ -272,6 +272,18 @@
+ *** misc/STLport-4.5/stlport/config/stl_gcc.h	Tue Sep  4 19:10:16 2001
+ --- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Oct 16 09:49:57 2003
+ ***************
++*** 7,13 ****
++--- 7,15 ----
++  # define _STLP_USE_GLIBC
++  #endif
++  
+++ #if __GNUC__ < 4
++  #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+++ #endif
++  
++  # if defined(__FreeBSD__) || defined (__hpux)
++  #  define _STLP_NO_WCHAR_T
++***************
+ *** 75,80 ****
+ --- 75,82 ----
+   
+@@ -404,3 +413,68 @@
    # define _STLP_MUTEX_INITIALIZER
    # endif
    
-- 
cgit v1.2.3