[ooo-build-commit] .: patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Sat May 1 10:20:03 PDT 2010
patches/dev300/extensions-system-java.diff | 146 ------------------------
patches/dev300/i95118.diff | 70 -----------
patches/dev300/no-fontooo-wizard.diff | 29 ----
patches/dev300/solenv-no-extension-license.diff | 63 ----------
4 files changed, 308 deletions(-)
New commits:
commit 2a9ea9f24a5231ebacbd154258aea6ad38229e1e
Author: Rene Engelhard <rene at debian.org>
Date: Sat May 1 19:19:01 2010 +0200
remove some orphaned (and obsolete/not working) patches
* patches/dev300/extensions-system-java.diff:
* patches/dev300/i95118.diff:
* patches/dev300/no-fontooo-wizard.diff:
* patches/dev300/solenv-no-extension-license.diff:
diff --git a/patches/dev300/extensions-system-java.diff b/patches/dev300/extensions-system-java.diff
deleted file mode 100644
index 023540d..0000000
--- a/patches/dev300/extensions-system-java.diff
+++ /dev/null
@@ -1,146 +0,0 @@
---- 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 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_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 ../../../../../../$(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-design/META-INF/MANIFEST.MF
-+
- $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
---- 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
- 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,55 +97,9 @@
- .INCLUDE : target.mk
- .INCLUDE : extension_post.mk
-
--.IF "$(SYSTEM_JFREEREPORT)" == "YES"
--$(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
- $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
--.ENDIF
-
- $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
- @@-$(MKDIRHIER) $(@:d)
-@@ -116,7 +113,6 @@
- @@-$(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:
diff --git a/patches/dev300/i95118.diff b/patches/dev300/i95118.diff
deleted file mode 100644
index 4ed0e25..0000000
--- a/patches/dev300/i95118.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: scripting/source/pyprov/pythonscript.py
-===================================================================
-RCS file: /cvs/framework/scripting/source/pyprov/pythonscript.py,v
-retrieving revision 1.7
-diff -c -r1.7 pythonscript.py
-*** scripting/source/pyprov/pythonscript.py 20 May 2008 14:32:05 -0000 1.7
---- scripting/source/pyprov/pythonscript.py 13 Nov 2008 21:42:32 -0000
-***************
-*** 662,667 ****
---- 662,669 ----
- uri = uri.replace( "vnd.sun.star.expand:", "",1)
- uri = uno.getComponentContext().getByName(
- "/singletons/com.sun.star.util.theMacroExpander" ).expandMacros( uri )
-+ if uri.startswith( "file:" ):
-+ uri = uno.absolutize("",uri) # necessary to get rid of .. in uri
- return uri
-
- #--------------------------------------------------------------
-Index: scripting/source/provider/URIHelper.cxx
-===================================================================
-RCS file: /cvs/framework/scripting/source/provider/URIHelper.cxx,v
-retrieving revision 1.6
-diff -c -r1.6 URIHelper.cxx
-*** scripting/source/provider/URIHelper.cxx 11 Apr 2008 10:37:12 -0000 1.6
---- scripting/source/provider/URIHelper.cxx 13 Nov 2008 21:42:32 -0000
-***************
-*** 52,63 ****
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
-
- static const char SHARE_UNO_PACKAGES[] = "share:uno_packages";
-! static const char SHARE_UNO_PACKAGES_DIR[] =
-! "/share/uno_packages/cache";
-
- static const char USER[] = "user";
- static const char USER_URI[] =
-! "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") ":::UserInstallation}";
-
- static const char USER_UNO_PACKAGES[] = "user:uno_packages";
- static const char USER_UNO_PACKAGES_DIR[] =
---- 52,63 ----
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
-
- static const char SHARE_UNO_PACKAGES[] = "share:uno_packages";
-! static const char SHARE_UNO_PACKAGES_URI[] =
-! "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE";
-
- static const char USER[] = "user";
- static const char USER_URI[] =
-! "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
-
- static const char USER_UNO_PACKAGES[] = "user:uno_packages";
- static const char USER_UNO_PACKAGES_DIR[] =
-***************
-*** 164,171 ****
- else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES))
- {
- test = OUString::createFromAscii("uno_packages");
-! uri = OUString::createFromAscii(SHARE_URI);
-! uri = uri.concat(OUString::createFromAscii(SHARE_UNO_PACKAGES_DIR));
- }
- else if (m_sLocation.indexOf(OUString::createFromAscii(TDOC_SCHEME)) == 0)
- {
---- 164,170 ----
- else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES))
- {
- test = OUString::createFromAscii("uno_packages");
-! uri = OUString::createFromAscii(SHARE_UNO_PACKAGES_URI);
- }
- else if (m_sLocation.indexOf(OUString::createFromAscii(TDOC_SCHEME)) == 0)
- {
diff --git a/patches/dev300/no-fontooo-wizard.diff b/patches/dev300/no-fontooo-wizard.diff
deleted file mode 100644
index 5a59f4a..0000000
--- a/patches/dev300/no-fontooo-wizard.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: Common.xcu
-===================================================================
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
-retrieving revision 1.31
-diff -u -u -r1.31 Common.xcu
---- officecfg/registry/data/org/openoffice/Office/Common.xcu 23 Mar 2005 10:53:46 -0000 1.31
-+++ officecfg/registry/data/org/openoffice/Office/Common.xcu 20 Jun 2005 17:38:08 -0000
-@@ -509,21 +509,6 @@
- <value >private:image/3216</value>
- </prop>
- </node>
-- <node oor:name="m15" oor:op="replace" install:module="dicooo">
-- <prop oor:name="URL" oor:type="xs:string">
-- <value >macro:///Launcher.FontOOo.StartFontOOo</value>
-- </prop>
-- <prop oor:name="Title">
-- <value>FontOOo Wizard...</value>
-- <value xml:lang="en-US">Install fonts from the web...</value>
-- </prop>
-- <prop oor:name="TargetName" oor:type="xs:string">
-- <value >_self</value>
-- </prop>
-- <prop oor:name="ImageIdentifier" oor:type="xs:string">
-- <value >private:image/3216</value>
-- </prop>
-- </node>
- </node>
- </node>
- <node oor:name="Forms">
diff --git a/patches/dev300/solenv-no-extension-license.diff b/patches/dev300/solenv-no-extension-license.diff
deleted file mode 100644
index 3be970c..0000000
--- a/patches/dev300/solenv-no-extension-license.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: extension_post.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/extension_post.mk,v
-retrieving revision 1.2
-diff -u -u -r1.2 extension_post.mk
---- solenv/inc/extension_post.mk 6 Jun 2008 08:10:54 -0000 1.2
-+++ solenv/inc/extension_post.mk 16 Jun 2008 15:01:36 -0000
-@@ -112,7 +112,6 @@
- .ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
- $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
- @@-$(MKDIRHIER) $(@:d)
-- $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
- @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
- $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)$/desc.tmp.$(EXTNAME)
- @@-$(RM) $@.$(EXTNAME)
-@@ -119,21 +119,6 @@
- $(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
- @@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME)
-
--# default OOo license text!!!
--# may not fit...
--.IF "$(CUSTOM_LICENSE)"==""
--.IF "$(GUI)" == "WNT"
--PACKLICDEPS=$(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
--.ELSE # "$(GUI)" == "WNT"
--PACKLICDEPS=$(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
--.ENDIF # "$(GUI)" == "WNT"
--.ELSE # "$(CUSTOM_LICENSE)" == ""
--PACKLICDEPS=$(CUSTOM_LICENSE)
--.ENDIF # "$(CUSTOM_LICENSE)" == ""
--$(PACKLICS) : $(PACKLICDEPS)
-- @@-$(MKDIRHIER) $(@:d)
-- $(GNUCOPY) $< $@
--
- #$(COMPONENT_MANIFEST) : $$(@:f)
- $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
- @@-$(MKDIRHIER) $(@:d)
-Index: extension_pre.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/extension_pre.mk,v
-retrieving revision 1.2
-diff -u -u -r1.2 extension_pre.mk
---- solenv/inc/extension_pre.mk 6 Jun 2008 08:11:07 -0000 1.2
-+++ solenv/inc/extension_pre.mk 16 Jun 2008 15:01:36 -0000
-@@ -37,17 +37,9 @@
- COMPONENT_MANIFEST*:=$(EXTENSIONDIR)$/META-INF$/manifest.xml
- MANIFEST_SRC*:=manifest.xml
-
--.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)$/registration$/license_$i.txt)
--COMPONENT_LIC_TEMPL*:=registration/license_xxx.txt
--.ELSE
--PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)$/registration$/LICENSE_$i)
--COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx
--.ENDIF
--
- #TODO: check ZIP9TARGET for previous use!
- common_build_zip=
--MANIFEST_DEPS= $(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
-+MANIFEST_DEPS= $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
- ZIP9DEPS= $(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_MANIFEST) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
- ZIP9TARGET= $(EXTENSION_ZIPNAME)
- ZIP9DIR= $(EXTENSIONDIR)
More information about the ooo-build-commit
mailing list