GNOME.org
 

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

Author: tml
Date: Wed Dec 10 16:52:28 2008
New Revision: 14817
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14817&view=rev

Log:
2008-12-10  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: speed-configmgr-misc.diff applies to
	dev300-m36. extensions-system-java.diff applies to dev300 after
	slight edits.

	* patches/dev300/extensions-system-java.diff: Adapt for
	dev300-m36.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/extensions-system-java.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec 10 16:52:28 2008
@@ -246,8 +246,7 @@
 
 [ TemporaryHacks ]
 # further performance tweaks to configmgr
-# FIXME 2008-11-26: doesn't compile in dev300-m35
-#speed-configmgr-misc.diff, i#84751, michael
+speed-configmgr-misc.diff, i#84751, michael
 
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
@@ -367,8 +366,7 @@
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
 # extensions: fix & unbundle system java
-# FIXME 2008-11-26: huh?
-#extensions-system-java.diff, hmth
+extensions-system-java.diff, hmth
 # Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
 apache-commons-build-fix-invalid-chars.diff, kami
 

Modified: trunk/patches/dev300/extensions-system-java.diff
==============================================================================
--- trunk/patches/dev300/extensions-system-java.diff	(original)
+++ trunk/patches/dev300/extensions-system-java.diff	Wed Dec 10 16:52:28 2008
@@ -1,10 +1,10 @@
---- reportbuilder/java/com/sun/star/report/pentaho/makefile.mk.orig	2008-10-03 11:07:32.000000000 +0200
-+++ reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	2008-10-03 11:39:11.000000000 +0200
+--- reportdesign/java/com/sun/star/report/pentaho/makefile.mk.orig	2008-10-03 11:07:32.000000000 +0200
++++ reportdesign/java/com/sun/star/report/pentaho/makefile.mk	2008-10-03 11:39:11.000000000 +0200
 @@ -41,7 +41,8 @@
  #----- compile .java files -----------------------------------------
- JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
+ JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
  .IF "$(SYSTEM_JFREEREPORT)" == "YES"
--XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)librepository-0.1.4.jar
+-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)
 +XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(FLUTE_JAR)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)
 +COMP=fix_system_jfreereport
  .ELSE
@@ -20,17 +20,17 @@
  
 +fix_system_jfreereport:
 +	@echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system."
-+	@$(SED) '/flute/,/sac/d' -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
++	@$(SED) '/flute/,/sac/d' -i ../../../../../../$(INPATH)/class/sun-report-design/META-INF/MANIFEST.MF
 +	@$(SED) -r -e "s#^Class-Path.*#\0\n  file://$(JCOMMON_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://$(JCOMMON_SERIALIZER_JAR)#" \
-+	-i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
++	-i ../../../../../../$(INPATH)/class/sun-report-design/META-INF/MANIFEST.MF
 +
  $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
  	@@-$(MKDIRHIER) $(@:d)
      $(COPY) $< $@
---- reportbuilder/util/makefile.mk.orig	2008-10-02 17:04:12.000000000 +0200
-+++ reportbuilder/util/makefile.mk	2008-10-02 17:24:05.000000000 +0200
+--- reportdesign/util/makefile.mk.orig	2008-10-02 17:04:12.000000000 +0200
++++ reportdesign/util/makefile.mk	2008-10-02 17:24:05.000000000 +0200
 @@ -68,6 +68,10 @@
  
  # .jar files from solver
@@ -39,27 +39,67 @@
 +	$(EXTENSIONDIR)$/reportbuilderwizard.jar
 +.IF "$(SYSTEM_JFREEREPORT)" != "YES"
 +COMPONENT_EXTJARFILES+= \
- 	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar							\
- 	$(EXTENSIONDIR)$/jcommon-1.0.10.jar										\
- 	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar							\
+ 	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar				\
+ 	$(EXTENSIONDIR)$/jcommon-1.0.10.jar							\
+ 	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
 @@ -78,9 +82,8 @@
- 	$(EXTENSIONDIR)$/librepository-0.1.4.jar									\
- 	$(EXTENSIONDIR)$/libxml-0.9.9.jar										\
- 	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar					\
--	$(EXTENSIONDIR)$/sac.jar                                                \
--	$(EXTENSIONDIR)$/sun-report-builder.jar \
+ 	$(EXTENSIONDIR)$/librepository-0.1.4.jar					\
+ 	$(EXTENSIONDIR)$/libxml-0.9.9.jar							\
+ 	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar 	\
+-	$(EXTENSIONDIR)$/sac.jar                                 	\
+-	$(EXTENSIONDIR)$/sun-report-builder.jar 					\
 -	$(EXTENSIONDIR)$/reportbuilderwizard.jar
 +	$(EXTENSIONDIR)$/sac.jar                                                
 +.ENDIF
  
  COMPONENT_MANIFEST_GENERIC:=TRUE
  COMPONENT_MANIFEST_SEARCHDIR:=registry
-@@ -94,15 +97,9 @@
+@@ -94,55 +97,9 @@
  .INCLUDE : target.mk
  .INCLUDE : extension_post.mk
  
 -.IF "$(SYSTEM_JFREEREPORT)" == "YES"
--$(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar
+-$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar : $(FLUTE_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/jcommon-1.0.10.jar : $(JCOMMON_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar : $(JCOMMON_SERIALIZER_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/libfonts-0.3.3.jar : $(LIBFONTS_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/libformula-0.1.14.jar : $(LIBFORMULA_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/liblayout-0.2.8.jar : $(LIBLAYOUT_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/libloader-0.3.6.jar : $(LIBLOADER_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/librepository-0.1.4.jar : $(LIBREPOSITORY_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/libxml-0.9.9.jar : $(LIBXML_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar : $(JFREEREPORT_JAR)
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-
+-$(EXTENSIONDIR)$/sac.jar : $(SAC_JAR)
 -	@@-$(MKDIRHIER) $(@:d)
 -    $(COPY) $< $@
 -.ELSE
@@ -70,16 +110,15 @@
  
  $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
  	@@-$(MKDIRHIER) $(@:d)
-@@ -116,7 +113,7 @@
+@@ -116,7 +113,6 @@
  	@@-$(MKDIRHIER) $(@:d)
      $(COPY) $< $@
  
--    .ELSE			# "$(SOLAR_JAVA)"!=""
+-.ELSE			# "$(SOLAR_JAVA)"!=""
 +.ELSE			# "$(SOLAR_JAVA)"!=""
  .INCLUDE : target.mk
  .ENDIF			# "$(SOLAR_JAVA)"!=""
 -#
-+
 --- swext/mediawiki/makefile.mk.orig	2008-10-03 01:15:51.000000000 +0200
 +++ swext/mediawiki/makefile.mk	2008-10-03 01:22:34.000000000 +0200
 @@ -41,12 +41,21 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]