rpms/openoffice.org/devel openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch, NONE, 1.1 openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch, 1.1, 1.2 openoffice.org.spec, 1.1528, 1.1529

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9555

Modified Files:
	openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 
	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;

openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch:

Index: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	26 May 2008 15:58:25 -0000	1.1
+++ openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	6 Jun 2008 09:54:04 -0000	1.2
@@ -159,13 +159,12 @@
  
      // query fontconfig for a substitute
      rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
-@@ -969,6 +999,18 @@
+@@ -969,6 +999,17 @@
                  if (aI != rWrapper.m_aFontNameToLocalized.end())
                      sFamily = aI->second;
                  aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
 +
 +
-+                fprintf(stderr, "incoming weight was %d\n", rWeight);
 +                int val = 0;
 +                if ( FcResultMatch == rWrapper.FcPatternGetInteger( pSet->fonts[0], FC_WEIGHT, 0, &val))
 +                    rWeight = convertWeight(val);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1528
retrieving revision 1.1529
diff -u -r1.1528 -r1.1529
--- openoffice.org.spec	5 Jun 2008 15:50:03 -0000	1.1528
+++ openoffice.org.spec	6 Jun 2008 09:54:04 -0000	1.1529
@@ -133,6 +133,7 @@
 Patch57: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
 Patch58: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
 Patch59: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
+Patch60: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1269,6 +1270,7 @@
 %patch57 -p1 -b .ooo90037.vcl.cairotransforms.patch
 %patch58 -p1 -b .ooo90178.tools.fixmacro.patch
 %patch59 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
+%patch60 -p1 -b .ooo82545.np_sdk.x86_64.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3436,6 +3438,9 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-2
+- Resolves: rhbz#450212 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+
 * Thu Jun 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-1
 - next version 
 - drop integrated openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch