rpms/openoffice.org/devel .cvsignore, 1.150, 1.150.2.1 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.24, 1.24.2.1 openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.3, 1.3.2.1 openoffice.org-2.4.0.ooo85097.desktop.pagein.patch, 1.1, 1.1.2.1 openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch, 1.1, 1.1.2.1 openoffice.org.spec, 1.1440, 1.1440.2.1 pseudoworkspace.valgrind1.patch, 1.27, 1.27.2.1 sources, 1.273, 1.273.2.1 workspace.cairotext01.patch, 1.6, 1.6.2.1 openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch, 1.1, NONE openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch, 1.1, NONE openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch, 1.1, NONE openoffice.org-2.4.0.ooo86123.ucb.newneon.patch, 1.1, NONE workspace.gcc430two.patch, 1.7, NONE workspace.notes2.patch, 1.5, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Mar 7 14:33:16 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11048
Modified Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
.cvsignore
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
openoffice.org.spec pseudoworkspace.valgrind1.patch sources
workspace.cairotext01.patch
Removed Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
workspace.gcc430two.patch workspace.notes2.patch
Log Message:
test build on branch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.150
retrieving revision 1.150.2.1
diff -u -r1.150 -r1.150.2.1
--- .cvsignore 6 Mar 2008 09:50:42 -0000 1.150
+++ .cvsignore 7 Mar 2008 14:32:37 -0000 1.150.2.1
@@ -5,3 +5,4 @@
unowinreg.dll
bengali.sdf
OOH680_m9.tar.bz2
+DEV300_m1.tar.bz2
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 28 Jan 2008 17:26:40 -0000 1.24
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 7 Mar 2008 14:32:37 -0000 1.24.2.1
@@ -89,7 +89,7 @@
- // determine the filename of the license to show
- OUString aLangString;
- ::com::sun::star::lang::Locale aLocale;
-- OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
+- OString aMgrName = OString("dkt");
-
- AllSettings aSettings(Application::GetSettings());
- aLocale = aSettings.GetUILocale();
@@ -791,15 +791,6 @@
diff -u -r1.17 substitutepathvars.cxx
--- openoffice.org.orig/framework/source/services/substitutepathvars.cxx 16 Sep 2006 14:12:15 -0000 1.17
+++ openoffice.org/framework/source/services/substitutepathvars.cxx 28 Jun 2007 13:59:22 -0000
-@@ -129,7 +129,7 @@
- #endif
-
- #include <comphelper/configurationhelper.hxx>
--
-+#include <unotools/localedatawrapper.hxx>
- //_________________________________________________________________________________________________________________
- // Defines
- //_________________________________________________________________________________________________________________
@@ -1264,7 +1264,10 @@
Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
rtl::OUString aLocaleStr;
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch:
Index: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo80816.selinux.bridges.patch,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 4 Feb 2008 12:35:02 -0000 1.3
+++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 7 Mar 2008 14:32:37 -0000 1.3.2.1
@@ -5,7 +5,7 @@
diff -u -r1.5 vtablefactory.hxx
--- openoffice.org.orig/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 2 May 2006 11:59:11 -0000 1.5
+++ openoffice.org/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 17 May 2006 10:57:45 -0000
-@@ -60,11 +60,21 @@
+@@ -66,11 +66,21 @@
skipping an RTTI pointer, see mapBlockToVtable). Also, the block
contains any generated code snippets, after the vtable itself.
*/
@@ -28,7 +28,7 @@
};
/** The vtable structure corresponding to an interface type.
-@@ -110,8 +120,6 @@
+@@ -116,8 +126,6 @@
VtableFactory(VtableFactory &); // not implemented
void operator =(VtableFactory); // not implemented
@@ -37,16 +37,16 @@
void createVtables(
GuardedBlocks & blocks, BaseOffset const & baseOffset,
typelib_InterfaceTypeDescription * type, bool includePrimary) const;
-@@ -162,7 +170,7 @@
+@@ -169,7 +177,7 @@
@return a pointer to the remaining code snippet area
*/
static unsigned char * addLocalFunctions(
-- void ** slots, unsigned char * code,
-+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
sal_Int32 functionCount, sal_Int32 vtableOffset);
-@@ -181,8 +189,6 @@
+@@ -188,8 +196,6 @@
osl::Mutex m_mutex;
Map m_map;
@@ -62,7 +62,7 @@
diff -u -r1.10 cpp2uno.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 2 May 2006 12:01:33 -0000 1.10
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 17 May 2006 10:57:47 -0000
-@@ -361,7 +361,7 @@
+@@ -367,7 +367,7 @@
int const codeSnippetSize = 16;
unsigned char * codeSnippet(
@@ -71,7 +71,7 @@
typelib_TypeClass returnTypeClass)
{
if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-@@ -407,7 +407,7 @@
+@@ -413,7 +413,7 @@
// jmp privateSnippetExecutor:
*p++ = 0xE9;
*reinterpret_cast< sal_Int32 * >(p)
@@ -80,33 +80,33 @@
p += sizeof (sal_Int32);
OSL_ASSERT(p - code <= codeSnippetSize);
return code + codeSnippetSize;
-@@ -434,7 +434,7 @@
+@@ -445,7 +445,7 @@
}
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-- void ** slots, unsigned char * code,
-+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
sal_Int32 functionCount, sal_Int32 vtableOffset)
{
-@@ -445,9 +445,9 @@
+@@ -458,9 +458,9 @@
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
// Getter:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+ code, writetoexecdiff, functionOffset++, vtableOffset,
reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
member)->pAttributeTypeRef->eTypeClass);
// Setter:
-@@ -455,17 +455,17 @@
+@@ -468,17 +468,17 @@
typelib_InterfaceAttributeTypeDescription * >(
member)->bReadOnly)
{
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+ code, writetoexecdiff, functionOffset++, vtableOffset,
@@ -115,8 +115,8 @@
break;
case typelib_TypeClass_INTERFACE_METHOD:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+ code, writetoexecdiff, functionOffset++, vtableOffset,
@@ -130,40 +130,47 @@
diff -u -r1.8 cpp2uno.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 2 May 2006 12:02:15 -0000 1.8
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 17 May 2006 10:57:47 -0000
-@@ -676,7 +676,7 @@
+@@ -685,7 +685,7 @@
}
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-- void ** slots, unsigned char * code,
-+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
sal_Int32 functionCount, sal_Int32 vtableOffset)
{
-@@ -692,7 +692,7 @@
+@@ -702,9 +702,9 @@
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
// Getter:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+- code, functionOffset++, vtableOffset,
++ code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
-@@ -705,13 +705,13 @@
+ reinterpret_cast<
+ typelib_InterfaceAttributeTypeDescription * >(
+@@ -715,15 +715,15 @@
typelib_InterfaceAttributeTypeDescription * >(
member)->bReadOnly)
{
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
- code = codeSnippet(code, functionOffset++, vtableOffset, true);
+- (s++)->fn = code;
+- code = codeSnippet(code, functionOffset++, vtableOffset, true);
++ (s++)->fn = code + writetoexecdiff;
++ code = codeSnippet(code, functionOffset++, vtableOffset, true);
}
break;
case typelib_TypeClass_INTERFACE_METHOD:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+- code, functionOffset++, vtableOffset,
++ code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
+ reinterpret_cast<
+ typelib_InterfaceMethodTypeDescription * >(
Index: source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx,v
@@ -171,41 +178,46 @@
diff -u -r1.5 cpp2uno.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx 2 May 2006 12:03:36 -0000 1.5
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx 17 May 2006 10:57:48 -0000
-@@ -487,7 +487,7 @@
+@@ -494,7 +494,7 @@
//==================================================================================================
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-- void ** slots, unsigned char * code,
-+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
sal_Int32 functionCount, sal_Int32 nVtableOffset )
{
-@@ -504,14 +504,14 @@
+@@ -513,15 +513,15 @@
reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
// get method
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
- code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
+- (s++)->fn = code;
+- code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
++ (s++)->fn = code + writetoexecdiff;
++ code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
if ( ! pAttrTD->bReadOnly )
{
// set method
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
- code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
+- (s++)->fn = code;
+- code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
++ (s++)->fn = code + writetoexecdiff;
++ code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
}
}
-@@ -520,7 +520,7 @@
+ else if ( typelib_TypeClass_INTERFACE_METHOD == pTD->eTypeClass )
+@@ -529,8 +529,8 @@
typelib_InterfaceMethodTypeDescription *pMethodTD =
reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
- code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
+- (s++)->fn = code;
+- code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
++ (s++)->fn = code + writetoexecdiff;
++ code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
}
+ else
Index: source/cpp_uno/shared/cppinterfaceproxy.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx,v
@@ -248,7 +260,7 @@
#elif defined SAL_W32
#define WIN32_LEAN_AND_MEAN
#ifdef _MSC_VER
-@@ -80,9 +84,12 @@
+@@ -80,9 +85,12 @@
using bridges::cpp_uno::shared::VtableFactory;
@@ -263,7 +275,7 @@
sal_Size pagesize;
#if defined SAL_UNX
#if defined FREEBSD || defined NETBSD
-@@ -101,45 +108,118 @@
+@@ -101,45 +109,118 @@
#else
#error Unsupported platform
#endif
@@ -404,7 +416,7 @@
}
class VtableFactory::GuardedBlocks: public std::vector< Block > {
-@@ -160,11 +240,6 @@
+@@ -160,11 +241,6 @@
};
VtableFactory::GuardedBlocks::~GuardedBlocks() {
@@ -416,7 +428,7 @@
}
class VtableFactory::BaseOffset {
-@@ -199,28 +274,17 @@
+@@ -199,28 +275,17 @@
return offset;
}
@@ -446,7 +458,7 @@
}
VtableFactory::Vtables VtableFactory::getVtables(
-@@ -248,10 +312,6 @@
+@@ -248,10 +313,6 @@
return i->second;
}
@@ -457,7 +469,7 @@
void VtableFactory::createVtables(
GuardedBlocks & blocks, BaseOffset const & baseOffset,
typelib_InterfaceTypeDescription * type, bool includePrimary) const
-@@ -259,17 +319,16 @@
+@@ -259,31 +320,30 @@
if (includePrimary) {
sal_Int32 slotCount
= bridges::cpp_uno::shared::getPrimaryFunctions(type);
@@ -470,26 +482,25 @@
throw std::bad_alloc();
}
try {
-- void ** slots = initializeBlock(block.start) + slotCount;
-+ void ** slots = initializeBlock(block.writep) + slotCount;
+- Slot * slots = initializeBlock(block.start, slotCount);
++ Slot * slots = initializeBlock(block.writep, slotCount);
unsigned char * codeBegin =
reinterpret_cast< unsigned char * >(slots);
unsigned char * code = codeBegin;
-+ sal_PtrDiff writetoexecdiff = sal_IntPtr(block.execp) - sal_IntPtr(block.writep);
- sal_Int32 vtableOffset = blocks.size() * sizeof (void **);
++ sal_PtrDiff writetoexecdiff = sal_IntPtr(block.execp) - sal_IntPtr(block.writep);
+ sal_Int32 vtableOffset = blocks.size() * sizeof (Slot *);
for (typelib_InterfaceTypeDescription const * type2 = type;
type2 != 0; type2 = type2->pBaseTypeDescription)
-@@ -278,14 +337,14 @@
- = bridges::cpp_uno::shared::getLocalFunctions(type2);
- slots -= functionCount;
+ {
code = addLocalFunctions(
-- slots, code, type2,
-+ slots, code, writetoexecdiff, type2,
+- &slots, code, type2,
++ &slots, code, writetoexecdiff, type2,
baseOffset.getFunctionOffset(type2->aBase.pTypeName),
- functionCount, vtableOffset);
+ bridges::cpp_uno::shared::getLocalFunctions(type2),
+ vtableOffset);
}
flushCode(codeBegin, code);
-+ block.swapwriteandexec();
++ block.swapwriteandexec();
blocks.push_back(block);
} catch (...) {
- freeBlock(block);
@@ -503,73 +514,142 @@
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 @@
+@@ -518,7 +518,7 @@
}
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-- void ** slots, unsigned char * code,
-+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
- sal_Int32 /* functionCount */, sal_Int32 vTableOffset)
+ sal_Int32 functionCount, sal_Int32 vTableOffset)
{
-@@ -523,7 +523,7 @@
+@@ -531,9 +531,9 @@
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
// Getter:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vTableOffset,
+- code, functionOffset++, vTableOffset,
++ code, functionOffset++, vTableOffset,
bridges::cpp_uno::shared::isSimpleType(
-@@ -535,13 +535,13 @@
+ reinterpret_cast<
+ typelib_InterfaceAttributeTypeDescription * >(
+@@ -543,15 +543,15 @@
typelib_InterfaceAttributeTypeDescription * >(
member)->bReadOnly)
{
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
- code = codeSnippet(code, functionOffset++, vTableOffset, true);
+- (s++)->fn = code;
+- code = codeSnippet(code, functionOffset++, vTableOffset, true);
++ (s++)->fn = code + writetoexecdiff;
++ code = codeSnippet(code, functionOffset++, vTableOffset, true);
}
break;
case typelib_TypeClass_INTERFACE_METHOD:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vTableOffset,
+- code, functionOffset++, vTableOffset,
++ code, functionOffset++, vTableOffset,
bridges::cpp_uno::shared::isSimpleType(
+ reinterpret_cast<
+ typelib_InterfaceMethodTypeDescription * >(
--- 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
-@@ -666,7 +666,7 @@
+@@ -670,7 +670,7 @@
}
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-- void ** slots, unsigned char * code,
-+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
sal_Int32 functionCount, sal_Int32 vtableOffset)
{
-@@ -682,7 +682,7 @@
+@@ -688,9 +688,9 @@
switch (member->eTypeClass) {
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
// Getter:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+- code, functionOffset++, vtableOffset,
++ code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
-@@ -695,13 +695,13 @@
+ reinterpret_cast<
+ typelib_InterfaceAttributeTypeDescription * >(
+@@ -701,15 +701,15 @@
typelib_InterfaceAttributeTypeDescription * >(
member)->bReadOnly)
{
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
- code = codeSnippet(code, functionOffset++, vtableOffset, true);
+- (s++)->fn = code;
+- code = codeSnippet(code, functionOffset++, vtableOffset, true);
++ (s++)->fn = code + writetoexecdiff;
++ code = codeSnippet(code, functionOffset++, vtableOffset, true);
}
break;
case typelib_TypeClass_INTERFACE_METHOD:
-- *slots++ = code;
-+ *slots++ = code + writetoexecdiff;
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
code = codeSnippet(
- code, functionOffset++, vtableOffset,
+- code, functionOffset++, vtableOffset,
++ code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
+ reinterpret_cast<
+ typelib_InterfaceMethodTypeDescription * >(
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx 2008-03-07 09:23:13.000000000 +0000
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx 2008-03-07 09:34:58.000000000 +0000
+@@ -580,7 +580,7 @@
+ {
+ const int codeSnippetSize = 40;
+
+-bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
++bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
+ bool bHasHiddenParam )
+ {
+ #ifdef CMC_DEBUG
+@@ -603,7 +603,7 @@
+ raw[2] = nOffsetAndIndex;
+ raw[3] = destination->gp_value;
+
+- return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code);
++ return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code+writetoexecdiff);
+ }
+ }
+
+@@ -633,7 +633,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- Slot ** in_slots, unsigned char * code,
++ Slot ** in_slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 functionCount, sal_Int32 vtableOffset)
+ {
+@@ -652,7 +652,7 @@
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+ *slots++ = codeSnippet(
+- code, functionOffset++, vtableOffset,
++ code, writetoexecdiff, functionOffset++, vtableOffset,
+ ia64::return_in_hidden_param(
+ reinterpret_cast<
+ typelib_InterfaceAttributeTypeDescription * >(
+@@ -665,14 +665,14 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- *slots++ = codeSnippet(code, functionOffset++, vtableOffset, false);
++ *slots++ = codeSnippet(code, writetoexecdiff, functionOffset++, vtableOffset, false);
+ code += codeSnippetSize;
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+ *slots++ = codeSnippet(
+- code, functionOffset++, vtableOffset,
++ code, writetoexecdiff, functionOffset++, vtableOffset,
+ ia64::return_in_hidden_param(
+ reinterpret_cast<
+ typelib_InterfaceMethodTypeDescription * >(
openoffice.org-2.4.0.ooo85097.desktop.pagein.patch:
Index: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85097.desktop.pagein.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org-2.4.0.ooo85097.desktop.pagein.patch 9 Jan 2008 07:48:30 -0000 1.1
+++ openoffice.org-2.4.0.ooo85097.desktop.pagein.patch 7 Mar 2008 14:32:37 -0000 1.1.2.1
@@ -6,17 +6,17 @@
--- openoffice.org.orig/desktop/source/pagein/makefile.mk 5 Oct 2006 10:47:06 -0000 1.9
+++ openoffice.org/desktop/source/pagein/makefile.mk 9 Jan 2008 07:43:34 -0000
@@ -110,7 +110,6 @@
- @-echo $(DLLPRE)go$(UPDDLLPOST) >> $@
- @-echo $(DLLPRE)sb$(UPDDLLPOST) >> $@
- @-echo $(DLLPRE)sfx$(UPDDLLPOST) >> $@
-- @-echo $(DLLPRE)so$(UPDDLLPOST) >> $@
+ @-echo $(DLLPRE)go$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)sb$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)sfx$(DFTDLLPOST) >> $@
+- @-echo $(DLLPRE)so$(DFTDLLPOST) >> $@
#
- @-echo $(DLLPRE)fwe$(UPDDLLPOST) >> $@
- @-echo $(DLLPRE)fwk$(UPDDLLPOST) >> $@
+ @-echo $(DLLPRE)fwe$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)fwk$(DFTDLLPOST) >> $@
@@ -122,12 +121,14 @@
@-echo $(DLLPRE)icuuc$(ICUDLLPOST) >> $@
- @-echo $(DLLPRE)sot$(UPDDLLPOST) >> $@
- @-echo $(DLLPRE)psp$(UPDDLLPOST) >> $@
+ @-echo $(DLLPRE)sot$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)psp$(DFTDLLPOST) >> $@
+.IF "$(USE_SYSTEM_STL)"!="YES"
.IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
@-echo $(DLLPRE)stlport_gcc$(DLLPOST) >> $@
openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch:
Index: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch 10 Jan 2008 17:52:27 -0000 1.1
+++ openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch 7 Mar 2008 14:32:38 -0000 1.1.2.1
@@ -1,11 +1,3 @@
-diff -ru openoffice.org/solenv/bin/compiler.wrap openoffice.org/solenv/bin/compiler.wrap
---- openoffice.org.orig/solenv/bin/compiler.wrap 2008-01-10 12:24:02.000000000 +0000
-+++ openoffice.org/solenv/bin/compiler.wrap 2008-01-10 12:26:52.000000000 +0000
-@@ -1,4 +1,3 @@
--#!/usr/solar/bin/perl -w
- #!/usr/bin/perl
-
- #print STDERR "ARGV =\n at ARGV\n";
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: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440
retrieving revision 1.1440.2.1
diff -u -r1.1440 -r1.1440.2.1
--- openoffice.org.spec 6 Mar 2008 09:52:37 -0000 1.1440
+++ openoffice.org.spec 7 Mar 2008 14:32:38 -0000 1.1440.2.1
@@ -1,6 +1,6 @@
-%define oootag OOH680
-%define ooomilestone 9
-%define rh_rpm_release 1
+%define oootag DEV300
+%define ooomilestone 1
+%define rh_rpm_release 0.1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -42,7 +42,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.4.0
+Version: 3.0.0
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
@@ -67,7 +67,7 @@
BuildRequires: libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel,
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
BuildRequires: perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
-BuildRequires: xerces-j2, hyphen-devel, openssl-devel
+BuildRequires: xerces-j2, hyphen-devel, openssl-devel, lpsolve-devel
Patch0: openoffice.org-simple-crash_report.sh
Patch1: openoffice.org-multiliblauncher.sh
@@ -124,27 +124,21 @@
Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch
Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch53: workspace.notes2.patch
-Patch54: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
-Patch57: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch58: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
-Patch59: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch60: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch61: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch62: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
-Patch63: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch64: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch65: workspace.cairotext01.patch
-Patch66: workspace.gcc430two.patch
-Patch67: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch68: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch69: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
-Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
-Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch72: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
-Patch73: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch55: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch56: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
+Patch57: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch58: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch59: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch60: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch61: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch62: workspace.cairotext01.patch
+Patch63: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch64: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch65: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
%define instdir %{_libdir}/openoffice.org
@@ -1082,27 +1076,21 @@
%patch50 -p1 -b .ooo82966.svx.missing3d.patch
%patch51 -p1 -b .ooo81307.sw.word2.patch
%patch52 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch53 -p1 -b .workspace.notes2.patch
-%patch54 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch55 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch56 -p1 -b .ooo84770.svx.eventsmismatch.patch
-%patch57 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch58 -p1 -b .ooo86670.config_office.xpcomasxul.patch
-%patch59 -p1 -b .ooo85097.desktop.pagein.patch
-%patch60 -p1
-%patch61 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch62 -p1 -b .ooo85385.svtools.a11ycrash.patch
-%patch63 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch64 -p1 -b .ooo85448.emptyrpath.patch
-%patch65 -p1 -b .workspace.cairotext01.patch
-%patch66 -p1 -b .workspace.gcc430two.patch
-%patch67 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch68 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch69 -p1 -b .ooo85931.svx.getentrypos.patch
-%patch70 -p1 -b .ooo86123.ucb.newneon.patch
-%patch71 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch72 -p1 -b .ooo86268.desktop.visibilitycockup.patch
-%patch73 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch53 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch54 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch55 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch56 -p1 -b .ooo86670.config_office.xpcomasxul.patch
+%patch57 -p1 -b .ooo85097.desktop.pagein.patch
+%patch58 -p1
+%patch59 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch60 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch61 -p1 -b .ooo85448.emptyrpath.patch
+%patch62 -p1 -b .workspace.cairotext01.patch
+%patch63 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch64 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch65 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch
+%patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2877,7 +2865,16 @@
%{python_py_sitearch}/unohelper.py*
-%changelog
+%6changelog
+* Fri Mar 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.1.1
+- extend selinux bodge to ia64
+- drop integrated workspace.notes2.patch
+- drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+- drop integrated openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
+- drop integrated workspace.gcc430two.patch
+- drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
+- drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
+
* Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
- next release candidate
pseudoworkspace.valgrind1.patch:
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -r1.27 -r1.27.2.1
--- pseudoworkspace.valgrind1.patch 24 Jan 2008 18:47:12 -0000 1.27
+++ pseudoworkspace.valgrind1.patch 7 Mar 2008 14:32:38 -0000 1.27.2.1
@@ -13,22 +13,6 @@
nNumItemId(SID_ATTR_NUMBERING_RULE),
bInInintControl(FALSE)
{
-Index: source/rc/rc.cxx
-===================================================================
-RCS file: /cvs/util/tools/source/rc/rc.cxx,v
-retrieving revision 1.10
-diff -u -r1.10 rc.cxx
---- openoffice.org.orig/tools/source/rc/rc.cxx 27 Jun 2007 22:16:55 -0000 1.10
-+++ openoffice.org/tools/source/rc/rc.cxx 18 Jan 2008 12:57:15 -0000
-@@ -97,7 +97,7 @@
-
- // =======================================================================
-
--Date::Date( const ResId& rResId )
-+Date::Date( const ResId& rResId ) : nDate(0)
- {
- rResId.SetRT( RSC_DATE );
- ResMgr* pResMgr = NULL;
Index: source/ui/dialog/SwSpellDialogChildWindow.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx,v
@@ -44,33 +28,6 @@
m_SpellStartPosition(SPELL_START_BODY),
m_bBodySpelled(false),
m_bOtherSpelled(false),
-Index: source/contnr/svlbox.cxx
-===================================================================
-RCS file: /cvs/util/svtools/source/contnr/svlbox.cxx,v
-retrieving revision 1.31
-diff -u -r1.31 svlbox.cxx
---- openoffice.org.orig/svtools/source/contnr/svlbox.cxx 18 Jul 2007 08:52:54 -0000 1.31
-+++ openoffice.org/svtools/source/contnr/svlbox.cxx 18 Jan 2008 14:39:53 -0000
-@@ -725,7 +725,8 @@
-
- SvLBox::SvLBox( Window* pParent, WinBits nWinStyle ) :
- Control( pParent, nWinStyle | WB_CLIPCHILDREN ),
-- DropTargetHelper( this ), DragSourceHelper( this )
-+ DropTargetHelper( this ), DragSourceHelper( this ),
-+ eSelMode(NO_SELECTION)
- {
- DBG_CTOR(SvLBox,0);
- nWindowStyle = nWinStyle;
-@@ -748,7 +749,8 @@
-
- SvLBox::SvLBox( Window* pParent, const ResId& rResId ) :
- Control( pParent, rResId ),
-- DropTargetHelper( this ), DragSourceHelper( this )
-+ DropTargetHelper( this ), DragSourceHelper( this ),
-+ eSelMode(NO_SELECTION)
- {
- DBG_CTOR(SvLBox,0);
- pTargetEntry = 0;
Index: source/core/unocore/unoframe.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/unocore/unoframe.cxx,v
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.273
retrieving revision 1.273.2.1
diff -u -r1.273 -r1.273.2.1
--- sources 6 Mar 2008 09:50:42 -0000 1.273
+++ sources 7 Mar 2008 14:32:38 -0000 1.273.2.1
@@ -4,4 +4,4 @@
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-af3f35cf2f34b2ab2415605955769516 OOH680_m9.tar.bz2
+46342c036e072477b43dcb25b743b88e DEV300_m1.tar.bz2
workspace.cairotext01.patch:
Index: workspace.cairotext01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cairotext01.patch,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- workspace.cairotext01.patch 29 Feb 2008 10:11:44 -0000 1.6
+++ workspace.cairotext01.patch 7 Mar 2008 14:32:38 -0000 1.6.2.1
@@ -53,16 +53,15 @@
diff -u gsl/vcl/unx/inc/salgdi.h:1.41 gsl/vcl/unx/inc/salgdi.h:1.41.206.2
--- gsl/vcl/unx/inc/salgdi.h:1.41 Wed Jun 27 13:41:23 2007
+++ gsl/vcl/unx/inc/salgdi.h Mon Jan 28 00:53:49 2008
-@@ -58,6 +58,8 @@
- #include <vcl/dllapi.h>
- #endif
-
-+#include <deque>
-+
+@@ -47,6 +47,7 @@
+ #include "tools/fract.hxx"
+ #include "vcl/dllapi.h"
#include "xfont.hxx"
++#include <deque>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-@@ -78,6 +80,19 @@
+ struct ImplFontMetricData;
+@@ -66,6 +67,19 @@
// -=-= SalGraphicsData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -82,7 +81,7 @@
class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics
{
friend class X11FontLayout;
-@@ -90,7 +105,8 @@
+@@ -78,7 +92,8 @@
SalColormap *m_pDeleteColormap;
Drawable hDrawable_; // use
int m_nScreen;
@@ -92,7 +91,7 @@
XLIB_Region pPaintRegion_;
XLIB_Region pClipRegion_;
-@@ -198,6 +214,7 @@
+@@ -186,6 +201,7 @@
void DrawServerSimpleFontString( const ServerFontLayout& );
void DrawServerAAFontString( const ServerFontLayout& );
bool DrawServerAAForcedString( const ServerFontLayout& );
--- openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch DELETED ---
--- openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch DELETED ---
--- openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch DELETED ---
--- openoffice.org-2.4.0.ooo86123.ucb.newneon.patch DELETED ---
--- workspace.gcc430two.patch DELETED ---
--- workspace.notes2.patch DELETED ---
More information about the fedora-extras-commits
mailing list