rpms/openoffice.org/devel openoffice.org-3.0.1.ooo96970.pluginfixups.patch, NONE, 1.1 openoffice.org.spec, 1.1709, 1.1710
Caolan McNamara
caolanm at fedoraproject.org
Sat Dec 6 16:34:09 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15318
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.1.ooo96970.pluginfixups.patch
Log Message:
add openoffice.org-3.0.1.ooo96970.pluginfixups.patch
openoffice.org-3.0.1.ooo96970.pluginfixups.patch:
--- NEW FILE openoffice.org-3.0.1.ooo96970.pluginfixups.patch ---
diff -ru extensions/source/plugin/base/makefile.mk extensions/source/plugin/base/makefile.mk
--- openoffice.org.orig/extensions/source/plugin/base/makefile.mk 2008-12-05 15:47:49.000000000 +0000
+++ openoffice.org/extensions/source/plugin/base/makefile.mk 2008-12-05 15:48:32.000000000 +0000
@@ -56,7 +56,7 @@
.ENDIF # "$(GUIBASE)"=="aqua"
.IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"
-PKGCONFIG_MODULES=gtk+-2.0
+PKGCONFIG_MODULES+=gtk+-2.0
.INCLUDE : pkg_config.mk
.ENDIF
diff -ru extensions/source/plugin/inc/plugin/unx/plugcon.hxx extensions/source/plugin/inc/plugin/unx/plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 2008-12-05 15:47:49.000000000 +0000
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 2008-12-05 17:04:35.000000000 +0000
@@ -77,6 +77,27 @@
#define MOZ_X11
#endif
+//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
+//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
+#ifdef UNIX
+# ifndef _UINT32
+# if defined(__alpha) || defined(__LP64__)
+ typedef unsigned int uint32;
+# else /* __alpha */
+ typedef unsigned long uint32;
+# endif
+# define _UINT32
+# endif
+# ifndef _INT32
+# if defined(__alpha) || defined(__LP64__)
+ typedef int int32;
+# else /* __alpha */
+ typedef long int32;
+# endif
+# define _INT32
+# endif
+#endif
+
#ifndef _NPAPI_H_
extern "C" {
#include <npsdk/npupp.h>
diff -ru extensions/source/plugin/unx/makefile.mk extensions/source/plugin/unx/makefile.mk
--- openoffice.org.orig/extensions/source/plugin/unx/makefile.mk 2008-12-05 15:47:49.000000000 +0000
+++ openoffice.org/extensions/source/plugin/unx/makefile.mk 2008-12-05 17:04:37.000000000 +0000
@@ -60,7 +60,7 @@
.IF "$(ENABLE_GTK)" == "TRUE"
CDEFS+=-DENABLE_GTK
-PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
+PKGCONFIG_MODULES+=gtk+-2.0 gthread-2.0
.INCLUDE : pkg_config.mk
.ENDIF
diff -ru extensions/source/plugin/unx/npnapi.cxx extensions/source/plugin/unx/npnapi.cxx
--- openoffice.org.orig/extensions/source/plugin/unx/npnapi.cxx 2008-12-05 15:47:49.000000000 +0000
+++ openoffice.org/extensions/source/plugin/unx/npnapi.cxx 2008-12-05 17:08:02.000000000 +0000
@@ -51,13 +51,14 @@
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
+ UINT32 nFileID = pConnector->GetStreamID( stream );
MediatorMessage* pMes=
pConnector->
Transact( eNPN_DestroyStream,
&nInstance, sizeof( nInstance ),
- pConnector->GetStreamID( stream ), sizeof( int ),
+ &nFileID, sizeof( nFileID ),
POST_STRING( stream->url ),
- reason, sizeof( reason ),
+ &reason, sizeof( reason ),
NULL );
if( ! pMes )
@@ -686,7 +690,7 @@
{
medDebug( 1, "creating gtk plug and socket\n" );
- pInst->pGtkWindow = gtk_plug_new((GdkNativeWindow)pWindow->window);
+ pInst->pGtkWindow = gtk_plug_new((GdkNativeWindow)(sal_uIntPtr)pWindow->window);
gtk_widget_show( pInst->pGtkWindow );
pInst->pGtkWidget = gtk_socket_new();
gtk_widget_show( pInst->pGtkWidget );
diff -ru extensions/source/plugin/unx/nppapi.cxx extensions/source/plugin/unx/nppapi.cxx
--- openoffice.org.orig/extensions/source/plugin/unx/nppapi.cxx 2008-12-05 15:47:49.000000000 +0000
+++ openoffice.org/extensions/source/plugin/unx/nppapi.cxx 2008-12-05 17:04:37.000000000 +0000
@@ -397,7 +397,7 @@
saved ? saved->len : 0 ) );
char *pArgnBuf, *pArgvBuf;
- int nArgnLen = 0, nArgvLen = 0;
+ size_t nArgnLen = 0, nArgvLen = 0;
int i;
for( i = 0; i < argc; i++ )
{
@@ -425,7 +425,7 @@
&argc, sizeof( argc ),
pArgnBuf, nArgnLen,
pArgvBuf, nArgvLen,
- saved->buf, saved->len,
+ saved->buf, static_cast<size_t>(saved->len),
NULL );
else
pMes =
@@ -435,7 +435,7 @@
&argc, sizeof( argc ),
pArgnBuf, nArgnLen,
pArgvBuf, nArgvLen,
- "0000", 4,
+ "0000", size_t(4),
NULL );
delete [] pArgnBuf;
delete [] pArgvBuf;
@@ -542,7 +544,7 @@
POST_INSTANCE(),
&nFileID, sizeof( nFileID ),
&offset, sizeof( offset ),
- buffer, len,
+ buffer, static_cast<size_t>(len),
NULL );
if( ! pMes )
return 0;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1709
retrieving revision 1.1710
diff -u -r1.1709 -r1.1710
--- openoffice.org.spec 6 Dec 2008 16:16:42 -0000 1.1709
+++ openoffice.org.spec 6 Dec 2008 16:33:38 -0000 1.1710
@@ -129,6 +129,7 @@
Patch56: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
Patch57: openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
Patch58: workspace.swffixes.patch
+Patch59: openoffice.org-3.0.1.ooo96970.pluginfixups.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1382,6 +1383,7 @@
%patch56 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
%patch57 -p1 -b .ooo96906.ucb.symlinks.and.size.patch
%patch58 -p1 -b .workspace.swffixes.patch
+%patch59 -p1 -b .ooo96970.pluginfixups.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3751,6 +3753,7 @@
* Sat Dec 06 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.3
- rebuild for python
- Resolves: rhbz#473390 add workspace.swffixes.patch
+- Resolves: rhbz#473390 add openoffice.org-3.0.1.ooo96970.pluginfixups.patch
- add openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
- rename openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch to
upstream workspace.mba31issues01.patch
More information about the fedora-extras-commits
mailing list