rpms/openoffice.org/devel openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch, NONE, 1.1 openoffice.org.spec, 1.1736, 1.1737

Caolan McNamara caolanm at fedoraproject.org
Tue Dec 23 12:03:57 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17325

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 
Log Message:
add openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch for new xulrunner headers

openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch:

--- NEW FILE openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch ---
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.13.64.2
diff -u -r1.13.64.2 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	15 Dec 2008 10:29:47 -0000	1.13.64.2
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	23 Dec 2008 09:24:57 -0000
@@ -102,7 +102,7 @@
 extern "C" {
 #include <npsdk/npupp.h>
 }
-#include <npapi.h>
+#include <npsdk/npapi.h>
 
 #if NP_VERSION_MINOR < 17
 // compatibility hack: compile with older NPN api header, but define


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1736
retrieving revision 1.1737
diff -u -r1.1736 -r1.1737
--- openoffice.org.spec	22 Dec 2008 16:50:41 -0000	1.1736
+++ openoffice.org.spec	23 Dec 2008 12:03:26 -0000	1.1737
@@ -132,6 +132,7 @@
 Patch59: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 Patch60: workspace.vcl98.patch
 Patch61: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
+Patch62: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1411,6 +1412,7 @@
 %patch59 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
 %patch60 -p1 -b .workspace.vcl98.patch
 %patch61 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
+%patch62 -p1 -b .oooXXXXX.extensions.npapi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3815,11 +3817,13 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Dec 22 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.2
+* Tue Dec 23 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.2
 - Workaround: rhbz#477174 recover metacity workarounds without hanging in
   gdk_x11_get_server_time
 - add hyphen-bg
 - Resolves: rhbz#477435 package opensymbol in a rpm of its own
+- add openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch for new
+  xulrunner headers
 
 * Sat Dec 19 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.1
 - next milestone




More information about the fedora-extras-commits mailing list