ooo-build r14245 - in branches/ooo-build-3-0: . patches/dev300

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14245 - in branches/ooo-build-3-0: . patches/dev300
Date: Wed, 8 Oct 2008 13:27:56 +0000 (UTC)
Author: rengelhard
Date: Wed Oct  8 13:27:55 2008
New Revision: 14245
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14245&view=rev

Log:
2008-10-08  Rene Engelhard  <rene debian org>

   * patches/dev300/extensions-system-java.diff: remove xmlhelp part ...
   * patches/dev300/xmlhelp-system-lucene-fix.diff: ... and add here
   * patches/dev300/apply: apply above for all (SystemBits / ExtensionsFixes)
     instead of GentooOnly
   * patches/dev300/apply, patches/dev300/debian-system-*: remove, obsolete



Added:
   branches/ooo-build-3-0/patches/dev300/xmlhelp-system-lucene-fix.diff
      - copied, changed from r14233, /branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff
Removed:
   branches/ooo-build-3-0/patches/dev300/debian-system-apache-commons.diff
   branches/ooo-build-3-0/patches/dev300/debian-system-jfreereport.diff
   branches/ooo-build-3-0/patches/dev300/debian-system-lucene-m29.diff
   branches/ooo-build-3-0/patches/dev300/debian-system-lucene.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Oct  8 13:27:55 2008
@@ -31,8 +31,7 @@
 	      UnUsedButNotYetRemovedFromSVN, WebDAVUpstream, \
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, KDE4
-DebianLooseSections: DebianBaseNoHelpContent, DebianBaseSystemJFreeReport, \
-	             DebianBaseSystemApacheCommons, DebianBaseSystemLucene
+DebianLooseSections: DebianBaseNoHelpContent
 # Optional sections
 Optional : DejaVuFonts, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
 # Binfilter patches: a special distro; applied only when building with binfilter
@@ -380,6 +379,8 @@
 [ ExtensionFixes ]
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
+# extensions: fix & unbundle system java
+extensions-system-java.diff, hmth
 
 [ FixesNotForUpstream < ooo300-m3 ]
 pdfimport-no-license-m2.diff
@@ -1293,6 +1294,7 @@
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
 
+xmlhelp-system-lucene-fix.diff
 
 [ TangoIcons ]
 # default to large icons in the toolbar
@@ -1416,8 +1418,6 @@
 
 # test system libxmlsec
 system-xmlsec.diff
-# extensions: fix & unbundle system java
-extensions-system-java.diff, hmth
 
 [ GentooOnly ]
 SectionOwner => aprosky
@@ -2289,15 +2289,6 @@
 palette-enhanced-gradient.diff
 palette-enhanced-hatch.diff
 
-[ DebianBaseSystemJFreeReport ]
-debian-system-jfreereport.diff
-[ DebianBaseSystemApacheCommons ]
-debian-system-apache-commons.diff
-[ DebianBaseSystemLucene >= dev300-m30 >= ooo300-m1 ]
-debian-system-lucene.diff
-[ DebianBaseSystemLucene < dev300-m30 < ooo300-m1 ]
-debian-system-lucene-m29.diff
-
 [ DebianBaseOnly >= dev300-m30 >= ooo300-m1 ]
 configures-explicit-arch.diff
 [ DebianBaseOnly < dev300-m30 < ooo300-m1 ]

Modified: branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff	Wed Oct  8 13:27:55 2008
@@ -113,26 +113,3 @@
  
  .ELSE
  @all:
