rpms/openoffice.org/devel openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.7, 1.8 openoffice.org.spec, 1.1559, 1.1560

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10004

Modified Files:
	openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 
	openoffice.org.spec 
Log Message:
extend to m68k

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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch	15 Apr 2008 18:04:28 -0000	1.7
+++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch	6 Jul 2008 22:17:16 -0000	1.8
@@ -818,3 +818,43 @@
              code = codeSnippet(
                  code, functionOffset++, vtableOffset,
                  bridges::cpp_uno::shared::isSimpleType(
+Index: source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 cpp2uno.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx	30 Jun 2008 15:04:49 -0000	1.2
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx	6 Jul 2008 22:16:27 -0000
+@@ -482,7 +481,7 @@
+ }
+ 
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+-    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)
+ {
+@@ -497,20 +496,20 @@
+         {
+             case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+                 // Getter:
+-                (s++)->fn = code;
++                (s++)->fn = code + writetoexecdiff;
+                 code = codeSnippet(code, functionOffset++, vtableOffset);
+                 // Setter:
+                 if (!reinterpret_cast<
+                     typelib_InterfaceAttributeTypeDescription * >(
+                         member)->bReadOnly)
+                 {
+-                    (s++)->fn = code;
++                    (s++)->fn = code + writetoexecdiff;
+                     code = codeSnippet(code, functionOffset++, vtableOffset);
+                 }
+                 break;
+             case typelib_TypeClass_INTERFACE_METHOD:
+             {
+-                (s++)->fn = code;
++                (s++)->fn = code + writetoexecdiff;
+ 
+                 typelib_InterfaceMethodTypeDescription *pMethodTD = 
+                     reinterpret_cast<


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1559
retrieving revision 1.1560
diff -u -r1.1559 -r1.1560
--- openoffice.org.spec	6 Jul 2008 19:15:50 -0000	1.1559
+++ openoffice.org.spec	6 Jul 2008 22:17:16 -0000	1.1560
@@ -2989,7 +2989,7 @@
 %pre presenter-screen
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared org.openoffice.PresenterScreen-%{PLATFORM_ID} || :
+    unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || :
 fi
 
 %post presenter-screen
@@ -2999,7 +2999,7 @@
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared org.openoffice.PresenterScreen-%{PLATFORM_ID} || :
+    unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || :
 fi
 
 %postun presenter-screen
@@ -3582,6 +3582,7 @@
   => bsh now only required by beanshell ScriptProvider
 - drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
 - drop integrated openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
+- extend selinux bodge to m68k
 
 * Tue Jul 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-1
 - next version