------------------------------------------------------------
revno: 1880
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2010-03-24 10:02:02 +0100
message:
update to ooo-build 3.2.0.9
removed:
patches/branch_directly_to_cpp_vtable_call_on_arm.diff
modified:
changelog
patches/cws-linuxaxp01.diff
patches/redland-remove-patches.diff
patches/series
patches/system-mysqlcpp.diff
patches/update-mysqlnative-cws.diff
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-03-23 19:12:47 +0000
+++ b/changelog 2010-03-24 09:02:02 +0000
@@ -1,7 +1,9 @@
openoffice.org (1:3.2.0-5) UNRELEASED; urgency=low
* ooo-build:
- - update (3.2.0.8)
+ - update (3.2.0.9)
+ - branch_directly_to_cpp_vtable_call_on_arm.diff: adds
+ ARM bridges fix from issue 105359
* debian/shell-lib-extensions.sh: handle non-existant basis-link
(closes: #561498)
@@ -9,8 +11,6 @@
to what went in to m73 for 3.3 ("1.0.1 (Alpha)")
* debian/patches/system-mysqlcpp.diff: add patch adding the same STL
workaround for mysqlc as for graphite
- * debian/patches/branch_directly_to_cpp_vtable_call_on_arm.diff: add
- ARM bridges fix from issue 105359
* debian/patches/cws-linuxaxp01.diff: add alpha port from issue 110145
* debian/patches/redland-remove-patches.diff: remove redland patches
allowing to use system-redland (from issue 108911)
@@ -37,7 +37,7 @@
* debian/control.in: remove full-featured from short description to
accommodate longer language names (closes: #566606)
- -- Rene Engelhard <r...@debian.org> Tue, 23 Mar 2010 20:11:11 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 24 Mar 2010 09:48:49 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== removed file 'patches/branch_directly_to_cpp_vtable_call_on_arm.diff'
--- a/patches/branch_directly_to_cpp_vtable_call_on_arm.diff 2010-03-19
17:23:06 +0000
+++ b/patches/branch_directly_to_cpp_vtable_call_on_arm.diff 1970-01-01
00:00:00 +0000
@@ -1,56 +0,0 @@
-Description: branch directly to cpp vtable call on arm
-Origin: vendor, http://launchpadlibrarian.net/41027177/fix_ooo_arm.patch
-Bug: http://www.openoffice.org/issues/show_bug.cgi?id=105359
-
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 0f5b9fd..0707a42 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
-@@ -530,6 +530,9 @@ customunittext-percent.diff, i#80784, atimar
- # fix by Caolan
- bridges-testcppu-x86_64-fixes.diff, i#98028, n#575704, pmladek
-
-+# fix ARM bridges
-+branch_directly_to_cpp_vtable_call_on_arm.diff, i#105359
-+
- # make sure that we have mpGraphics
- # it might get lost when calling ImplNewFont()
- # fixes ReportBuilder crasher
-diff --git a/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
b/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
-new file mode 100644
-index 0000000..c6a3152
---- /dev/null
-+++
openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
-@@ -0,0 +1,32 @@
-+--- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2007-12-12
15:35:44.000000000 +0000
-++++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2010-03-15
11:57:20.000000000 +0000
-+@@ -8,15 +8,22 @@
-+ .global privateSnippetExecutor
-+ .type privateSnippetExecutor, %function
-+ privateSnippetExecutor:
-++ .fnstart @ start of unwinder entry
-++
-+ stmfd sp!, {r0-r3} @ follow other parameters on stack
-++ .pad #16 @ throw this data away on exception
-+ mov r0, ip @ r0 points to functionoffset/vtable
-+- mov ip, sp @ fix up the ip
-+- stmfd sp!, {fp,ip,lr,pc} @ 8 x 4 => stack remains 8 aligned
-+- sub fp, ip, #4 @ set frame pointer
-++ mov r1, sp @ r1 points to this and params
-++ @ (see cppuno.cxx:codeSnippet())
-++ stmfd sp!, {r4,lr} @ save return address
-++ @ (r4 pushed to preserve stack alignment)
-++ .save {r4,lr} @ restore these regs on exception
-+
-+- add r1, sp, #16 @ r1 points to this and params
-+ bl cpp_vtable_call(PLT)
-+
-+- add sp, sp, #32 @ restore stack
-+- ldr fp, [sp, #-32] @ restore frame pointer
-+- ldr pc, [sp, #-24] @ return
-++ add sp, sp, #4 @ no need to restore r4 (we didn't touch
it)
-++ ldr pc, [sp], #20 @ return, discarding function arguments
-++
-++ .fnend @ end of unwinder entry
-++
-++ .size privateSnippetExecutor, . - privateSnippetExecutor
=== modified file 'patches/cws-linuxaxp01.diff'
--- a/patches/cws-linuxaxp01.diff 2010-03-22 17:45:50 +0000
+++ b/patches/cws-linuxaxp01.diff 2010-03-24 09:02:02 +0000
@@ -4,8 +4,8 @@
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 430f3b0..186cef5 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
@@ -35,7 +35,7 @@
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
@@ -35,7 +35,7 @@
config_office-testing.diff
libwpd-testing.diff
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/cws-linuxaxp01.diff
2010-03-18 17:45:45.000000000 +0100
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/cws-linuxaxp01.diff
2010-03-18 17:45:45.000000000 +0100
@@ -0,0 +1,1955 @@
+diff -r f387649cb501 automation/source/testtool/objtest.cxx
+--- automation/source/testtool/objtest.cxx Fri Mar 12 15:32:45 2010 +0100
=== modified file 'patches/redland-remove-patches.diff'
--- a/patches/redland-remove-patches.diff 2010-03-19 21:37:26 +0000
+++ b/patches/redland-remove-patches.diff 2010-03-24 09:02:02 +0000
@@ -4,8 +4,8 @@
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5ad4309..15851fd 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
@@ -1518,6 +1518,9 @@ psprint-postscript-page-setup.diff, i#65491, n#80448,
jholesov
vcl-bitmap2-negative-height.diff
@@ -17,7 +17,7 @@
#FIXME src680: system-libc.diff, i#69033, rengelha
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
-+++
openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/redland-remove-patches.diff
2010-03-19 17:36:46.000000000 +0100
++++
openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/redland-remove-patches.diff
2010-03-19 17:36:46.000000000 +0100
@@ -0,0 +1,623 @@
+Index: configure.in
+===================================================================
=== modified file 'patches/series'
--- a/patches/series 2010-03-19 21:37:26 +0000
+++ b/patches/series 2010-03-24 09:02:02 +0000
@@ -1,5 +1,4 @@
update-mysqlnative-cws.diff
system-mysqlcpp.diff
-branch_directly_to_cpp_vtable_call_on_arm.diff
cws-linuxaxp01.diff
redland-remove-patches.diff
=== modified file 'patches/system-mysqlcpp.diff'
--- a/patches/system-mysqlcpp.diff 2010-03-15 01:45:42 +0000
+++ b/patches/system-mysqlcpp.diff 2010-03-24 09:02:02 +0000
@@ -4,8 +4,8 @@
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a1c1306..10ac499 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
@@ -35,7 +35,7 @@
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
@@ -28,7 +28,7 @@
[ GnomeSessionManagement ]
gnome-screen-saver.diff, i#106372, cmc
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/system.mysqlcpp.diff
2010-03-08 19:47:52.000000000 +0100
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/system.mysqlcpp.diff
2010-03-08 19:47:52.000000000 +0100
@@ -0,0 +1,475 @@
+diff -r 93402e754dbd configure.in
+--- configure.in Tue Mar 02 12:22:53 2010 +0100
=== modified file 'patches/update-mysqlnative-cws.diff'
--- a/patches/update-mysqlnative-cws.diff 2010-03-15 01:45:42 +0000
+++ b/patches/update-mysqlnative-cws.diff 2010-03-24 09:02:02 +0000
@@ -3,8 +3,8 @@
diff --git patches/dev300/apply patches/dev300/apply
index a1c1306..f1251e2 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
+--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
@@ -3310,7 +3310,7 @@ writer-doc-comparison-help.diff, tzvetelina
@@ -15,7 +15,7 @@
[ MySQL and DebianBaseOnly ]
# add hack to link against STLport version of libmysqlcppconn on i386.
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
-+++
openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/cws-mysqlconnector.diff
2010-03-08 22:40:33.000000000 +0100
++++
openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/cws-mysqlconnector.diff
2010-03-08 22:40:33.000000000 +0100
@@ -0,0 +1,12273 @@
+
+# HG changeset patch
=== modified file 'rules'
--- a/rules 2010-03-23 19:12:47 +0000
+++ b/rules 2010-03-24 09:02:02 +0000
@@ -71,7 +71,7 @@
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-3-2
-OOO_BUILD_VERSION=3.2.0.8
+OOO_BUILD_VERSION=3.2.0.9
OOO_BUILD_TAG=OOO_BUILD_$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./_/g')
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
=== modified file 'source/components'
--- a/source/components 2010-03-09 18:03:26 +0000
+++ b/source/components 2010-03-24 09:02:02 +0000
@@ -1,3 +1,3 @@
-ooo-build-3-2-0-8
-ext-sources-ooo-build-3-2-0-8
+ooo-build-3-2-0-9
+ext-sources-ooo-build-3-2-0-9
translation-updates-20100219
