[Libreoffice-commits] .: patches/dev300
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Wed Jun 29 12:47:31 PDT 2011
patches/dev300/apply | 71 --
patches/dev300/f11-fullscreen.diff | 467 -------------------
patches/dev300/gccXXXXX.solenv.javaregistration.diff | 32 -
patches/dev300/ubuntu-arm-thumb.diff | 117 ----
patches/dev300/ubuntu-mstopdf.diff | 41 -
patches/dev300/ubuntu-no-stack-protector.diff | 14
patches/dev300/ubuntu-palette.diff | 12
patches/dev300/ubuntu-sparc-hack.diff | 32 -
patches/dev300/unxlngi6-notune.diff | 13
9 files changed, 9 insertions(+), 790 deletions(-)
New commits:
commit 52363be034ec7ab31dc832ec3e32b135e9e83a50
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 29 21:40:23 2011 +0200
removing migrated or obsolete ubuntu patches
* no ubuntu specific patching in libreoffice-build anymore
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fe3b95c..ea30b3e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -63,14 +63,15 @@ DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQ
Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
-UbuntuBased : DebianBase, UbuntuOnly
-UbuntuHardy : UbuntuBased, UbuntuHardyOnly
-UbuntuJaunty : UbuntuBased, UbuntuJauntyOnly
-UbuntuKarmic : UbuntuBased, UbuntuKarmicOnly
-UbuntuLucid : UbuntuBased, UbuntuLucidOnly
-UbuntuMaverick : UbuntuBased, UbuntuMaverickOnly
-UbuntuNatty : UbuntuBased, UbuntuNattyOnly
-UbuntuL10n : UbuntuBased, UbuntuL10nOnly
+UbuntuBased : DebianBase
+UbuntuHardy : UbuntuBased
+UbuntuJaunty : UbuntuBased
+UbuntuKarmic : UbuntuBased
+UbuntuLucid : UbuntuBased
+UbuntuMaverick : UbuntuBased
+UbuntuNatty : UbuntuBased
+UbuntuOneiric : UbuntuBased
+UbuntuL10n : UbuntuBased
# DroplineGNOME
DroplineGNOME : LinuxCommon, Mono, msaccess
DroplineGNOME64 : LinuxCommon, Mono, msaccess
@@ -1147,23 +1148,6 @@ libhnj-lib-use-_pic.diff, rengelha
# use -llpsolve55_pic
system-lpsolve-use-_pic.diff, rengelha
-[ UbuntuOnly ]
-SectionOwner => ccheney
-
-ubuntu-palette.diff
-ubuntu-sparc-hack.diff, mklose
-ubuntu-no-stack-protector.diff, doko
-#gccXXXXX.solenv.javaregistration.diff
-ubuntu-mstopdf.diff, ccheney
-# FIXME: update for LO
-#f11-fullscreen.diff, ccheney
-
-[ UbuntuOnly ]
-unxlngi6-notune.diff, doko
-
-[ UbuntuL10nOnly ]
-human-icons-i18n.diff, mklose
-
[ FedoraCommonFixes ]
oooXXXXX.vcl.x86_64.impressatk.diff
@@ -1399,40 +1383,6 @@ base64.diff, i#100620, hmth
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
-[ UbuntuHardyOnly ]
-# Add patch to only show local files needed when gnome-vfs/gio is disabled
-# FIXME: update for LO
-#ubuntu-gnome-fpicker-local-only.diff
-
-[ UbuntuJauntyOnly ]
-# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-# FIXME: update for LO
-#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-
-[ UbuntuKarmicOnly ]
-# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-# FIXME: update for LO
-#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-
-[ UbuntuLucidOnly ]
-# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-# FIXME: update for LO
-#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-ubuntu-arm-thumb.diff, doko
-
-[ UbuntuMaverickOnly ]
-# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-# FIXME: update for LO
-#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-ubuntu-arm-thumb.diff, doko
-
-[ UbuntuNattyOnly ]
-# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
-# FIXME: update for LO
-#ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-# FIXME: still needed for GCC-4.5?
-#ubuntu-arm-thumb.diff, doko
-
[ Fixes ]
# Fix for crash on Windows by Rail Aliev. Root cause unknown.
svx-fix-fit-to-frame-crash.diff, n#508621, rodo
@@ -1483,9 +1433,6 @@ build-fix-xulrunner-npapi-inc.diff, janneke
[ DebianSidOnly ]
# link dynamically with liblpsolve55.so
system-lpsolve-rpath.diff, rengelha
-[ UbuntuOnly ]
-# link dynamically with liblpsolve55.so
-system-lpsolve-rpath.diff, rengelha
[ Fixes ]
# make dlopen-ed libs to use the global namespace for symbol
diff --git a/patches/dev300/f11-fullscreen.diff b/patches/dev300/f11-fullscreen.diff
deleted file mode 100644
index 12e1dba..0000000
--- a/patches/dev300/f11-fullscreen.diff
+++ /dev/null
@@ -1,467 +0,0 @@
---- officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 2010-03-25 20:30:12 +0000
-+++ officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 2010-03-26 05:06:54 +0000
-@@ -469,7 +469,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -1036,7 +1036,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -1442,7 +1442,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -1984,7 +1984,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -2473,7 +2473,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -3093,7 +3093,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -3713,7 +3713,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -4318,7 +4318,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-@@ -4928,7 +4928,7 @@
- </node>
- <node oor:name="F11" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-- <value xml:lang="en-US" install:module="unxwnt">.uno:DesignerDialog</value>
-+ <value xml:lang="en-US" install:module="unxwnt">.uno:FullScreen</value>
- </prop>
- </node>
- <node oor:name="F11_MOD1" oor:op="replace">
-
---- sc/uiconfig/scalc/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
-+++ sc/uiconfig/scalc/accelerator/de/default.xml 2010-03-26 04:05:22 +0000
-@@ -4,7 +4,7 @@
- <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
- <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
- <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
-
---- sc/uiconfig/scalc/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
-+++ sc/uiconfig/scalc/accelerator/en-GB/default.xml 2010-03-26 04:05:22 +0000
-@@ -4,7 +4,7 @@
- <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
- <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
- <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
-
---- sc/uiconfig/scalc/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
-+++ sc/uiconfig/scalc/accelerator/en-US/default.xml 2010-03-26 04:05:22 +0000
-@@ -4,7 +4,7 @@
- <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
- <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
- <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
-
---- sc/uiconfig/scalc/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
-+++ sc/uiconfig/scalc/accelerator/es/default.xml 2010-03-26 04:05:22 +0000
-@@ -4,7 +4,7 @@
- <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
- <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
- <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
-
---- sc/uiconfig/scalc/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
-+++ sc/uiconfig/scalc/accelerator/fr/default.xml 2010-03-26 04:05:22 +0000
-@@ -4,7 +4,7 @@
- <accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertCell"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:SaveAsTemplate"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
- <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
- <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
-
---- sw/uiconfig/sglobal/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sglobal/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sglobal/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sglobal/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sglobal/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sglobal/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sglobal/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sglobal/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sglobal/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sglobal/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sweb/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sweb/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sweb/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sweb/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sweb/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sweb/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sweb/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sweb/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/sweb/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/sweb/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swform/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swform/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
-@@ -37,7 +37,7 @@
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
-
---- sw/uiconfig/swform/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swform/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
-@@ -38,7 +38,7 @@
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
-
---- sw/uiconfig/swform/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swform/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
-@@ -36,7 +36,7 @@
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
-
---- sw/uiconfig/swform/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swform/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
-@@ -37,7 +37,7 @@
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F12" accel:mod1="true" xlink:href=".uno:InsertTable"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveBullets"/>
- <accel:item accel:code="KEY_F12" accel:shift="true" xlink:href=".uno:DefaultBullet"/>
-
---- sw/uiconfig/swreport/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swreport/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swreport/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swreport/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swreport/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swreport/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swreport/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swreport/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swreport/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swreport/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swriter/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swriter/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swriter/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swriter/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swriter/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swriter/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swriter/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swriter/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swriter/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swriter/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swxform/accelerator/de/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swxform/accelerator/de/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swxform/accelerator/en-GB/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swxform/accelerator/en-GB/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swxform/accelerator/en-US/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swxform/accelerator/en-US/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swxform/accelerator/es/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swxform/accelerator/es/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
---- sw/uiconfig/swxform/accelerator/fr/default.xml 2010-03-25 20:30:12 +0000
-+++ sw/uiconfig/swxform/accelerator/fr/default.xml 2010-03-26 04:05:23 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-- <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
-+ <accel:item accel:code="KEY_F11" xlink:href=".uno:FullScreen"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
- <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
- <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
-
diff --git a/patches/dev300/gccXXXXX.solenv.javaregistration.diff b/patches/dev300/gccXXXXX.solenv.javaregistration.diff
deleted file mode 100644
index e3fd2d3..0000000
--- a/patches/dev300/gccXXXXX.solenv.javaregistration.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: bin/modules/installer/servicesfile.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
-retrieving revision 1.23
-diff -u -r1.23 servicesfile.pm
---- solenv/bin/modules/installer/servicesfile.pm 10 Jul 2006 18:51:00 -0000 1.23
-+++ solenv/bin/modules/installer/servicesfile.pm 23 Feb 2007 16:12:39 -0000
-@@ -258,7 +258,7 @@
- $counter++;
- }
-
-- if ((( $counter > 0 ) && ( $counter%$installer::globals::javamaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$javacomponents} ))) # limiting to $installer::globals::maxservices files
-+ if ( $counter > 0 )
- {
- $filestring =~ s/\;\s*$//;
- chdir($onesourcepath);
-Index: bin/modules/installer/globals.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
-retrieving revision 1.62.2.3
-diff -u -r1.62.2.3 globals.pm
---- solenv/bin/modules/installer/globals.pm 24 Jan 2007 16:34:05 -0000 1.62.2.3
-+++ solenv/bin/modules/installer/globals.pm 23 Feb 2007 11:02:01 -0000
-@@ -256,7 +256,7 @@
- @solarispatchfiles = (".diPatch", "patchinfo");
- @environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
- @packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
-- @regcompjars = ( "unoil.jar", "java_uno.jar", "ridl.jar", "jurt.jar", "juh.jar", "xmerge.jar", "commonwizards.jar" );
-+ @regcompjars = ( "unoil.jar", "java_uno.jar", "ridl.jar", "jurt.jar", "juh.jar", "commonwizards.jar" );
- @regcompregisterlibs = ( "javavm.uno", "javaloader.uno", "uriproc.uno" );
- @languagepackfeature =();
- @featurecollector =();
diff --git a/patches/dev300/ubuntu-arm-thumb.diff b/patches/dev300/ubuntu-arm-thumb.diff
deleted file mode 100644
index a274843..0000000
--- a/patches/dev300/ubuntu-arm-thumb.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- vcl/source/window/makefile.mk.orig 2010-11-11 16:22:48.000000000 +0100
-+++ vcl/source/window/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -38,6 +38,10 @@
- .INCLUDE : settings.mk
- .INCLUDE : $(PRJ)$/util$/makefile2.pmk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- SLOFILES= \
---- vcl/source/gdi/makefile.mk.orig 2010-11-11 16:22:48.000000000 +0100
-+++ vcl/source/gdi/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -45,6 +45,10 @@
- CDEFS+=-DENABLE_GRAPHITE
- .ENDIF
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- EXCEPTIONSFILES= $(SLO)$/salmisc.obj \
---- forms/source/richtext/makefile.mk.orig 2010-11-11 20:08:57.000000000 +0100
-+++ forms/source/richtext/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -35,6 +35,10 @@
- .INCLUDE : settings.mk
- .INCLUDE: $(PRJ)$/makefile.pmk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files -------------------------------------
-
- EXCEPTIONSFILES=\
---- tools/source/datetime/makefile.mk.orig 2010-11-11 16:22:48.000000000 +0100
-+++ tools/source/datetime/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -35,6 +35,10 @@
- .INCLUDE : settings.mk
- .INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- SLOFILES= $(SLO)$/tdate.obj \
---- extensions/source/propctrlr/makefile.mk.orig 2010-11-11 16:12:41.000000000 +0100
-+++ extensions/source/propctrlr/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -38,6 +38,10 @@
-
- .INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- SLOFILES= $(SLO)$/controlfontdialog.obj \
---- svtools/source/contnr/makefile.mk.orig 2010-11-11 16:22:47.000000000 +0100
-+++ svtools/source/contnr/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -39,6 +39,10 @@
- .INCLUDE : settings.mk
- .INCLUDE : $(PRJ)$/util$/svt.pmk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- EXCEPTIONSFILES=\
---- svtools/source/control/makefile.mk.orig 2010-11-11 16:22:47.000000000 +0100
-+++ svtools/source/control/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -35,6 +35,10 @@
- .INCLUDE : settings.mk
- .INCLUDE : $(PRJ)$/util$/svt.pmk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- SRS1NAME=$(TARGET)
---- oox/source/xls/makefile.mk.orig 2010-11-11 16:18:11.000000000 +0100
-+++ oox/source/xls/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -38,6 +38,10 @@
- .INCLUDE : settings.mk
- .INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- SLOFILES = \
---- basic/source/app/makefile.mk.orig 2010-11-11 16:30:07.000000000 +0100
-+++ basic/source/app/makefile.mk 2010-12-29 23:44:40.518213478 +0100
-@@ -36,6 +36,10 @@
-
- .INCLUDE : settings.mk
-
-+.IF "$(CPUNAME)"=="ARM"
-+CFLAGS += -fno-schedule-insns
-+.ENDIF
-+
- # --- Common ------------------------------------------------------------
-
- EXCEPTIONSFILES = \
diff --git a/patches/dev300/ubuntu-mstopdf.diff b/patches/dev300/ubuntu-mstopdf.diff
deleted file mode 100644
index 4c05065..0000000
--- a/patches/dev300/ubuntu-mstopdf.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urNp wizards/source/tools/MSToPDF.xba wizards/source/tools/MSToPDF.xba
---- wizards/source/tools/MSToPDF.xba 1969-12-31 21:00:00.000000000 -0300
-+++ wizards/source/tools/MSToPDF.xba 2008-02-28 16:34:16.000000000 -0300
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="MSToPDF" script:language="StarBasic">Sub ConvertMSToPDF(cFile)
-+ cURL = ConvertToURL(cFile)
-+
-+ ' Open the document.
-+ ' This assumes the document is valid and OO can import it.
-+ oDoc = StarDesktop.loadComponentFromURL(cURL, "_blank", 0, Array(MakePropertyValue("Hidden", True),))
-+ ' Remove the sufix
-+ cFile = Left(cFile, Len(cFile)-4)+".pdf"
-+ cURL = ConvertToURL(cFile)
-+ ' Save the document using a filter.
-+ oDoc.storeToURL(cURL, Array(MakePropertyValue("FilterName", "writer_pdf_Export"),))
-+ oDoc.close(True)
-+End Sub
-+
-+' This function was blindly ripped off from Graham Williams' book (Graham.Williams at togaware.com)
-+Function MakePropertyValue( Optional cName As String, Optional uValue ) As com.sun.star.beans.PropertyValue
-+ Dim oPropertyValue As New com.sun.star.beans.PropertyValue
-+ If Not IsMissing( cName ) Then
-+ oPropertyValue.Name = cName
-+ EndIf
-+ If Not IsMissing( uValue ) Then
-+ oPropertyValue.Value = uValue
-+ EndIf
-+ MakePropertyValue() = oPropertyValue
-+End Function
-+</script:module>
-diff -urNp wizards/source/tools/script.xlb wizards/source/tools/script.xlb
---- wizards/source/tools/script.xlb 2008-02-28 16:23:29.000000000 -0300
-+++ wizards/source/tools/script.xlb 2008-02-28 16:33:12.000000000 -0300
-@@ -7,4 +7,5 @@
- <library:element library:name="UCB"/>
- <library:element library:name="Listbox"/>
- <library:element library:name="Debug"/>
-+ <library:element library:name="MSToPDF"/>
- </library:library>
diff --git a/patches/dev300/ubuntu-no-stack-protector.diff b/patches/dev300/ubuntu-no-stack-protector.diff
deleted file mode 100644
index 2ea349c..0000000
--- a/patches/dev300/ubuntu-no-stack-protector.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-=== modified file 'solenv/inc/settings.mk'
---- solenv/inc/settings.mk 2010-06-05 03:12:38 +0000
-+++ solenv/inc/settings.mk 2010-06-05 03:21:48 +0000
-@@ -1325,6 +1325,9 @@
- INCPRE+=-I$(UNOUCROUT)
- UNOUCRRDB*=$(SOLARBINDIR)/types.rdb
-
-+CFLAGS+= -fno-stack-protector
-+CXXFLAGS+= -fno-stack-protector
-+
- # location of trustedinfo.manifest for Windows Vista
- .IF "$(COM)"=="MSC"
- TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/inc
-
diff --git a/patches/dev300/ubuntu-palette.diff b/patches/dev300/ubuntu-palette.diff
deleted file mode 100644
index f55338b..0000000
--- a/patches/dev300/ubuntu-palette.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- extras/source/palettes/standard.soc.orig 2010-11-11 16:14:35.000000000 +0100
-+++ extras/source/palettes/standard.soc 2010-12-24 19:36:52.708227152 +0100
-@@ -87,6 +87,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 a/patches/dev300/ubuntu-sparc-hack.diff b/patches/dev300/ubuntu-sparc-hack.diff
deleted file mode 100644
index a84ab8c..0000000
--- a/patches/dev300/ubuntu-sparc-hack.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- idlc/source/idlcmain.cxx.old 2010-03-25 18:52:17.000000000 +0100
-+++ idlc/source/idlcmain.cxx 2010-03-29 15:50:45.000000000 +0200
-@@ -33,12 +33,29 @@
- #include <idlc/idlc.hxx>
- #include "sal/main.h"
-
-+extern "C" {
-+#include <stdio.h>
-+#include "sched.h"
-+}
-+
-+void set_affinity(void)
-+{
-+ cpu_set_t mask;
-+
-+ CPU_ZERO(&mask);
-+ CPU_SET(0, &mask);
-+ if (sched_setaffinity(0, sizeof(cpu_set_t), &mask))
-+ perror("sched_setaffinity");
-+}
-+
- using namespace ::rtl;
-
- SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
- {
- Options options;
-
-+ set_affinity();
-+
- try
- {
- if (!options.initOptions(argc, argv))
diff --git a/patches/dev300/unxlngi6-notune.diff b/patches/dev300/unxlngi6-notune.diff
deleted file mode 100644
index d03df2b..0000000
--- a/patches/dev300/unxlngi6-notune.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: unxlngi.mk
-===================================================================
---- solenv/inc/unxlngi.mk (Revision 276754)
-+++ solenv/inc/unxlngi.mk (Arbeitskopie)
-@@ -31,7 +31,7 @@
-
- # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
- CDEFAULTOPT=-O2
--ARCH_FLAGS*=-mtune=pentiumpro
-+#ARCH_FLAGS*=-mtune=pentiumpro
- .INCLUDE : unxlng.mk
- CDEFS+=-DX86
- DLLPOST=.so
More information about the Libreoffice-commits
mailing list