[Libreoffice-commits] .: patches/dev300

[Michael Meeks]

 patches/dev300/apply             |    3 --
 patches/dev300/speed-pagein.diff |   53 ---------------------------------------
 2 files changed, 56 deletions(-)

New commits:
commit 63d09ebd52d90adfc32fd8e3a58367f00820893d
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Dec 3 16:59:45 2010 +0000

    migrate and flatten speed-pagein

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5fd3d17..7d40f98 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -186,9 +186,6 @@ icu-4.2.1.diff, cbosdo
 # add idl target to toplevel makefile
 makefile-idl-build.diff, noelpwer
 
-# Pagein types.rdb / services.rdb & the ui files
-speed-pagein.diff, i#57679, michael
-
 # Replace hunspell linked list implementation with hashed implementation
 # Reduces hunspell mem usage by more than half (3.7M to ~680K)
 # (even bigger savings on 64bit, and with dicts like the Czech one)
diff --git a/patches/dev300/speed-pagein.diff b/patches/dev300/speed-pagein.diff
deleted file mode 100644
index bce24cd..0000000
--- a/patches/dev300/speed-pagein.diff
+++ /dev/null
@@ -1,53 +0,0 @@
----
- desktop/source/pagein/makefile.mk |   36 +++++++++++++++++++++++++++++++++++-
- 1 files changed, 35 insertions(+), 1 deletions(-)
-
-diff --git desktop/source/pagein/makefile.mk desktop/source/pagein/makefile.mk
-index 01452a8..637f290 100644
---- desktop/source/pagein/makefile.mk
-+++ desktop/source/pagein/makefile.mk
-@@ -160,6 +160,40 @@ $(MISC)$/$(TARGET)-common : makefile.mk
-     @-echo $(DLLPRE)svl$(DFTDLLPOST)   >> $@
-     @-echo $(DLLPRE)vcl$(DFTDLLPOST)   >> $@
-     @-echo $(DLLPRE)tk$(DFTDLLPOST)    >> $@
--    @-echo $(DLLPRE)svt$(DFTDLLPOST)   >> $@
-+    @-echo types.rdb                   >> $@
-+    @-echo services.rdb                >> $@
-+# urgh ...
-+    @-echo oovbaapi.rdb                                         >> $@
-+    @-echo deployment$$(DLLPOSTFIX)$(UNODLLPOST)           >> $@
-+    @-echo $(DLLPRE)deploymentmisc$(DLLPOSTFIX)$(DLLPOST) >> $@
-+# omitted pieces (from writer startup ...) hopefully common
-+    @-echo $(DLLPRE)ucb1$(DLLPOST)               >> $@
-+    @-echo $(DLLPRE)xstor$(DLLPOST)              >> $@
-+    @-echo $(DLLPRE)package2$(DLLPOST)           >> $@
-+    @-echo $(DLLPRE)filterconfig1$(DLLPOST)      >> $@
-+    @-echo $(DLLPRE)uui$(DFTDLLPOST)             >> $@
-+    @-echo $(DLLPRE)lng$(DFTDLLPOST)             >> $@
-+    @-echo $(DLLPRE)svt$(DFTDLLPOST)             >> $@
-+    @-echo $(DLLPRE)spl$(DFTDLLPOST)             >> $@
-+    @-echo $(DLLPRE)basegfx$(DFTDLLPOST)         >> $@
-+    @-echo $(DLLPRE)avmedia$(DFTDLLPOST)         >> $@
-+    @-echo $(DLLPRE)dtransX11$(DFTDLLPOST)       >> $@
-+    @-echo $(DLLPRE)helplinker$(DFTDLLPOST)      >> $@
-+    @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST)     >> $@
-+    @-echo $(DLLPRE)icule$(ICUDLLPOST)           >> $@
-+    @-echo $(DLLPRE)icudata$(ICUDLLPOST)         >> $@
-+    @-echo sax$(UNODLLPOST)                      >> $@
-+    @-echo gconfbe1$(UNODLLPOST)                 >> $@
-+    @-echo fsstorage$(UNODLLPOST)                >> $@
-+    @-echo desktopbe$(UNODLLPOST)                >> $@
-+    @-echo localebe1$(UNODLLPOST)                >> $@
-+    @-echo ucpexpand1$(UNODLLPOST)               >> $@
-+# uno bits
-+    @-echo $(DLLPRE)reg$(DLLPOST)                >> $@
-+    @-echo $(DLLPRE)store$(DLLPOST)              >> $@
-+# stoc bits
-+    @-echo bootstrap$(UNODLLPOST)                >> $@
-+    @-echo reflection$(UNODLLPOST)               >> $@
-+    @-echo stocservices$(UNODLLPOST)             >> $@
-     @-echo $(DLLPRE)sfx$(DFTDLLPOST)   >> $@
-     @-echo $(DLLPRE)sofficeapp$(DLLPOST) >> $@
--- 
-1.7.0.1
-