ooo-build r15594 - in trunk: . bin/piece patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Mar 20 17:33:11 2009
New Revision: 15594
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15594&view=rev

Log:
2009-03-20  Petr Mladek  <pmladek suse cz>

	* bin/piece/file-list-ure: install the internal stlport when it was
	  built in bootstrap

	* patches/dev300/piece-jfreereport.diff: fix to apply with
	  cws-rptfix06.diff



Modified:
   trunk/ChangeLog
   trunk/bin/piece/file-list-ure
   trunk/patches/dev300/piece-jfreereport.diff

Modified: trunk/bin/piece/file-list-ure
==============================================================================
--- trunk/bin/piece/file-list-ure	(original)
+++ trunk/bin/piece/file-list-ure	Fri Mar 20 17:33:11 2009
@@ -25,6 +25,12 @@
 mv_file_between_flists files-mono.txt files-$piece.txt $OO_INSTDIR/ure/lib/libcli_.*.so
 add_used_directories files-mono.txt files-$piece.txt
 
+# install the internal stlport if available; it might be included in the solver from bootstrap
+if test -f $OO_INSTDIR/solver/lib/libstlport_gcc.so ; then
+    cp $OO_INSTDIR/solver/lib/libstlport_gcc.so $DESTDIR$OO_INSTDIR/ure/lib
+    echo "$OO_INSTDIR/ure/lib/libstlport_gcc.so" >>files-$piece.txt
+fi
+
 # FIXME: generate pythonloader.unorc to be ready for python components registration
 #        it might be generated in postprocess togeter with other profiles but it is too late
 #        might be fixed by the planed scp2-split

Modified: trunk/patches/dev300/piece-jfreereport.diff
==============================================================================
--- trunk/patches/dev300/piece-jfreereport.diff	(original)
+++ trunk/patches/dev300/piece-jfreereport.diff	Fri Mar 20 17:33:11 2009
@@ -1,11 +1,11 @@
---- jfreereport/java/libbase/makefile.mk.old	2009-03-04 20:22:23.000000000 +0100
-+++ jfreereport/java/libbase/makefile.mk	2009-03-09 14:26:49.000000000 +0100
-@@ -70,7 +70,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) :
- ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+--- jfreereport/java/libbase/makefile.mk.old	2009-03-20 11:50:30.000000000 +0100
++++ jfreereport/java/libbase/makefile.mk	2009-03-20 12:05:18.000000000 +0100
+@@ -76,7 +76,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) :
  
- $(CLASSDIR)$/commons-logging-1.1.1.jar : 
--	$(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar
-+	$(COPY) $(SOLARPIECE)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar
- 	
- $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging-1.1.1.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
- 	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ $(CLASSDIR)$/commons-logging.jar : 
+ .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
+-	$(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar
++	$(COPY) $(SOLARPIECE)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar
+ .ELSE
+ 	$(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar
+ .ENDIF