rpms/openoffice.org/devel openoffice.org.spec, 1.1599, 1.1600 workspace.cmcfixes48.patch, 1.1, 1.2 openoffice.org-1.9.115.ooo69368.fixxmlsec.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Aug 1 23:48:59 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5032
Modified Files:
openoffice.org.spec workspace.cmcfixes48.patch
Removed Files:
openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
Log Message:
remove oldxmlsec
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1599
retrieving revision 1.1600
diff -u -r1.1599 -r1.1600
--- openoffice.org.spec 1 Aug 2008 15:45:48 -0000 1.1599
+++ openoffice.org.spec 1 Aug 2008 23:48:29 -0000 1.1600
@@ -74,40 +74,39 @@
%endif
Patch4: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
Patch5: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch6: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch7: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch8: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch9: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch10: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch11: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch12: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch13: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch14: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch15: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch16: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch17: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch18: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch19: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch20: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch21: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch22: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch23: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch24: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch25: workspace.cmcfixes48.patch
-Patch26: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch27: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch28: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch29: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch30: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch31: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch32: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch33: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch34: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch35: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch36: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch37: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
-Patch38: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
-Patch39: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
+Patch6: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch7: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch8: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch9: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch10: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch11: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch12: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch14: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch15: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch16: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch17: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch18: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch19: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch20: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch21: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch22: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch23: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch24: workspace.cmcfixes48.patch
+Patch25: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch26: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch27: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch28: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch29: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch30: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch31: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch34: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+Patch35: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch36: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
+Patch37: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch38: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1227,40 +1226,39 @@
%endif
%patch4 -p1 -b .ooo83140.jvmfwk.retryjvm.patch
%patch5 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch6 -p1 -b .ooo69368.fixxmlsec.patch
-%patch7 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch8 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch9 -p1
-%patch10 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch11 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch12 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch13 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH14} >> svtools/source/dialogs/localize.sdf
-%patch15 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch16 -p0 -b .ooo68717.gstreamer.video.patch
-%patch17 -p1 -b .ooo63159.sal.dtype.patch
-%patch18 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch19 -p1 -b .ooo80816.selinux.bridges.patch
-%patch20 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch21 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH22}
-%patch23 -p1 -b .ooo76649.httpencoding.patch
-%patch24 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch25 -p1
-%patch26 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch27 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch28 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch29 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch30 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch31 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch32 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch33 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch34 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch35 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch36 -p1 -b .ooo86142.serbiannumbering.patch
-%patch37 -p1 -b .ooo91977.sd.holdreference.patch
-%patch38 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
-%patch39 -p1 -b .ooo92253.dbaccess.a11y.crash
+%patch6 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch7 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch8 -p1
+%patch9 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch10 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch11 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch12 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH13} >> svtools/source/dialogs/localize.sdf
+%patch14 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch15 -p0 -b .ooo68717.gstreamer.video.patch
+%patch16 -p1 -b .ooo63159.sal.dtype.patch
+%patch17 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch18 -p1 -b .ooo80816.selinux.bridges.patch
+%patch19 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch20 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH21}
+%patch22 -p1 -b .ooo76649.httpencoding.patch
+%patch23 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch24 -p1
+%patch25 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch26 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch27 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch28 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch29 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch30 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch31 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch33 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch34 -p1 -b .ooo90876.connectivity.evoab2.patch
+%patch35 -p1 -b .ooo86142.serbiannumbering.patch
+%patch36 -p1 -b .ooo91977.sd.holdreference.patch
+%patch37 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch38 -p1 -b .ooo92253.dbaccess.a11y.crash
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2516,7 +2514,6 @@
%{_datadir}/icons/*/*/*/openoffice*
%{_datadir}/mime-info/openoffice.org.*
%{basisinstdir}/program/libxmlsecurity.so
-%{basisinstdir}/program/liboldxmlsec*
%{_datadir}/mime/packages/openoffice.org.xml
%{basisinstdir}/program/behelper.uno.so
%{basisinstdir}/program/configmgr2.uno.so
workspace.cmcfixes48.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 workspace.cmcfixes48.patch
Index: workspace.cmcfixes48.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes48.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.cmcfixes48.patch 28 Jul 2008 11:20:56 -0000 1.1
+++ workspace.cmcfixes48.patch 1 Aug 2008 23:48:29 -0000 1.2
@@ -1,10 +1,298 @@
-Index: source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx,v
-retrieving revision 1.5
-diff -u -r1.5 MMozillaBootstrap.cxx
---- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx 17 Sep 2006 02:58:42 -0000 1.5
-+++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx 20 Jun 2008 09:12:58 -0000
+Index: api/offapi/com/sun/star/security/SerialNumberAdapter.idl
+diff -u /dev/null api/offapi/com/sun/star/security/SerialNumberAdapter.idl:1.1.2.1
+--- /dev/null Fri Aug 1 09:30:33 2008
++++ api/offapi/com/sun/star/security/SerialNumberAdapter.idl Fri Aug 1 09:28:21 2008
+@@ -0,0 +1,60 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifndef __com_sun_star_security_SerialNumberAdapter_idl_
++#define __com_sun_star_security_SerialNumberAdapter_idl_
++
++//============================================================================
++
++module com { module sun { module star { module security {
++ interface XSerialNumberAdapter; };
++}; }; };
++
++//============================================================================
++
++module com { module sun { module star { module security {
++
++//============================================================================
++
++/** provides conversion services for Serial Numbers.
++
++ <p>An implementation of this service enables the conversion of certificate
++ serial number to and from a string</p>
++
++ @since OOo 3.1.0
++ */
++
++service SerialNumberAdapter : XSerialNumberAdapter;
++
++//============================================================================
++
++}; }; }; };
++
++#endif
+Index: api/offapi/com/sun/star/security/XSerialNumberAdapter.idl
+diff -u /dev/null api/offapi/com/sun/star/security/XSerialNumberAdapter.idl:1.1.2.1
+--- /dev/null Fri Aug 1 09:30:33 2008
++++ api/offapi/com/sun/star/security/XSerialNumberAdapter.idl Fri Aug 1 09:28:21 2008
+@@ -0,0 +1,62 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++/** -- idl definition -- **/
++
++#ifndef __com_sun_star_security_XSerialNumberAdapter_idl_
++#define __com_sun_star_security_XSerialNumberAdapter_idl_
++
++#include <com/sun/star/uno/XInterface.idl>
++
++module com { module sun { module star { module security {
++
++/**
++ * Interface of Certificate Serial Number Converter
++ *
++ * <p>This interface converts a certificate serial number to and from a string</p>
++ */
++interface XSerialNumberAdapter : com::sun::star::uno::XInterface
++{
++ /**
++ * Convert the SerialNumber to a string
++ */
++ string toString( [in]sequence< byte > SerialNumber );
++
++ /**
++ * Convert the SerialNumber to a sequence
++ */
++ sequence< byte > toSequence( [in]string SerialNumber );
++
++} ;
++
++} ; } ; } ; } ;
++
++#endif
++
+Index: api/offapi/com/sun/star/security/makefile.mk
+diff -u api/offapi/com/sun/star/security/makefile.mk:1.8 api/offapi/com/sun/star/security/makefile.mk:1.8.108.1
+--- api/offapi/com/sun/star/security/makefile.mk:1.8 Thu Apr 10 20:19:53 2008
++++ api/offapi/com/sun/star/security/makefile.mk Fri Aug 1 09:28:21 2008
+@@ -60,6 +60,8 @@
+ XDocumentDigitalSignatures.idl \
+ KeyUsage.idl \
+ XCertificateContainer.idl \
++ XSerialNumberAdapter.idl \
++ SerialNumberAdapter.idl \
+ CertificateContainer.idl \
+ CertificateContainerStatus.idl
+
+Index: installation/scp2/source/ooo/file_library_ooo.scp
+diff -u installation/scp2/source/ooo/file_library_ooo.scp:1.302 installation/scp2/source/ooo/file_library_ooo.scp:1.302.14.1
+--- installation/scp2/source/ooo/file_library_ooo.scp:1.302 Thu Jul 17 08:34:36 2008
++++ installation/scp2/source/ooo/file_library_ooo.scp Fri Aug 1 07:08:01 2008
+@@ -1104,6 +1104,20 @@
+ Name = "oleautobridge.uno.dll";
+ End
+
++#else
++
++File gid_File_Lib_Mozbootstrap
++ TXT_FILE_BODY;
++ Styles = (PACKED,UNO_COMPONENT,PATCH);
++ RegistryID = gid_Starregistry_Services_Rdb;
++ Dir = gid_Dir_Program;
++ #ifdef UNX
++ Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
++ #else
++ Name = "libmozbootstrap.dll";
++ #endif
++End
++
+ #endif
+
+ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2)
+@@ -1657,26 +1671,18 @@
+ RegistryID = gid_Starregistry_Services_Rdb;
+ End
+
++#ifdef WNT
+ File gid_File_Lib_LibXMLSec_xmlseccore
+ TXT_FILE_BODY;
+- #ifdef UNX
+- #ifdef MACOSX
+- Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX));
+- #else
+- Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
+- #endif
++ #ifdef _gcc3
[...1653 lines suppressed...]
initialized = 1 ;
}
-diff -ru openoffice.org/solenv/bin/langwrap openoffice.org/solenv/bin/langwrap
---- openoffice.org.orig/solenv/bin/langwrap 2008-01-10 12:24:02.000000000 +0000
-+++ openoffice.org/solenv/bin/langwrap 2008-01-10 12:26:45.000000000 +0000
+Index: xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+diff -u xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx:1.9 xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx:1.9.22.1
+--- xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx:1.9 Thu Apr 10 17:39:31 2008
++++ xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx Wed Jul 30 02:30:34 2008
+@@ -47,6 +47,11 @@
+ #endif
+ #include "errorcallback.hxx"
+
++#include <sal/types.h>
++//For reasons that escape me, this is what xmlsec does when size_t is not 4
++#if SAL_TYPES_SIZEOFPOINTER != 4
++# define XMLSEC_NO_SIZE_T
++#endif
+ #include "xmlsec/xmlsec.h"
+ #include "xmlsec/xmltree.h"
+ #include "xmlsec/xmlenc.h"
+Index: xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+diff -u xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx:1.7 xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx:1.7.22.1
+--- xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx:1.7 Thu Apr 10 17:40:05 2008
++++ xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx Wed Jul 30 02:30:35 2008
+@@ -39,6 +39,11 @@
+ #endif
+ #include "xmlstreamio.hxx"
+
++#include <sal/types.h>
++//For reasons that escape me, this is what xmlsec does when size_t is not 4
++#if SAL_TYPES_SIZEOFPOINTER != 4
++# define XMLSEC_NO_SIZE_T
++#endif
+ #include "xmlsec/xmlsec.h"
+ #include "xmlsec/keysmngr.h"
+ #include "xmlsec/crypto.h"
+Index: xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+diff -u xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx:1.9 xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx:1.9.22.1
+--- xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx:1.9 Thu Apr 10 17:40:37 2008
++++ xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx Wed Jul 30 02:30:35 2008
+@@ -52,6 +52,11 @@
+ #include "xmlstreamio.hxx"
+ #include "errorcallback.hxx"
+
++#include <sal/types.h>
++//For reasons that escape me, this is what xmlsec does when size_t is not 4
++#if SAL_TYPES_SIZEOFPOINTER != 4
++# define XMLSEC_NO_SIZE_T
++#endif
+ #include "xmlsec/xmlsec.h"
+ #include "xmlsec/xmldsig.h"
+ #include "xmlsec/crypto.h"
+Index: xml/xmlsecurity/util/makefile.mk
+diff -u xml/xmlsecurity/util/makefile.mk:1.22 xml/xmlsecurity/util/makefile.mk:1.22.22.1
+--- xml/xmlsecurity/util/makefile.mk:1.22 Thu Apr 10 17:51:04 2008
++++ xml/xmlsecurity/util/makefile.mk Fri Aug 1 06:54:33 2008
+@@ -137,10 +137,6 @@
+ $(SLB)$/dialogs.lib \
+ $(SLB)$/component.lib
+
+-SHL4OBJS=\
+- $(SLO)$/baseencoding.obj \
+- $(SLO)$/biginteger.obj
+-
+ SHL4STDLIBS=\
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+@@ -158,9 +154,6 @@
+ $(XMLOFFLIB) \
+ $(SVXLIB)
+
+-#MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
+-SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
+-
+ SHL4VERSIONMAP = xmlsecurity.map
+ SHL4DEPN=
+ SHL4IMPLIB=i$(TARGET)
+Index: tools/solenv/bin/langwrap
+diff -u tools/solenv/bin/langwrap:1.1.1.1 tools/solenv/bin/langwrap:1.1.1.1.1992.1
+--- tools/solenv/bin/langwrap:1.1.1.1 Wed Sep 20 07:43:11 2000
++++ tools/solenv/bin/langwrap Thu Jul 24 05:55:01 2008
@@ -1,4 +1,4 @@
-#!/usr/solar/bin/perl -w
+#!/usr/bin/perl -w
#
# langwrap - language wrapper for building resources
#
-diff -ru openoffice.org/solenv/bin/modules/osarch.pm openoffice.org/solenv/bin/modules/osarch.pm
---- openoffice.org.orig/solenv/bin/modules/osarch.pm 2008-01-10 12:24:02.000000000 +0000
-+++ openoffice.org/solenv/bin/modules/osarch.pm 2008-01-10 12:26:56.000000000 +0000
+Index: tools/solenv/bin/pchdelta.py
+diff -u tools/solenv/bin/pchdelta.py:1.2 tools/solenv/bin/pchdelta.py:1.2.544.1
+--- tools/solenv/bin/pchdelta.py:1.2 Thu May 10 08:10:04 2007
++++ tools/solenv/bin/pchdelta.py Thu Jul 24 05:55:02 2008
+@@ -1,4 +1,4 @@
+-#!/bin/python
++#!/usr/bin/python
+
+ # ------------------------------------------------------------------------------
+ # Hacky little delta debug tool to figure out the proper includes for a pch file
+Index: tools/solenv/bin/modules/osarch.pm
+diff -u tools/solenv/bin/modules/osarch.pm:1.2 tools/solenv/bin/modules/osarch.pm:1.2.1888.1
+--- tools/solenv/bin/modules/osarch.pm:1.2 Thu Mar 27 03:47:56 2003
++++ tools/solenv/bin/modules/osarch.pm Thu Jul 24 05:55:02 2008
@@ -1,4 +1,4 @@
-#!/usr/solar/bin/perl -w
+#!/usr/bin/perl -w
# ***********************************************************************
# Description:
-diff -ru openoffice.org/solenv/bin/pchdelta.py openoffice.org/solenv/bin/pchdelta.py
---- openoffice.org.orig/solenv/bin/pchdelta.py 2008-01-10 12:24:02.000000000 +0000
-+++ openoffice.org/solenv/bin/pchdelta.py 2008-01-10 12:27:28.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/bin/python
-+#!/usr/bin/python
+Index: dba/dbaccess/source/filter/xml/dbloader2.cxx
+diff -u dba/dbaccess/source/filter/xml/dbloader2.cxx:1.36 dba/dbaccess/source/filter/xml/dbloader2.cxx:1.36.20.1
+--- dba/dbaccess/source/filter/xml/dbloader2.cxx:1.36 Wed Jun 25 05:33:55 2008
++++ dba/dbaccess/source/filter/xml/dbloader2.cxx Wed Jul 30 07:31:42 2008
+@@ -225,7 +225,7 @@
+ ::comphelper::ComponentContext m_aContext;
+ Reference< XFrameLoader > m_xMySelf;
+ ::rtl::OUString m_sCurrentURL;
+- sal_Int32 m_nStartWizard;
++ ULONG m_nStartWizard;
+
+ DECL_LINK( OnStartTableWizard, void* );
+ public:
+Index: dba/dbaccess/source/ui/app/AppController.hxx
+diff -u dba/dbaccess/source/ui/app/AppController.hxx:1.30 dba/dbaccess/source/ui/app/AppController.hxx:1.30.16.1
+--- dba/dbaccess/source/ui/app/AppController.hxx:1.30 Wed Jun 25 05:35:42 2008
++++ dba/dbaccess/source/ui/app/AppController.hxx Wed Jul 30 07:31:42 2008
+@@ -137,7 +137,7 @@
+ TransferableClipboardListener*
+ m_pClipbordNotifier; // notifier for changes in the clipboard
+ mutable ::rtl::OUString m_sDatabaseName;
+- sal_Int32 m_nAsyncDrop;
++ ULONG m_nAsyncDrop;
+ OAsyncronousLink m_aControllerConnectedEvent;
+ OAsyncronousLink m_aSelectContainerEvent;
+ PreviewMode m_ePreviewMode; // the mode of the preview
+Index: dba/dbaccess/source/ui/inc/TableWindowListBox.hxx
+diff -u dba/dbaccess/source/ui/inc/TableWindowListBox.hxx:1.11 dba/dbaccess/source/ui/inc/TableWindowListBox.hxx:1.11.66.1
+--- dba/dbaccess/source/ui/inc/TableWindowListBox.hxx:1.11 Thu Apr 10 08:20:16 2008
++++ dba/dbaccess/source/ui/inc/TableWindowListBox.hxx Wed Jul 30 07:31:42 2008
+@@ -73,8 +73,8 @@
+ Point m_aMousePos;
+
+ OTableWindow* m_pTabWin;
+- sal_Int32 m_nDropEvent;
+- sal_Int32 m_nUiEvent;
++ ULONG m_nDropEvent;
++ ULONG m_nUiEvent;
+ OJoinDropData m_aDropInfo;
+
+ BOOL m_bReallyScrolled : 1;
+Index: dba/dbaccess/source/ui/inc/brwctrlr.hxx
+diff -u dba/dbaccess/source/ui/inc/brwctrlr.hxx:1.42 dba/dbaccess/source/ui/inc/brwctrlr.hxx:1.42.46.1
+--- dba/dbaccess/source/ui/inc/brwctrlr.hxx:1.42 Mon May 5 08:59:06 2008
++++ dba/dbaccess/source/ui/inc/brwctrlr.hxx Wed Jul 30 07:31:42 2008
+@@ -118,7 +118,7 @@
+ ::vos::OThread* m_pLoadThread; // the thread wherein the form is loaded
+ FormControllerImpl* m_pFormControllerImpl; // implementing the XFormController
+
+- sal_uInt32 m_nPendingLoadFinished; // the event used to tell ourself that the load is finished
++ ULONG m_nPendingLoadFinished; // the event used to tell ourself that the load is finished
+ sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction
+
+ sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow
+Index: dba/dbaccess/source/ui/inc/sbagrid.hxx
+diff -u dba/dbaccess/source/ui/inc/sbagrid.hxx:1.29 dba/dbaccess/source/ui/inc/sbagrid.hxx:1.29.66.1
+--- dba/dbaccess/source/ui/inc/sbagrid.hxx:1.29 Thu Apr 10 08:46:43 2008
++++ dba/dbaccess/source/ui/inc/sbagrid.hxx Wed Jul 30 07:31:42 2008
+@@ -259,7 +259,7 @@
+ protected:
+ ::svx::ODataAccessDescriptor m_aDataDescriptor;
+ SbaGridListener* m_pMasterListener;
+- sal_Int32 m_nAsyncDropEvent;
++ ULONG m_nAsyncDropEvent;
+ USHORT m_nLastColId;
+ long m_nLastRowId;
+
+Index: dba/dbaccess/source/ui/inc/unodatbr.hxx
+diff -u dba/dbaccess/source/ui/inc/unodatbr.hxx:1.73 dba/dbaccess/source/ui/inc/unodatbr.hxx:1.73.22.1
+--- dba/dbaccess/source/ui/inc/unodatbr.hxx:1.73 Wed Jun 25 05:50:41 2008
++++ dba/dbaccess/source/ui/inc/unodatbr.hxx Wed Jul 30 07:31:42 2008
+@@ -164,7 +164,7 @@
+ Splitter* m_pSplitter;
+ SvLBoxTreeList* m_pTreeModel; // contains the datasources of the registry
+ SvLBoxEntry* m_pCurrentlyDisplayed;
+- sal_Int32 m_nAsyncDrop;
++ ULONG m_nAsyncDrop;
+
+ sal_Int16 m_nBorder; // TRUE when border should be shown
- # ------------------------------------------------------------------------------
- # Hacky little delta debug tool to figure out the proper includes for a pch file
--- openoffice.org-1.9.115.ooo69368.fixxmlsec.patch DELETED ---
More information about the fedora-extras-commits
mailing list