[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.3.3-1-219-gd3c4111
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit d3c41113c9c538dff660aaf59a11010c10a3de98
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Jul 4 11:47:08 2011 +0200
adding all ubuntu fixes as one hotfix
* the patch was generated with ./g / git format-patch against the commits
of a feature branch based on the release tag
diff --git a/patches/series b/patches/series
index 4984db5..66014e1 100644
--- a/patches/series
+++ b/patches/series
@@ -15,3 +15,4 @@ autogen.diff
disable-integrated-ubuntupatches.diff
clear-libreoffice-build.diff
disable-broken-patches.diff
+ubuntufixes.diff
diff --git a/patches/lp720716.diff b/patches/ubuntufixes.diff
similarity index 69%
copy from patches/lp720716.diff
copy to patches/ubuntufixes.diff
index eec8a0f..7f08be6 100644
--- a/patches/lp720716.diff
+++ b/patches/ubuntufixes.diff
@@ -1,11 +1,234 @@
-Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716.diff
+Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716.diff 2011-06-28 16:28:21.542707012 +0200
-@@ -0,0 +1,729 @@
++++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-01 11:29:47.023623250 +0200
+@@ -0,0 +1,1015 @@
++===== main repo =====
++From c8b0c9ab769ca586407a49578f251e3aaa1b7ead Mon Sep 17 00:00:00 2001
++From: Rene Engelhard <rene@debian.org>
++Date: Thu, 30 Jun 2011 10:18:47 +0200
++Subject: [PATCH 1/2] apply system-lpsolve-rpath.diff from libreoffice-build
+
-+diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
-+index 3cb84f8..a2693a5 100644
++---
++ solenv/inc/libs.mk | 6 ++++++
++ 1 files changed, 6 insertions(+), 0 deletions(-)
++
++diff --git solenv/inc/libs.mk solenv/inc/libs.mk
++index 52dfada..7f8f67a 100644
++--- solenv/inc/libs.mk
+++++ solenv/inc/libs.mk
++@@ -338,7 +338,13 @@ MYTHESLIB=$(MYTHES_LIBS)
++ MYTHESLIB=-lmythes-1.2
++ .ENDIF
++ PYUNOLIB=-lpyuno
+++.IF "$(SYSTEM_LPSOLVE)" == "YES"
+++# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
+++# /usr/lib gets picked and we get a static link...
+++LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
+++.ELSE
++ LPSOLVELIB=-llpsolve55
+++.ENDIF
++ SOFFICELIB=-lsofficeapp
++ UNOPKGAPPLIB=-lunopkgapp
++ TESTLIB=-ltest
++--
++1.7.5.4
++
++
++From 36e80b8f2d8a79508f1f147c8def30f3140c54a7 Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Fri, 1 Jul 2011 10:45:59 +0200
++Subject: [PATCH 2/2] disable default as-needed on linking
++
++ * for not breaking pkg-config provided link switches (because of order)
++---
++ solenv/gbuild/platform/unxgcc.mk | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++diff --git solenv/gbuild/platform/unxgcc.mk solenv/gbuild/platform/unxgcc.mk
++index d3b63ed..7ad122e 100755
++--- solenv/gbuild/platform/unxgcc.mk
+++++ solenv/gbuild/platform/unxgcc.mk
++@@ -235,6 +235,7 @@ define gb_LinkTarget__command_dynamiclink
++ $(call gb_Helper_abbreviate_dirs,\
++ mkdir -p $(dir $(1)) && \
++ $(gb_CXX) \
+++ -Wl$(COMMA)--no-as-needed \
++ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
++ $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
++ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
++--
++1.7.5.4
++
++===== artwork =====
++===== base =====
++===== calc =====
++===== components =====
++===== extensions =====
++===== extras =====
++From 75f3ef23165c1f709999fe3d361a3f4297f12a6e Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Wed, 29 Jun 2011 19:49:36 +0200
++Subject: [PATCH] apply ubuntu-palette.diff
++
++---
++ extras/source/palettes/standard.soc | 3 +
++ extras/source/palettes/standard.soc.orig | 103 ++++++++++++++++++++++++++++++
++ 2 files changed, 106 insertions(+), 0 deletions(-)
++ create mode 100644 extras/source/palettes/standard.soc.orig
++
++diff --git extras/source/palettes/standard.soc extras/source/palettes/standard.soc
++index 0370e7a..f403bda 100644
++--- extras/source/palettes/standard.soc
+++++ extras/source/palettes/standard.soc
++@@ -88,6 +88,9 @@
++ <draw:color draw:name="Dark violet" draw:color="#660066"/>
++ <draw:color draw:name="Salmon" draw:color="#ff8080"/>
++ <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
+++ <draw:color draw:name="Ubuntu orange" draw:color="#ff6309"/>
+++ <draw:color draw:name="Ubuntu yellow" draw:color="#ffb515"/>
+++ <draw:color draw:name="Ubuntu red" draw:color="#c90016"/>
++ <draw:color draw:name="Chart 1" draw:color="#004586"/>
++ <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
++ <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
++diff --git extras/source/palettes/standard.soc.orig extras/source/palettes/standard.soc.orig
++new file mode 100644
++index 0000000..0370e7a
++--- /dev/null
+++++ extras/source/palettes/standard.soc.orig
++@@ -0,0 +1,103 @@
+++<?xml version="1.0" encoding="UTF-8"?>
+++<office:color-table xmlns:office="http://openoffice.org/2000/office"; xmlns:style="http://openoffice.org/2000/style"; xmlns:text="http://openoffice.org/2000/text"; xmlns:table="http://openoffice.org/2000/table"; xmlns:draw="http://openoffice.org/2000/drawing"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="http://openoffice.org/2000/meta"; xmlns:number="http://openoffice.org/2000/datastyle"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns:chart="http://openoffice.org/2000/chart"; xmlns:dr3d="http://openoffice.org/2000/dr3d"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="http://openoffice.org/2000/form"; xmlns:script="http://openoffice.org/2000/script";>
+++ <draw:color draw:name="Black" draw:color="#000000"/>
+++ <draw:color draw:name="Blue" draw:color="#000080"/>
+++ <draw:color draw:name="Green" draw:color="#008000"/>
+++ <draw:color draw:name="Turquoise" draw:color="#008080"/>
+++ <draw:color draw:name="Red" draw:color="#800000"/>
+++ <draw:color draw:name="Magenta" draw:color="#800080"/>
+++ <draw:color draw:name="Brown" draw:color="#808000"/>
+++ <draw:color draw:name="Gray" draw:color="#808080"/>
+++ <draw:color draw:name="Light gray" draw:color="#c0c0c0"/>
+++ <draw:color draw:name="Light blue" draw:color="#0000ff"/>
+++ <draw:color draw:name="Light green" draw:color="#00ff00"/>
+++ <draw:color draw:name="Light cyan" draw:color="#00ffff"/>
+++ <draw:color draw:name="Light red" draw:color="#ff0000"/>
+++ <draw:color draw:name="Light magenta" draw:color="#ff00ff"/>
+++ <draw:color draw:name="Yellow" draw:color="#ffff00"/>
+++ <draw:color draw:name="White" draw:color="#ffffff"/>
+++ <draw:color draw:name="Gray 80%" draw:color="#333333"/>
+++ <draw:color draw:name="Gray 70%" draw:color="#4c4c4c"/>
+++ <draw:color draw:name="Gray 60%" draw:color="#666666"/>
+++ <draw:color draw:name="Gray 40%" draw:color="#999999"/>
+++ <draw:color draw:name="Gray 30%" draw:color="#b3b3b3"/>
+++ <draw:color draw:name="Gray 20%" draw:color="#cccccc"/>
+++ <draw:color draw:name="Gray 10%" draw:color="#e6e6e6"/>
+++ <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
+++ <draw:color draw:name="Red 1" draw:color="#ff3366"/>
+++ <draw:color draw:name="Red 2" draw:color="#dc2300"/>
+++ <draw:color draw:name="Red 3" draw:color="#b84700"/>
+++ <draw:color draw:name="Red 4" draw:color="#ff3333"/>
+++ <draw:color draw:name="Red 5" draw:color="#eb613d"/>
+++ <draw:color draw:name="Red 6" draw:color="#b84747"/>
+++ <draw:color draw:name="Red 7" draw:color="#b80047"/>
+++ <draw:color draw:name="Red 8" draw:color="#99284c"/>
+++ <draw:color draw:name="Magenta 1" draw:color="#94006b"/>
+++ <draw:color draw:name="Magenta 2" draw:color="#94476b"/>
+++ <draw:color draw:name="Magenta 3" draw:color="#944794"/>
+++ <draw:color draw:name="Magenta 4" draw:color="#9966cc"/>
+++ <draw:color draw:name="Magenta 5" draw:color="#6b4794"/>
+++ <draw:color draw:name="Magenta 6" draw:color="#6b2394"/>
+++ <draw:color draw:name="Magenta 7" draw:color="#6b0094"/>
+++ <draw:color draw:name="Magenta 8" draw:color="#5e11a6"/>
+++ <draw:color draw:name="Blue 1" draw:color="#280099"/>
+++ <draw:color draw:name="Blue 2" draw:color="#4700b8"/>
+++ <draw:color draw:name="Blue 3" draw:color="#2300dc"/>
+++ <draw:color draw:name="Blue 4" draw:color="#2323dc"/>
+++ <draw:color draw:name="Blue 5" draw:color="#0047ff"/>
+++ <draw:color draw:name="Blue 6" draw:color="#0099ff"/>
+++ <draw:color draw:name="Blue 7" draw:color="#00b8ff"/>
+++ <draw:color draw:name="Blue 8" draw:color="#99ccff"/>
+++ <draw:color draw:name="Blue 9" draw:color="#CFE7E5"/>
+++ <draw:color draw:name="Turquoise 1" draw:color="#00dcff"/>
+++ <draw:color draw:name="Turquoise 2" draw:color="#00cccc"/>
+++ <draw:color draw:name="Turquoise 3" draw:color="#23b8dc"/>
+++ <draw:color draw:name="Turquoise 4" draw:color="#47b8b8"/>
+++ <draw:color draw:name="Turquoise 5" draw:color="#33a3a3"/>
+++ <draw:color draw:name="Turquoise 6" draw:color="#198a8a"/>
+++ <draw:color draw:name="Turquoise 7" draw:color="#006b6b"/>
+++ <draw:color draw:name="Turquoise 8" draw:color="#004a4a"/>
+++ <draw:color draw:name="Green 1" draw:color="#355e00"/>
+++ <draw:color draw:name="Green 2" draw:color="#5c8526"/>
+++ <draw:color draw:name="Green 3" draw:color="#7da647"/>
+++ <draw:color draw:name="Green 4" draw:color="#94bd5e"/>
+++ <draw:color draw:name="Green 5" draw:color="#00ae00"/>
+++ <draw:color draw:name="Green 6" draw:color="#33cc66"/>
+++ <draw:color draw:name="Green 7" draw:color="#3deb3d"/>
+++ <draw:color draw:name="Green 8" draw:color="#23ff23"/>
+++ <draw:color draw:name="Yellow 1" draw:color="#e6ff00"/>
+++ <draw:color draw:name="Yellow 2" draw:color="#ffff99"/>
+++ <draw:color draw:name="Yellow 3" draw:color="#ffff66"/>
+++ <draw:color draw:name="Yellow 4" draw:color="#e6e64c"/>
+++ <draw:color draw:name="Yellow 5" draw:color="#cccc00"/>
+++ <draw:color draw:name="Yellow 6" draw:color="#b3b300"/>
+++ <draw:color draw:name="Yellow 7" draw:color="#808019"/>
+++ <draw:color draw:name="Yellow 8" draw:color="#666600"/>
+++ <draw:color draw:name="Brown 1" draw:color="#4c1900"/>
+++ <draw:color draw:name="Brown 2" draw:color="#663300"/>
+++ <draw:color draw:name="Brown 3" draw:color="#804c19"/>
+++ <draw:color draw:name="Brown 4" draw:color="#996633"/>
+++ <draw:color draw:name="Orange 1" draw:color="#cc6633"/>
+++ <draw:color draw:name="Orange 2" draw:color="#ff6633"/>
+++ <draw:color draw:name="Orange 3" draw:color="#ff9966"/>
+++ <draw:color draw:name="Orange 4" draw:color="#ffcc99"/>
+++ <draw:color draw:name="Violet" draw:color="#9999ff"/>
+++ <draw:color draw:name="Bordeaux" draw:color="#993366"/>
+++ <draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
+++ <draw:color draw:name="Pale green" draw:color="#ccffff"/>
+++ <draw:color draw:name="Dark violet" draw:color="#660066"/>
+++ <draw:color draw:name="Salmon" draw:color="#ff8080"/>
+++ <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
+++ <draw:color draw:name="Chart 1" draw:color="#004586"/>
+++ <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
+++ <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
+++ <draw:color draw:name="Chart 4" draw:color="#579d1c"/>
+++ <draw:color draw:name="Chart 5" draw:color="#7e0021"/>
+++ <draw:color draw:name="Chart 6" draw:color="#83caff"/>
+++ <draw:color draw:name="Chart 7" draw:color="#314004"/>
+++ <draw:color draw:name="Chart 8" draw:color="#aecf00"/>
+++ <draw:color draw:name="Chart 9" draw:color="#4b1f6f"/>
+++ <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
+++ <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
+++ <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
+++</office:color-table>
++--
++1.7.5.4
++
++===== filters =====
++===== help =====
++===== impress =====
++===== libs-core =====
++From 8f6b27d7e4e352bc03d4360fbe2a4de0118acfcb Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Wed, 29 Jun 2011 19:15:31 +0200
++Subject: [PATCH] lp#720716: more translations in desktop files
++
++---
++ sysui/desktop/menus/base.desktop | 5 +
++ sysui/desktop/menus/calc.desktop | 5 +
++ sysui/desktop/menus/draw.desktop | 5 +
++ sysui/desktop/menus/impress.desktop | 5 +
++ sysui/desktop/menus/math.desktop | 5 +
++ sysui/desktop/menus/writer.desktop | 5 +
++ sysui/desktop/share/launcher_comment.ulf | 171 +++++++++++++++++++++++
++ sysui/desktop/share/launcher_genericname.ulf | 168 ++++++++++++++++++++++
++ sysui/desktop/share/launcher_unityquicklist.ulf | 168 ++++++++++++++++++++++
++ sysui/desktop/share/makefile.mk | 4 +-
++ sysui/desktop/share/translate.pl | 20 ++-
++ 11 files changed, 556 insertions(+), 5 deletions(-)
++ create mode 100644 sysui/desktop/share/launcher_unityquicklist.ulf
++
++diff --git sysui/desktop/menus/base.desktop sysui/desktop/menus/base.desktop
++index 40f7e79..9809e4e 100755
+--- sysui/desktop/menus/base.desktop
++++ sysui/desktop/menus/base.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Base
@@ -17,8 +240,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++UnityQuicklist=New Database
++Exec=libreoffice -base %U
++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
-+index d885589..b93e8a1 100644
++diff --git sysui/desktop/menus/calc.desktop sysui/desktop/menus/calc.desktop
++index 80cc09d..0af1c53 100755
+--- sysui/desktop/menus/calc.desktop
++++ sysui/desktop/menus/calc.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Calc
@@ -30,8 +253,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++UnityQuicklist=New Spreadsheet
++Exec=libreoffice -calc %U
++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
-+index 21c31b8..6748f61 100644
++diff --git sysui/desktop/menus/draw.desktop sysui/desktop/menus/draw.desktop
++index 57f7ade..ab4d092 100755
+--- sysui/desktop/menus/draw.desktop
++++ sysui/desktop/menus/draw.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Draw
@@ -43,8 +266,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++UnityQuicklist=New Drawing
++Exec=libreoffice -draw %U
++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
-+index 33a7d90..301131a 100644
++diff --git sysui/desktop/menus/impress.desktop sysui/desktop/menus/impress.desktop
++index 025524e..52f11c3 100755
+--- sysui/desktop/menus/impress.desktop
++++ sysui/desktop/menus/impress.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Impress
@@ -56,8 +279,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++UnityQuicklist=New Presentation
++Exec=libreoffice -impress %U
++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
-+index cd0717a..71468cc 100644
++diff --git sysui/desktop/menus/math.desktop sysui/desktop/menus/math.desktop
++index 55fcc29..c605994 100755
+--- sysui/desktop/menus/math.desktop
++++ sysui/desktop/menus/math.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Math
@@ -69,8 +292,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++UnityQuicklist=New Formula
++Exec=libreoffice -math %U
++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
-+index 95fe8db..f16a132 100644
++diff --git sysui/desktop/menus/writer.desktop sysui/desktop/menus/writer.desktop
++index 2222019..aae85b9 100755
+--- sysui/desktop/menus/writer.desktop
++++ sysui/desktop/menus/writer.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Writer
@@ -82,8 +305,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++UnityQuicklist=New Document
++Exec=libreoffice -writer %U
++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
-+index e369492..7bd3179 100644
++diff --git sysui/desktop/share/launcher_comment.ulf sysui/desktop/share/launcher_comment.ulf
++index e369492..807fed1 100755
+--- sysui/desktop/share/launcher_comment.ulf
++++ sysui/desktop/share/launcher_comment.ulf
+@@ -1,21 +1,192 @@
@@ -279,8 +502,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++zh_CN = "兼容开放标准 ODF 的办公软件套装。由 The Document Foundation 支持。"
++zh_TW = "與開放且標準化的 ODF 文件格式相容的辦公生產力套裝軟體。由文件基金會提供支援。"
+
-+diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
-+index ff8041a..ba16f53 100644
++diff --git sysui/desktop/share/launcher_genericname.ulf sysui/desktop/share/launcher_genericname.ulf
++index ff8041a..bfe6ff4 100755
+--- sysui/desktop/share/launcher_genericname.ulf
++++ sysui/desktop/share/launcher_genericname.ulf
+@@ -1,23 +1,191 @@
@@ -475,9 +698,9 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
+
+ [javafilter]
+ en-US = "Small Device Format Importer"
-+diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf
++diff --git sysui/desktop/share/launcher_unityquicklist.ulf sysui/desktop/share/launcher_unityquicklist.ulf
+new file mode 100644
-+index 0000000..7b4c18a
++index 0000000..49ec877
+--- /dev/null
++++ sysui/desktop/share/launcher_unityquicklist.ulf
+@@ -0,0 +1,168 @@
@@ -649,8 +872,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
++
++[javafilter]
++en-US = ""
-+diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
-+index 898d7b0..7c35386 100644
++diff --git sysui/desktop/share/makefile.mk sysui/desktop/share/makefile.mk
++index 6e9ab75..61b329d 100755
+--- sysui/desktop/share/makefile.mk
++++ sysui/desktop/share/makefile.mk
+@@ -50,6 +50,7 @@ ULFFILES= \
@@ -678,8 +901,8 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
+ .IF "$(WITH_LIBSN)"=="YES"
+ @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
+ .ENDIF
-+diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
-+index cb209e4..fe7fecd 100644
++diff --git sysui/desktop/share/translate.pl sysui/desktop/share/translate.pl
++index cb209e4..9c50cc3 100755
+--- sysui/desktop/share/translate.pl
++++ sysui/desktop/share/translate.pl
+@@ -69,6 +69,12 @@ while ($_ = $ARGV[0], /^-/) {
@@ -732,3 +955,66 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716
+ }
+ }
+ }
++--
++1.7.5.4
++
++===== libs-extern =====
++===== libs-extern-sys =====
++===== libs-gui =====
++From 2673d36334fc10b46adc19f3e6b2a6d042263c6b Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Wed, 29 Jun 2011 19:20:43 +0200
++Subject: [PATCH] lp#746375: soffice.bin crashed with SIGSEGV in
++ uno_type_sequence_construct()
++
++---
++ vcl/unx/gtk/a11y/atkutil.cxx | 13 ++++++++++---
++ 1 files changed, 10 insertions(+), 3 deletions(-)
++
++diff --git vcl/unx/gtk/a11y/atkutil.cxx vcl/unx/gtk/a11y/atkutil.cxx
++index 68bb949..97e44e7 100644
++--- vcl/unx/gtk/a11y/atkutil.cxx
+++++ vcl/unx/gtk/a11y/atkutil.cxx
++@@ -66,7 +66,14 @@
++
++ using namespace ::com::sun::star;
++
++-static uno::WeakReference< accessibility::XAccessible > xNextFocusObject;
+++namespace
+++{
+++ struct theNextFocusObject :
+++ public rtl::Static< uno::WeakReference< accessibility::XAccessible >, theNextFocusObject>
+++ {
+++ };
+++}
+++
++ static guint focus_notify_handler = 0;
++
++ /*****************************************************************************/
++@@ -80,7 +87,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
++
++ focus_notify_handler = 0;
++
++- uno::Reference< accessibility::XAccessible > xAccessible = xNextFocusObject;
+++ uno::Reference< accessibility::XAccessible > xAccessible = theNextFocusObject::get();
++ if( xAccessible.get() == reinterpret_cast < accessibility::XAccessible * > (data) )
++ {
++ AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : NULL;
++@@ -135,7 +142,7 @@ atk_wrapper_focus_tracker_notify_when_idle( const uno::Reference< accessibility:
++ if( focus_notify_handler )
++ g_source_remove(focus_notify_handler);
++
++- xNextFocusObject = xAccessible;
+++ theNextFocusObject::get() = xAccessible;
++
++ focus_notify_handler = g_idle_add (atk_wrapper_focus_idle_handler, xAccessible.get());
++ }
++--
++1.7.5.4
++
++===== postprocess =====
++===== sdk =====
++===== testing =====
++===== translations =====
++===== ure =====
++===== writer =====
--
LibreOffice packaging repository
Reply to: