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

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Mar 16 21:26:01 2009
New Revision: 15551
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15551&view=rev

Log:
2009-03-16  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/fix-system-jfreereport.diff: fix SRB with
          --with-system-*


Added:
   trunk/patches/dev300/fix-system-jfreereport.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Mar 16 21:26:01 2009
@@ -1453,6 +1453,8 @@
 pyuno-rpath-ooodir.diff
 system-python-ure-bootstrap.diff, deb#501028, i#90701
 
+fix-system-jfreereport.diff, i#100249, rengelha
+
 [ DejaVuFonts ]
 
 # Following the changed names of DejaVu fonts

Added: trunk/patches/dev300/fix-system-jfreereport.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fix-system-jfreereport.diff	Mon Mar 16 21:26:01 2009
@@ -0,0 +1,55 @@
+--- reportbuilder/java/com/sun/star/report/pentaho/makefile.mk-old	2009-03-16 20:23:20.000000000 +0100
++++ reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	2009-03-16 20:51:45.000000000 +0100
+@@ -42,11 +42,14 @@
+ JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
+ .IF "$(SYSTEM_JFREEREPORT)" == "YES"
+ XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR)
+-COMP=fix_system_jfreereport
+ .ELSE
+ JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
+ .ENDIF
+ 
++.IF "$(SYSTEM_JFREEREPORT)" == "YES" || "$(SYSTEM_APACHE_COMMONS)" == "YES"
++COMP=fix_system_libs
++.ENDIF
++
+ JAVAFILES       := $(shell @$(FIND) . -name "*.java")
+ # JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/))
+ 
+@@ -94,13 +97,19 @@
+ $(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES)
+ .ENDIF          # "$(JARTARGETN)"!=""
+ 
+-fix_system_jfreereport:
+-	@echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system."
++fix_system_libs:
++	@echo "Fix Java Class-Path entry for libraries from system."
++.IF ("$(SYSTEM_JFREEREPORT)" != "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
++	@$(SED) -r -e "s#commons-logging-1.1.1.jar#file://$(COMMONS_LOGGING_JAR)#" \
++		-i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
++.ENDIF
++.IF ("$(SYSTEM_JFREEREPORT)" == "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
+ 	@$(SED) '/flute/,/sac/d' -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
+ 	@$(SED) -r -e "s#^Class-Path.*#\0\n  file://$(LIBBASE_JAR)\n  file://$(SAC_JAR)\n  file://$(LIBXML_JAR)\n\
+   file://$(FLUTE_JAR)\n  file://$(JFREEREPORT_JAR)\n  file://$(LIBLAYOUT_JAR)\n  file://$(LIBLOADER_JAR)\n  file://$(LIBFORMULA_JAR)\n\
+-  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  file://$(LIBSERIALIZER_JAR)#" \
++  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  file://$(LIBSERIALIZER_JAR)\n  file://$(COMMONS_LOGGING_JAR)#" \
+ 	-i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
++.ENDIF
+ 
+ $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
+ 	@@-$(MKDIRHIER) $(@:d)
+--- reportbuilder/util/makefile.mk-old	2009-03-16 20:39:34.000000000 +0100
++++ reportbuilder/util/makefile.mk	2009-03-16 20:40:21.000000000 +0100
+@@ -110,7 +110,10 @@
+ 	$(EXTENSIONDIR)$/librepository-1.0.0.jar					\
+ 	$(EXTENSIONDIR)$/libxml-1.0.0.jar							\
+ 	$(EXTENSIONDIR)$/flow-engine-0.9.2.jar 	                    \
+-	$(EXTENSIONDIR)$/sac.jar                                 	\
++	$(EXTENSIONDIR)$/sac.jar
++.ENDIF
++.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
++COMPONENT_EXTJARFILES += \
+ 	$(EXTENSIONDIR)$/commons-logging-1.1.1.jar
+ .ENDIF
+