---- xmlhelp/source/com/sun/star/help/makefile.mk.orig	2008-10-03 11:07:56.000000000 +0200
-+++ xmlhelp/source/com/sun/star/help/makefile.mk	2008-10-03 11:45:41.000000000 +0200
-@@ -103,6 +103,7 @@
- JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar
- .IF "$(SYSTEM_LUCENE)" == "YES"
- XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-+COMP=fix_system_lucene
- .ELSE
- JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
- .ENDIF
-@@ -115,3 +116,12 @@
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-+
-+.IF "$(JARTARGETN)"!=""
-+$(JARTARGETN) : $(COMP)
-+.ENDIF
-+
-+fix_system_lucene:
-+	@echo "Fix Java Class-Path entry for Lucene libraries from system."
-+	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
-+	-i ../../../../../unxlngx6.pro/class/HelpLinker/META-INF/MANIFEST.MF

Copied: branches/ooo-build-3-0/patches/dev300/xmlhelp-system-lucene-fix.diff (from r14233, /branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff)
==============================================================================
--- /branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/xmlhelp-system-lucene-fix.diff	Wed Oct  8 13:27:55 2008
@@ -1,118 +1,3 @@
---- 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
-@@ -41,7 +41,8 @@
- #----- compile .java files -----------------------------------------
- JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.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)$(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
- JARFILES += flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar	jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar
- .ENDIF
-@@ -90,9 +91,17 @@
- .INCLUDE :  target.mk
- 
- .IF "$(JARTARGETN)"!=""
--$(JARTARGETN) : $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES)
-+$(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES)
- .ENDIF          # "$(JARTARGETN)"!=""
- 
-+fix_system_jfreereport:
-+	@echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system."
-+	@$(SED) '/flute/,/sac/d' -i ../../../../../../unxlngx6.pro/class/sun-report-builder/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 ../../../../../../unxlngx6.pro/class/sun-report-builder/META-INF/MANIFEST.MF
-+
- $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
---- reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf.orig	2008-10-03 16:43:20.000000000 +0200
-+++ reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf	2008-10-03 16:43:34.000000000 +0200
-@@ -4,4 +4,4 @@
-   jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar
-   liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar 
-   libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar
--UNO-Type-Path: 
-+UNO-Type-Path: .
---- 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
-@@ -68,6 +68,10 @@
- 
- # .jar files from solver
- COMPONENT_EXTJARFILES = \
-+	$(EXTENSIONDIR)$/sun-report-builder.jar \
-+	$(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							\
-@@ -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)$/reportbuilderwizard.jar
-+	$(EXTENSIONDIR)$/sac.jar                                                
-+.ENDIF
- 
- COMPONENT_MANIFEST_GENERIC:=TRUE
- COMPONENT_MANIFEST_SEARCHDIR:=registry
-@@ -94,15 +97,9 @@
- .INCLUDE : target.mk
- .INCLUDE : extension_post.mk
- 
--.IF "$(SYSTEM_JFREEREPORT)" == "YES"
--$(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar
--	@@-$(MKDIRHIER) $(@:d)
--    $(COPY) $< $@
--.ELSE
- $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
--.ENDIF
- 
- $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
- 	@@-$(MKDIRHIER) $(@:d)
-@@ -116,7 +113,7 @@
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
--    .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 @@
- COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar
- COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
- COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
-+.ELSE
-+COMP=fix_system_commons
- .ENDIF
- 
- ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) -Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR)
- 
- # creates two files wiki-publisher.oxt and mediawiki_develop.zip, the second one might be used in further build process
--ALLTAR: ANTBUILD
-+ALLTAR: $(COMP) ANTBUILD
-+
-+fix_system_commons:
-+	@echo "Fix Java Class-Path entry for Apache Commons libraries from system."
-+	@$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR) file://$(COMMONS_LANG_JAR) \
-+file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
-+	@echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension."
-+	@$(SED) '/file="..commons/d' -i build.xml
- 
- .ELSE
- @all:
 --- xmlhelp/source/com/sun/star/help/makefile.mk.orig	2008-10-03 11:07:56.000000000 +0200
 +++ xmlhelp/source/com/sun/star/help/makefile.mk	2008-10-03 11:45:41.000000000 +0200
 @@ -103,6 +103,7 @@
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]