rpms/openoffice.org/devel workspace.ppc64one.patch, NONE, 1.1 openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.13, 1.14 openoffice.org.spec, 1.1190, 1.1191
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Jun 5 13:02:03 UTC 2007
- Previous message (by thread): rpms/bind/F-7 .cvsignore, 1.26, 1.27 bind-9.3.2-redhat_doc.patch, 1.2, 1.3 bind-chroot-admin.in, 1.22, 1.23 bind.spec, 1.182, 1.183 sources, 1.33, 1.34 bind-9.3.1-redhat_doc.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.1191,1.1192
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22166
Modified Files:
openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
openoffice.org.spec
Added Files:
workspace.ppc64one.patch
Log Message:
workspace.ppc64.patch
workspace.ppc64one.patch:
--- NEW FILE workspace.ppc64one.patch ---
Index: tools/config_office/configure.in
diff -u tools/config_office/configure.in:1.204 tools/config_office/configure.in:1.204.4.1
--- tools/config_office/configure.in:1.204 Thu May 10 09:40:23 2007
+++ tools/config_office/configure.in Tue May 29 07:16:04 2007
@@ -5064,6 +5064,10 @@
AC_SUBST(USE_XINERAMA)
AC_SUBST(XINERAMA_LINK)
+AC_CHECK_SIZEOF(long)
+SIZEOF_LONG=$ac_cv_sizeof_long
+AC_SUBST(SIZEOF_LONG)
+
dnl ===================================================================
dnl Test for the presence of Ant and that it works
dnl ===================================================================
Index: tools/config_office/set_soenv.in
diff -u tools/config_office/set_soenv.in:1.144 tools/config_office/set_soenv.in:1.144.4.1
--- tools/config_office/set_soenv.in:1.144 Thu May 10 09:40:35 2007
+++ tools/config_office/set_soenv.in Tue May 29 07:16:04 2007
@@ -441,23 +441,40 @@
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
}
elsif ($platform =~ m/^powerpc/)
- { print "Setting Linux PPC specific values... ";
- $outfile = "LinuxPPCEnv.Set";
+ {
+ if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
+ print "Setting Linux PPC64 specific values... ";
+ $outfile = "LinuxPPC64Env.Set";
+ $OUTPATH = "unxlngppc64";
+ $CPUNAME = "POWERPC64";
+
+ if ( $JDK eq "gcj" ) {
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+ }
+ }
+ else {
+ print "Setting Linux PPC specific values... ";
+ $outfile = "LinuxPPCEnv.Set";
+ $OUTPATH = "unxlngppc";
+ $CPUNAME = "POWERPC";
+
+ if ( $JDK eq "gcj" ) {
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ }
+ }
+
$CPU = "P";
- $CPUNAME = "POWERPC";
- $OUTPATH = "unxlngppc";
+
+# the "standard" ppc j2sdk is IBMJava2-ppc-142
if ( $JDK ne "gcj" ) {
-# j2sdk is IBMJava2-ppc-142
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."bin";
}
- else {
-# j2sdk has sun-style locations
- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
- }
}
elsif ($platform =~ m/^s390/)
{ print "Setting Linux S/390 specific values... ";
@@ -821,6 +838,8 @@
$LIB64 = $ds."lib";
$LIB64 .= "64"
if ($platform =~ m/x86_64-.*-linux-gnu/);
+$LIB64 .= "64"
+if (($platform =~ m/powerpc64-.*-linux-gnu/) && ('@SIZEOF_LONG@' eq '8'));
$INC = $ds."inc";
$INCLUDE = $ds."include";
$DEV = $ds."dev";
Index: tools/solenv/bin/modules/installer/epmfile.pm
diff -u tools/solenv/bin/modules/installer/epmfile.pm:1.64 tools/solenv/bin/modules/installer/epmfile.pm:1.64.20.1
--- tools/solenv/bin/modules/installer/epmfile.pm:1.64 Thu May 10 06:56:33 2007
+++ tools/solenv/bin/modules/installer/epmfile.pm Tue Jun 5 04:31:17 2007
@@ -2074,9 +2074,10 @@
my $target = "";
if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
- if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
- if ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
- if ( $installer::globals::compiler =~ /unxlngppc/) {$target = "ppc"; }
+ elsif ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
+ elsif ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
+ elsif ( $installer::globals::compiler =~ /unxlngppc64/) {$target = "ppc64"; }
+ elsif ( $installer::globals::compiler =~ /unxlngppc/) {$target = "ppc"; }
my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 |";
@@ -2256,9 +2257,10 @@
{
my $rpmdir;
if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
- if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
- if ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
- if ( $installer::globals::compiler =~ /unxlngppc/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc"; }
+ elsif ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
+ elsif ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
+ elsif ( $installer::globals::compiler =~ /unxlngppc64/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc64"; }
+ elsif ( $installer::globals::compiler =~ /unxlngppc/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc"; }
my $systemcall = "mv $rpmdir/* $newdir"; # moving the rpms into the directory "RPMS"
@@ -2284,6 +2286,7 @@
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
+ installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/ppc64");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/ppc");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
Index: tools/solenv/inc/unx.mk
diff -u tools/solenv/inc/unx.mk:1.33 tools/solenv/inc/unx.mk:1.33.338.1
--- tools/solenv/inc/unx.mk:1.33 Wed Jul 19 02:26:37 2006
+++ tools/solenv/inc/unx.mk Tue May 29 07:18:59 2007
@@ -115,10 +115,14 @@
.INCLUDE : unxlngppc.mk
.ENDIF
-.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUXP2REDHAT60"
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC"
.INCLUDE : unxlngppc4.mk
.ENDIF
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC64"
+.INCLUDE : unxlngppc64.mk
+.ENDIF
+
.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUX32REDHAT60"
.INCLUDE : unxlngs3904.mk
.ENDIF
Index: tools/solenv/inc/unxlngppc4.mk
diff -u tools/solenv/inc/unxlngppc4.mk:1.26 tools/solenv/inc/unxlngppc4.mk:1.26.74.1
--- tools/solenv/inc/unxlngppc4.mk:1.26 Fri Mar 9 01:10:02 2007
+++ tools/solenv/inc/unxlngppc4.mk Thu May 31 03:28:15 2007
@@ -106,7 +106,7 @@
CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2 -fno-strict-aliasing
+CFLAGSOPT=-Os -fno-strict-aliasing
# Compiler flags for disabling optimizations
# don't change - required to work around optimization bugs
Index: tools/solenv/inc/unxlngppc64.mk
diff -u /dev/null tools/solenv/inc/unxlngppc64.mk:1.1.2.2
--- /dev/null Tue Jun 5 05:41:07 2007
+++ tools/solenv/inc/unxlngppc64.mk Fri Jun 1 05:05:04 2007
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library 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 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+# mk file for linux ppc64, inherit from ppc and add some flags
+
+.INCLUDE : unxlngppc4.mk
+
+CDEFS+=-DPOWERPC64
+CFLAGSCXX+=-mminimal-toc
Index: udk/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
[...1764 lines suppressed...]
+ pFPR, nFPR );
+ // NO exception occured...
+ *ppUnoExc = 0;
+
+ // reconvert temporary params
+ for ( ; nTempIndizes--; )
+ {
+ sal_Int32 nIndex = pTempIndizes[nTempIndizes];
+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
+
+ if (pParams[nIndex].bIn)
+ {
+ if (pParams[nIndex].bOut) // inout
+ {
+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
+ pThis->getBridge()->getCpp2Uno() );
+ }
+ }
+ else // pure out
+ {
+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
+ pThis->getBridge()->getCpp2Uno() );
+ }
+ // destroy temp cpp param => cpp: every param was constructed
+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
+
+ TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+ }
+ // return value
+ if (pCppReturn && pUnoReturn != pCppReturn)
+ {
+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
+ pThis->getBridge()->getCpp2Uno() );
+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
+ }
+ }
+ catch (...)
+ {
+ // fill uno exception
+ fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+ *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
+
+ // temporary params
+ for ( ; nTempIndizes--; )
+ {
+ sal_Int32 nIndex = pTempIndizes[nTempIndizes];
+ // destroy temp cpp param => cpp: every param was constructed
+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
+ }
+ // return type
+ if (pReturnTypeDescr)
+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
+ }
+}
+
+}
+
+namespace bridges { namespace cpp_uno { namespace shared {
+
+void unoInterfaceProxyDispatch(
+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
+ void * pReturn, void * pArgs[], uno_Any ** ppException )
+{
+ // is my surrogate
+ bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+ = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+
+ switch (pMemberDescr->eTypeClass)
+ {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ {
+
+ VtableSlot aVtableSlot(
+ getVtableSlot(
+ reinterpret_cast<
+ typelib_InterfaceAttributeTypeDescription const * >(
+ pMemberDescr)));
+
+ if (pReturn)
+ {
+ // dependent dispatch
+ cpp_call(
+ pThis, aVtableSlot,
+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
+ 0, 0, // no params
+ pReturn, pArgs, ppException );
+ }
+ else
+ {
+ // is SET
+ typelib_MethodParameter aParam;
+ aParam.pTypeRef =
+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
+ aParam.bIn = sal_True;
+ aParam.bOut = sal_False;
+
+ typelib_TypeDescriptionReference * pReturnTypeRef = 0;
+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ typelib_typedescriptionreference_new(
+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
+
+ // dependent dispatch
+ aVtableSlot.index += 1; //get then set method
+ cpp_call(
+ pThis, aVtableSlot,
+ pReturnTypeRef,
+ 1, &aParam,
+ pReturn, pArgs, ppException );
+
+ typelib_typedescriptionreference_release( pReturnTypeRef );
+ }
+
+ break;
+ }
+ case typelib_TypeClass_INTERFACE_METHOD:
+ {
+
+ VtableSlot aVtableSlot(
+ getVtableSlot(
+ reinterpret_cast<
+ typelib_InterfaceMethodTypeDescription const * >(
+ pMemberDescr)));
+ switch (aVtableSlot.index)
+ {
+ // standard calls
+ case 1: // acquire uno interface
+ (*pUnoI->acquire)( pUnoI );
+ *ppException = 0;
+ break;
+ case 2: // release uno interface
+ (*pUnoI->release)( pUnoI );
+ *ppException = 0;
+ break;
+ case 0: // queryInterface() opt
+ {
+ typelib_TypeDescription * pTD = 0;
+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
+ if (pTD)
+ {
+ uno_Interface * pInterface = 0;
+ (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
+ pThis->pBridge->getUnoEnv(),
+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
+
+ if (pInterface)
+ {
+ ::uno_any_construct(
+ reinterpret_cast< uno_Any * >( pReturn ),
+ &pInterface, pTD, 0 );
+ (*pInterface->release)( pInterface );
+ TYPELIB_DANGER_RELEASE( pTD );
+ *ppException = 0;
+ break;
+ }
+ TYPELIB_DANGER_RELEASE( pTD );
+ }
+ } // else perform queryInterface()
+ default:
+ // dependent dispatch
+ cpp_call(
+ pThis, aVtableSlot,
+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
+ pReturn, pArgs, ppException );
+ }
+ break;
+ }
+ default:
+ {
+ ::com::sun::star::uno::RuntimeException aExc(
+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
+
+ Type const & rExcType = ::getCppuType( &aExc );
+ // binary identical null reference
+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
+ }
+ }
+}
+
+} } }
Index: porting/sal/osl/unx/system.h
diff -u porting/sal/osl/unx/system.h:1.36 porting/sal/osl/unx/system.h:1.36.12.1
--- porting/sal/osl/unx/system.h:1.36 Thu May 10 02:16:48 2007
+++ porting/sal/osl/unx/system.h Thu May 31 03:33:15 2007
@@ -97,7 +97,9 @@
# if __BYTE_ORDER == __LITTLE_ENDIAN
# define _LITTLE_ENDIAN
# elif __BYTE_ORDER == __BIG_ENDIAN
-# define _BIG_ENDIAN
+# ifndef _BIG_ENDIAN
+# define _BIG_ENDIAN
+# endif
# elif __BYTE_ORDER == __PDP_ENDIAN
# define _PDP_ENDIAN
# endif
openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch:
Index: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 28 Nov 2006 17:35:13 -0000 1.13
+++ openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 5 Jun 2007 13:01:23 -0000 1.14
@@ -488,3 +488,80 @@
throw;
}
}
+Index: source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx,v
+retrieving revision 1.12
+diff -u -r1.12 cpp2uno.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx 22 Nov 2006 11:07:20 -0000 1.12
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx 5 Jun 2007 12:38:03 -0000
+@@ -512,7 +512,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- void ** slots, unsigned char * code,
++ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 /* functionCount */, sal_Int32 vTableOffset)
+ {
+@@ -523,7 +523,7 @@
+ switch (member->eTypeClass) {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vTableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -535,13 +535,13 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(code, functionOffset++, vTableOffset, true);
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vTableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:55:15.000000000 +0100
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:56:12.000000000 +0100
+@@ -674,7 +674,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- void ** slots, unsigned char * code,
++ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 functionCount, sal_Int32 vtableOffset)
+ {
+@@ -690,7 +690,7 @@
+ switch (member->eTypeClass) {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -703,13 +703,13 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(code, functionOffset++, vtableOffset, true);
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+- *slots++ = code;
++ *slots++ = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1190
retrieving revision 1.1191
diff -u -r1.1190 -r1.1191
--- openoffice.org.spec 31 May 2007 16:20:23 -0000 1.1190
+++ openoffice.org.spec 5 Jun 2007 13:01:23 -0000 1.1191
@@ -91,7 +91,7 @@
Patch25: openoffice.org-2.0.2.rh188467.printingdefaults.patch
Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
Patch27: workspace.fpicker6.patch
-Patch28: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch28: workspace.ppc64one.patch
Patch29: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
Patch30: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
Patch31: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
@@ -140,6 +140,7 @@
Patch74: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
Patch75: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
Patch76: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch77: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
%define instdir %{_libdir}/openoffice.org
@@ -1023,7 +1024,7 @@
%patch25 -p1
%patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
%patch27 -p1 -b .workspace.fpicker6.patch
-%patch28 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch28 -p1 -b .workspace.ppc64one.patch
%patch29 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
%patch30 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
%patch31 -p1 -b .rh187919.gtkunderkde.patch
@@ -1076,6 +1077,7 @@
%if %{linkopt}
%patch76 -p0 -b .ooo77885.stoc.stocmerge.patch
%endif
+%patch77 -p0 -b .oooXXXXX.selinux.bridges.patch
cp %{SOURCE1} extras/source/database/evolocal.odb
@@ -2660,9 +2662,11 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Thu May 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.2
+* Tue Jun 05 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.2
- Resolves: rhbz#241875 get script detection right for range vs point
in drawing objects ooo#72349
+- add workspace.ppc64.patch
+- extend selinux patch for ppc64 and sparc
* Thu May 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
- next 2.2.1 release candidate
- Previous message (by thread): rpms/bind/F-7 .cvsignore, 1.26, 1.27 bind-9.3.2-redhat_doc.patch, 1.2, 1.3 bind-chroot-admin.in, 1.22, 1.23 bind.spec, 1.182, 1.183 sources, 1.33, 1.34 bind-9.3.1-redhat_doc.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.1191,1.1192
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list