rpms/openoffice.org/devel openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch, NONE, 1.1 openoffice.org.spec, 1.748, 1.749
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 29 09:43:34 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6183
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
Log Message:
fix for x86_64 input method
openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch:
breakiterator/xdictionary.cxx | 12 ++++++------
source/breakiterator/xdictionary.cxx | 0
2 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch ---
Index: source/breakiterator/xdictionary.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/breakiterator/xdictionary.cxx,v
retrieving revision 1.11
diff -u -r1.11 xdictionary.cxx
--- openoffice.org.orig/i18npoolsource/breakiterator/xdictionary.cxx 1 Nov 2005 14:52:31 -0000 1.11
+++ openoffice.org/i18npool/source/breakiterator/xdictionary.cxx 29 Jun 2006 09:29:14 -0000
@@ -67,16 +70,16 @@
aBuf.appendAscii( "dict_" ).appendAscii( lang ).appendAscii( SAL_DLLEXTENSION );
hModule = osl_loadModule( aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
if( hModule ) {
- int (*func)();
- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
+ sal_IntPtr (*func)();
+ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
existMark = (sal_uInt8*) (*func)();
- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
+ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
index1 = (sal_Int16*) (*func)();
- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
+ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
index2 = (sal_Int32*) (*func)();
- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
+ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
lenArray = (sal_Int32*) (*func)();
- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
+ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
dataArea = (sal_Unicode*) (*func)();
}
else
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -r1.748 -r1.749
--- openoffice.org.spec 29 Jun 2006 06:53:22 -0000 1.748
+++ openoffice.org.spec 29 Jun 2006 09:43:31 -0000 1.749
@@ -106,6 +106,7 @@
Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
Patch41: workspace.sixtyfour06.patch
Patch42: openoffice.org.2.0.3-ooo66018.solenv.dangerousvisibility.patch
+Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -839,6 +840,7 @@
%patch40 -p1 -b .ooo65519.printing.samba.patch
%patch41 -p1 -b .workspace.sixtyfour06.patch
%patch42 -p1 -b .ooo66018.solenv.dangerousvisibility.patch
+%patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
tar xzf %{SOURCE1}
@@ -3318,6 +3320,7 @@
%changelog
* Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
- disable -fvisibility-inlines-hidden
+- rh#196123# add openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
* Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
- next milestone
More information about the fedora-cvs-commits
mailing list