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

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu May 22 16:07:54 2008
New Revision: 12632
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12632&view=rev

Log:
2008-05-22  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/link-as-needed.diff: Fix --as-needed build in
          unodevtools.
        * patches/dev300/apply: Fix typo so that the stuff applies again.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/link-as-needed.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu May 22 16:07:54 2008
@@ -15,7 +15,7 @@
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
-     CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo
+	 CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo
 
 LinuxCommon : Common, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraFixes, LinuxOnly, SystemBits, \
@@ -1481,7 +1481,7 @@
 mono-climaker-bridgetest.diff
 
 [ VBAObjects < dev300-m13 ]
-vbaevents-services-sources.m12.diff, i#68893
+vbaevents-services-sources-m12.diff, i#68893
 [ VBAObjects >= dev300-m13 ]
 vbaevents-services-sources.diff, i#68893
 

Modified: trunk/patches/dev300/link-as-needed.diff
==============================================================================
--- trunk/patches/dev300/link-as-needed.diff	(original)
+++ trunk/patches/dev300/link-as-needed.diff	Thu May 22 16:07:54 2008
@@ -30,3 +30,17 @@
  LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
  LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
      #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+--- unodevtools/source/skeletonmaker/makefile.mk	11 Apr 2008 12:33:12 -0000	1.5
++++ unodevtools/source/skeletonmaker/makefile.mk	22 May 2008 15:46:32 -0000
+@@ -51,8 +51,9 @@
+ 
+ APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
+ 	$(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
+-APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
+-	$(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
++APP1STDLIBS =\
++	$(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)\
++	$(REGLIB) $(CPPUHELPERLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(SALLIB)
+ 
+ OBJFILES = $(APP1OBJS)
+