rpms/openoffice.org/devel openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.5, 1.6 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.8, 1.9 openoffice.org.spec, 1.1476, 1.1477 openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch, 1.2, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Apr 14 10:28:15 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17165
Modified Files:
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org.spec
Removed Files:
openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
Log Message:
extend bridge
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 28 Mar 2008 14:44:12 -0000 1.5
+++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 14 Apr 2008 10:28:01 -0000 1.6
@@ -736,8 +736,6 @@
code = codeSnippet(
code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
-? source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx.workspace.cmcfixes43.patch
-? source/cpp_uno/gcc3_linux_mips/except.cxx.workspace.cmcfixes43.patch
Index: source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx,v
@@ -779,3 +777,44 @@
code = codeSnippet(
code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
+Index: source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 cpp2uno.cxx
+--- openoffice.org.orig/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx 3 Apr 2008 16:47:43 -0000 1.2
++++ openoffice.org/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx 14 Apr 2008 10:27:08 -0000
+@@ -601,7 +601,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)
+ {
+@@ -619,7 +619,7 @@
+ switch (member->eTypeClass) {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -632,13 +632,13 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(code, functionOffset++, vtableOffset, true);
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 27 Mar 2008 15:13:50 -0000 1.8
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 14 Apr 2008 10:28:01 -0000 1.9
@@ -215,48 +215,47 @@
"Quicktime Video", "mov",
--- config_office-orig/configure.in 2006-08-17 10:43:11.000000000 +0200
+++ config_office/configure.in 2006-08-17 10:48:43.000000000 +0200
-@@ -718,6 +718,7 @@ case "$build_os" in
- test_x=yes
+@@ -832,6 +832,7 @@
+ solaris*)
test_gtk=yes
build_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=yes
- _os=SunOS
-@@ -745,6 +746,7 @@ case "$build_os" in
- test_x=yes
+ test_randr=yes
+@@ -859,6 +860,7 @@
+ linux-gnu*)
test_gtk=yes
build_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=yes
- if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
-@@ -767,6 +769,7 @@ case "$build_os" in
+ test_randr=yes
+@@ -874,12 +876,14 @@
+ cygwin*) # Windows
+ test_cups=no
+ build_cairo=yes
++ build_gstreamer=no
+ _os=WINNT
+ ;;
+ darwin*) # Mac OS X
test_cups=yes
- test_gtk=no
- build_cairo=no
+ test_gtk=yes
+ build_cairo=yes
+ build_gstreamer=no
+ test_randr=no
_os=Darwin
if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
- AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
-@@ -773,6 +776,7 @@ case "$build_os" in
- test_x=yes
- test_gtk=yes
- build_cairo=yes
-+ build_gstreamer=yes
- test_kde=yes
- test_cups=yes
- AC_MSG_CHECKING([the FreeBSD operating system release])
-@@ -805,6 +809,7 @@ case "$build_os" in
- test_x=yes
+@@ -930,6 +934,7 @@
+ netbsd)
test_gtk=yes
build_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=no
- PTHREAD_CFLAGS="-pthread"
-@@ -4602,6 +4607,26 @@ AC_SUBST(CAIRO_CFLAGS)
- AC_SUBST(CAIRO_LIBS)
+ test_randr=yes
+@@ -5406,6 +5411,26 @@
+ AC_SUBST(JCOMMON_SERIALIZER_JAR)
dnl ===================================================================
+dnl Check whether the GStreamer libraries are available.
@@ -3204,8 +3203,8 @@
public LocaleCodes (XMultiServiceFactory xmsf) {
super(xmsf, UNIT_NAME, MODULE_NAME);
-- allLanguageStrings = getStringList(16299); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
-+ allLanguageStrings = getStringList(16301); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools
+- allLanguageStrings = getStringList(16300); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
++ allLanguageStrings = getStringList(16302); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
}
public String getLanguageString(String MSID) {
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1476
retrieving revision 1.1477
diff -u -r1.1476 -r1.1477
--- openoffice.org.spec 14 Apr 2008 08:17:15 -0000 1.1476
+++ openoffice.org.spec 14 Apr 2008 10:28:01 -0000 1.1477
@@ -1,6 +1,6 @@
%define oootag DEV300
-%define ooomilestone 5
-%define rh_rpm_release 4
+%define ooomilestone 6
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -133,13 +133,12 @@
Patch60: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
Patch61: workspace.cmcfixes43.patch
Patch62: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch63: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-Patch64: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch65: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch66: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch67: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch68: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch69: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch63: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch64: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch65: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch66: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch67: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch68: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1242,13 +1241,12 @@
%patch60 -p1 -b .oooXXXXX.psprint.debugcups.patch
%patch61 -p1 -b .workspace.cmcfixes43.patch
%patch62 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch63 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
-%patch64 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch65 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch66 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch67 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch68 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch69 -p1 -b .ooo87991.fpickersafe.patch
+%patch63 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch64 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch65 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch66 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch67 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch68 -p1 -b .ooo87991.fpickersafe.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3279,6 +3277,11 @@
%{python_py_sitearch}/unohelper.py*
%changelog
+* Mon Apr 14 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.6.1
+- next version
+- drop integrated openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+- extend selinux bodge to s390x
+
* Wed Apr 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
- migrate system extensions automatically
--- openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch DELETED ---
More information about the scm-commits
mailing list