Fixed some of the gcc4 issues. The package doesn't built yet on

NetBSD-4.99.30.
NetBSD · Jan 25, 2008 · 2fda66c · 2fda66c
1 parent af7ef77
commit 2fda66c
Show file tree

Hide file tree

Showing 3 changed files with 369 additions and 6 deletions.
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2008/01/25 18:41:08 rillig Exp $
+$NetBSD: distinfo,v 1.37 2008/01/25 20:56:57 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
@@ -63,6 +63,7 @@ SHA1 (patch-as) = 81cd7e2a6ff24729a0276d397b285b07c9694205
 SHA1 (patch-at) = d208593e5fd37687c4be0b2735fdcc57760f7f3a
 SHA1 (patch-au) = 3fd383266f24c4a0c5e6f0cd00d419e1fe20cafa
 SHA1 (patch-av) = fa1910700a104347bf29ba19851f47eca34c8be1
-SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1
+SHA1 (patch-aw) = 74c0e6356067587873b651f0bd18f42eeda7804e
 SHA1 (patch-ax) = 4679a5b3eda8dbe5927cf09de81e54557a4a0809
 SHA1 (patch-ba) = 7c156791f88b4ba99ec9a4a582242633ceef7f6b
+SHA1 (patch-gcc4) = 62ff419079ed8cf0a1c38e35771fe3df3b7f2dbc
diff --git a/misc/openoffice/patches/patch-aw b/misc/openoffice/patches/patch-aw
@@ -1,10 +1,10 @@
-$NetBSD: patch-aw,v 1.7 2005/04/12 01:10:45 rillig Exp $
+$NetBSD: patch-aw,v 1.8 2008/01/25 20:56:57 rillig Exp $
 
 Patch from Rui-Xiang Guo for building on NetBSD-current. The getpwent_r
 function is not used at all, so why provide a (wrong) prototype for it?
 
---- ../sal/osl/unx/system.h.orig	2004-11-19 09:23:53.000000000 +0800
-+++ ../sal/osl/unx/system.h	2004-11-19 09:27:55.000000000 +0800
+--- ../sal/osl/unx/system.h.orig	2003-08-15 11:38:50.000000000 +0000
++++ ../sal/osl/unx/system.h	2008-01-25 19:15:07.000000000 +0000
 @@ -169,7 +169,10 @@
  #endif
 
@@ -16,7 +16,17 @@ function is not used at all, so why provide a (wrong) prototype for it?
  #	define _POSIX_THREAD_SYSCALL_SOFT 1
  #	include <pthread.h>
  #	include <netdb.h>
-@@ -569,7 +572,6 @@ extern int sem_post(sem_t* sem);
+@@ -482,7 +485,9 @@ void macxp_getSystemVersion( unsigned in
+ #	define PTHREAD_VALUE(t) 			(t)
+ #endif
+ #ifndef PTHREAD_NONE
++# if (__GNUC__ < 4) && !defined(MACOSX)
+ extern pthread_t _pthread_none_;
++# endif
+ #	define PTHREAD_NONE					_pthread_none_
+ #   ifndef PTHREAD_NONE_INIT
+ #		define PTHREAD_NONE_INIT		((pthread_t)-1)
+@@ -569,7 +574,6 @@ extern int sem_post(sem_t* sem);
 
  #ifdef NO_PTHREAD_RTL
  #if !defined FREEBSD || (__FreeBSD_version < 500112)