ooo-build r12923 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Jun 19 09:29:55 2008
New Revision: 12923
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12923&view=rev

Log:
2008-06-19  Jan Holeosovsky  <kendy suse cz>

        * patches/dev300/buildfix-no-UPD-in-library-names.diff,
          patches/dev300/buildfix-no-UPD-in-library-names-linuxonly.diff: Bin.
        * patches/dev300/lwp-filter-component.diff,
          patches/dev300/speed-local-link-except.diff,
          patches/dev300/speed-pagein.diff,
          patches/dev300/apply: Move here, and apply.


Removed:
   trunk/patches/dev300/buildfix-no-UPD-in-library-names-linuxonly.diff
   trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/lwp-filter-component.diff
   trunk/patches/dev300/speed-local-link-except.diff
   trunk/patches/dev300/speed-pagein.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jun 19 09:29:55 2008
@@ -2167,16 +2167,6 @@
 ui-desktop-integration.diff, michael
 
 
-[ TemporaryHacks ]
-# build our stuff
-# FIXME: should be in the respective patches
-buildfix-no-UPD-in-library-names.diff, jholesov
-
-
-[ LinuxOnly ]
-buildfix-no-UPD-in-library-names-linuxonly.diff, jholesov
-
-
 [ InternalCairo ]
 cairo-cairo-1-4-10-diff.diff
 cairo-makefile-mk.diff

Modified: trunk/patches/dev300/lwp-filter-component.diff
==============================================================================
--- trunk/patches/dev300/lwp-filter-component.diff	(original)
+++ trunk/patches/dev300/lwp-filter-component.diff	Thu Jun 19 09:29:55 2008
@@ -640,7 +640,7 @@
 +	$(SALLIB) \
 +	$(XMLOFFLIB)
 +
-+SHL1TARGET = $(TARGET)$(UPD)$(DLLPOSTFIX)
++SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
 +SHL1IMPLIB = i$(SHL1TARGET)
 +SHL1LIBS = $(LIB1TARGET)
 +SHL1VERSIONMAP=$(TARGET).map

Modified: trunk/patches/dev300/speed-local-link-except.diff
==============================================================================
--- trunk/patches/dev300/speed-local-link-except.diff	(original)
+++ trunk/patches/dev300/speed-local-link-except.diff	Thu Jun 19 09:29:55 2008
@@ -34,7 +34,7 @@
 +LIB1TARGET= $(SLB)$/$(TARGET).lib
 +LIB1OBJFILES= $(SLO)$/except.obj
 +
-+SHL1TARGET=exlink$(UPD)$(DLLPOSTFIX)
++SHL1TARGET=exlink$$(DLLPOSTFIX)
 +SHL1LIBS=$(LIB1TARGET)
 +SHL1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CPPULIB)
 +

Modified: trunk/patches/dev300/speed-pagein.diff
==============================================================================
--- trunk/patches/dev300/speed-pagein.diff	(original)
+++ trunk/patches/dev300/speed-pagein.diff	Thu Jun 19 09:29:55 2008
@@ -34,8 +34,8 @@
  	@-echo soffice.bin                 >> $@
 +# urgh ...
 +	@-echo oovbaapi.rdb                                         >> $@
-+	@-echo deployment$(UPD)$(DLLPOSTFIX)$(UNODLLPOST)           >> $@
-+	@-echo $(DLLPRE)deploymentmisc$(UPD)$(DLLPOSTFIX)$(DLLPOST) >> $@
++	@-echo deployment$$(DLLPOSTFIX)$(UNODLLPOST)           >> $@
++	@-echo $(DLLPRE)deploymentmisc$(DLLPOSTFIX)$(DLLPOST) >> $@
 +# omitted pieces (from writer startup ...) hopefully common
 +	@-echo $(DLLPRE)ucb1$(DLLPOST)               >> $@
 +	@-echo $(DLLPRE)xstor$(DLLPOST)              >> $@