rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch, NONE, 1.1 openoffice.org.spec, 1.1492, 1.1493

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9468

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch 
Log Message:
Resolves: rhbz#450212 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch

openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch:

--- NEW FILE openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch ---
Index: mozsrc/npapi.h
===================================================================
RCS file: /cvs/external/np_sdk/mozsrc/npapi.h,v
retrieving revision 1.2
diff -u -r1.2 npapi.h
--- openoffice.org.orig/np_sdk/mozsrc/npapi.h	9 Feb 2006 14:04:20 -0000	1.2
+++ openoffice.org/np_sdk/mozsrc/npapi.h	6 Jun 2008 09:46:09 -0000
@@ -154,7 +154,7 @@
 #endif
 
 #ifndef _UINT32
-#    if defined(__alpha)
+#    if defined(__alpha) || defined(__amd64__) || defined(__x86_64__)
 typedef unsigned int uint32;
 #    else  /* __alpha */
 typedef unsigned long uint32;
@@ -170,7 +170,7 @@
 #endif
 
 #ifndef _INT32
-#    if defined(__alpha)
+#    if defined(__alpha) || defined(__amd64__) || defined(__x86_64__)
 typedef int int32;
 #    else  /* __alpha */
 typedef long int32;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1492
retrieving revision 1.1493
diff -u -r1.1492 -r1.1493
--- openoffice.org.spec	6 Jun 2008 08:08:11 -0000	1.1492
+++ openoffice.org.spec	6 Jun 2008 09:53:14 -0000	1.1493
@@ -157,6 +157,7 @@
 Patch84: openoffice.org-2.4.0.gcc36187.noaliasingbusted.patch
 Patch85: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
 Patch86: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch87: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1128,6 +1129,7 @@
 %patch84 -p1 -b .gcc36187.noaliasingbusted.patch
 %patch85 -p1 -b .ooo87970.vcl.samenamesubs.patch
 %patch86 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch87 -p1 -b .ooo82545.np_sdk.x86_64.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2918,6 +2920,7 @@
 %changelog
 * Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.3
 - remove pointless "register" dialog request
+- Resolves: rhbz#450212 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
 
 * Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.2
 - filter out -fasynchronous-unwind-tables because it doesn't work with -Os