[ooo-build-commit] .: 13 commits - bin/unpack configure.in distro-configs/Raw.conf.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Sep 16 09:55:34 PDT 2010
bin/unpack | 2
configure.in | 3
patches/dev300/apache-commons-build-fix-invalid-chars.diff | 21 -
patches/dev300/apply | 39 --
patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff | 23 -
patches/dev300/binfilter-stl.diff | 59 ---
patches/dev300/build-java-target-extensions.diff | 206 -------------
patches/dev300/fit-list-to-size-binfilter.diff | 25 -
patches/dev300/framework-extra-job-config-sdext.diff | 14
patches/dev300/link-as-needed-bf.diff | 27 -
patches/dev300/pdfimport-lax-restrictions.diff | 24 -
patches/dev300/redirect-extensions-reportbuilder.diff | 11
patches/dev300/slideshow-effect-rewind-sdext.diff | 27 -
13 files changed, 7 insertions(+), 474 deletions(-)
New commits:
commit 39001a4f7588464e97d4abbfc8b03198c4d65930
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:52:50 2010 +0200
odk-configure-honour-ure-link.diff: disable temporarily until thorsten looks
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d6406d5..a2508d0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -939,7 +939,8 @@ psprint_config-no-orig.diff, jholesov
[ SdkFixes ]
# fix configure.pl
-odk-configure-honour-ure-link.diff
+# FIXME: thorsten wants to look at this one
+#odk-configure-honour-ure-link.diff
[ DebianOnly ]
open-url-support-iceanimals.diff
commit 97082fc7e7e3e4d0bbffbc106d031806ba646cb5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:50:11 2010 +0200
framework-extra-job-config-sdext.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e7f7222..d6406d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2583,9 +2583,6 @@ dlopen-global-symbols.diff, thorsten
# fix framework to no longer pull presenter screen for all apps
framework-extra-job-config.diff, i#107568, thorsten
-[ ExtensionFixes ]
-framework-extra-job-config-sdext.diff, i#107568, thorsten
-
[ BuildBits ]
# build the extra extensions when enabled
postprocess-extra-extensions.diff, i#123456, pmladek
diff --git a/patches/dev300/framework-extra-job-config-sdext.diff b/patches/dev300/framework-extra-job-config-sdext.diff
deleted file mode 100644
index f5d700e..0000000
--- a/patches/dev300/framework-extra-job-config-sdext.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
-index ba74332..1241a72 100644
---- sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
-+++ sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
-@@ -5,6 +5,9 @@
- <prop oor:name="Service">
- <value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
- </prop>
-+ <prop oor:name="Context">
-+ <value>com.sun.star.presentation.PresentationDocument</value>
-+ </prop>
- </node>
- </node>
- <node oor:name="Events">
commit 6140d98facce011e248726a6c4550a08c4a20367
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:47:18 2010 +0200
pdfimport-lax-restrictions.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 887ee44..e7f7222 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2276,9 +2276,6 @@ testing-more-optimizations-ark.diff
[ Fixes ]
svtools-update-ole.diff, n#411855, thorsten
-[ ExtensionFixes ]
-pdfimport-lax-restrictions.diff, i#90468, thorsten
-
[ NovellLikeOnlyWin32 ]
# FIXME: 2009-09-11: Bypass this for now. Interferes with
diff --git a/patches/dev300/pdfimport-lax-restrictions.diff b/patches/dev300/pdfimport-lax-restrictions.diff
deleted file mode 100644
index 4ab613f..0000000
--- a/patches/dev300/pdfimport-lax-restrictions.diff
+++ /dev/null
@@ -1,24 +0,0 @@
----
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index 0bc92f6..719d3ae 100644
---- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -159,11 +159,7 @@ int main(int argc, char **argv)
-
-
- // Check various permissions.
-- if ( !aDoc.isOk()||
-- !aDoc.okToPrint() ||
-- !aDoc.okToChange()||
-- !aDoc.okToCopy()||
-- !aDoc.okToAddNotes() )
-+ if ( !aDoc.isOk() )
- {
- pdfi::PDFOutDev* pOutDev( new pdfi::PDFOutDev(&aErrDoc) );
-
---
-1.7.0.1
-
commit 34a3b6545a76a6203f114a6e6e759ea5369f0275
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:44:50 2010 +0200
fit-list-to-size-binfilter.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 182e231..887ee44 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2268,9 +2268,6 @@ unoxml-boost-workaround.diff, thorsten
# Fix Spanish translation of the autofilter menu; thanks to Eduardo Moreno
# FIXME dev300-m77 sc-autofilter-l10n-es.diff, i#103840, pmladek
-[ BFFixes ]
-fit-list-to-size-binfilter.diff, i#94086, thorsten
-
[ ArkOnly ]
SectionOwner => brosenk
# See what breaks if we build with more optimizations
diff --git a/patches/dev300/fit-list-to-size-binfilter.diff b/patches/dev300/fit-list-to-size-binfilter.diff
deleted file mode 100644
index e0b4a0d..0000000
--- a/patches/dev300/fit-list-to-size-binfilter.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 12b79db557574fc9c5fb0503a875d97cf886989f Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:05:02 +0200
-Subject: [PATCH 571/768] fit-list-to-size-binfilter.diff
-
----
- .../bf_xmloff/source/draw/xmloff_sdpropls.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
-index dbeecc1..3082a43 100644
---- binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
-+++ binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
-@@ -675,7 +675,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
- { XML_FALSE, drawing::TextFitToSizeType_NONE },
- { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
- { XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
-- { XML_TRUE, drawing::TextFitToSizeType_RESIZEATTR },
-+ { XML_TRUE, drawing::TextFitToSizeType_AUTOFIT },
- { XML_TOKEN_INVALID, 0 }
- };
-
---
-1.7.0.1
-
commit fef2181a220ef8cb2b611224de74ef0ba8003670
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:41:40 2010 +0200
binfilter-dont-extern-sRTF-sHTML.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4b9a7db..182e231 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1833,11 +1833,6 @@ size-sal-textenc.diff, i#70166
# warning: comparison with string literal results in unspecified results
warning-string-comparsion-sw.diff, i#86880, pmladek
-[ BFShrink ]
-# don't export trivial strings in svtools, increases linking time, bloats size
-binfilter-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
-
-
[ NovellOnlyUnix ]
# search also gij32, ..., so the 32-bit package works on 64-bit
jvmfwk-gij32.diff, n#222708, pmladek
diff --git a/patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff b/patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff
deleted file mode 100644
index 5263be6..0000000
--- a/patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx | 5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
-index c378948..c58f8b4 100644
---- binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
-+++ binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
-@@ -61,11 +61,6 @@
- namespace binfilter {
-
- class SfxItemSet;
--extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_hidden, "HIDDEN" );
--extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_HIDDEN_false, "FALSE" );
--extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_archive, "ARCHIVE" );
--extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_archives, "ARCHIVES" );
--extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_object, "OBJECT" );
-
- class SwApplet_Impl
- {
---
-1.7.0.1
-
commit ec2f2f7e0f0f115bad606c9922770b81b203bd6f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:37:44 2010 +0200
slideshow-effect-rewind-sdext.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5782587..4b9a7db 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -299,10 +299,6 @@ offapi-typecheck-whitelist.diff, thorsten
# re-direct to plugins via http://extensions.go-oo.org/
redirect-extensions.diff
-[ ExtensionFixes ]
-# Fix from Andre, allows to step back one animation effect
-slideshow-effect-rewind-sdext.diff, i#48179, thorsten
-
[ Fixes ]
# correctly set table row height during ppt import
svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
diff --git a/patches/dev300/slideshow-effect-rewind-sdext.diff b/patches/dev300/slideshow-effect-rewind-sdext.diff
deleted file mode 100644
index 5355c50..0000000
--- a/patches/dev300/slideshow-effect-rewind-sdext.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- sdext/source/presenter/PresenterController.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sdext/source/presenter/PresenterController.cxx sdext/source/presenter/PresenterController.cxx
-index cf3ec87..db7d0f9 100644
---- sdext/source/presenter/PresenterController.cxx
-+++ sdext/source/presenter/PresenterController.cxx
-@@ -998,7 +998,6 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
- }
- break;
-
-- case awt::Key::LEFT:
- case awt::Key::PAGEUP:
- if (mxSlideShowController.is())
- {
-@@ -1009,6 +1008,7 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
- }
- break;
-
-+ case awt::Key::LEFT:
- case awt::Key::UP:
- case awt::Key::P:
- case awt::Key::BACKSPACE:
---
-1.7.0.1
-
commit 822a87443c718e6c9a0abd85c5f11e2143b5bb96
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:34:59 2010 +0200
build-java-target-extensions.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a3ee88a..5782587 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -300,8 +300,6 @@ offapi-typecheck-whitelist.diff, thorsten
redirect-extensions.diff
[ ExtensionFixes ]
-build-java-target-extensions.diff, i#93115, pmladek
-
# Fix from Andre, allows to step back one animation effect
slideshow-effect-rewind-sdext.diff, i#48179, thorsten
diff --git a/patches/dev300/build-java-target-extensions.diff b/patches/dev300/build-java-target-extensions.diff
deleted file mode 100644
index 805340c..0000000
--- a/patches/dev300/build-java-target-extensions.diff
+++ /dev/null
@@ -1,206 +0,0 @@
----
- apache-commons/java/codec/makefile.mk | 2 +-
- apache-commons/java/httpclient/makefile.mk | 2 +-
- jfreereport/java/flute/makefile.mk | 2 +-
- jfreereport/java/jfreereport/makefile.mk | 2 +-
- jfreereport/java/libbase/makefile.mk | 2 +-
- jfreereport/java/libfonts/makefile.mk | 2 +-
- jfreereport/java/libformula/makefile.mk | 2 +-
- jfreereport/java/liblayout/makefile.mk | 2 +-
- jfreereport/java/libloader/makefile.mk | 2 +-
- jfreereport/java/librepository/makefile.mk | 2 +-
- jfreereport/java/libserializer/makefile.mk | 2 +-
- jfreereport/java/libxml/makefile.mk | 2 +-
- jfreereport/java/sac/makefile.mk | 2 +-
- tomcat/makefile.mk | 5 +++++
- 14 files changed, 18 insertions(+), 13 deletions(-)
-
-diff --git apache-commons/java/codec/makefile.mk apache-commons/java/codec/makefile.mk
-index 6976731..be96f87 100644
---- apache-commons/java/codec/makefile.mk
-+++ apache-commons/java/codec/makefile.mk
-@@ -58,7 +58,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git apache-commons/java/httpclient/makefile.mk apache-commons/java/httpclient/makefile.mk
-index 8e4f2ca..900fb08 100644
---- apache-commons/java/httpclient/makefile.mk
-+++ apache-commons/java/httpclient/makefile.mk
-@@ -66,7 +66,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/flute/makefile.mk jfreereport/java/flute/makefile.mk
-index 9444d75..ffe668c 100644
---- jfreereport/java/flute/makefile.mk
-+++ jfreereport/java/flute/makefile.mk
-@@ -51,7 +51,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/jfreereport/makefile.mk jfreereport/java/jfreereport/makefile.mk
-index b527d28..cd815d2 100644
---- jfreereport/java/jfreereport/makefile.mk
-+++ jfreereport/java/jfreereport/makefile.mk
-@@ -51,7 +51,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/libbase/makefile.mk jfreereport/java/libbase/makefile.mk
-index 1cbfc11..15197e0 100644
---- jfreereport/java/libbase/makefile.mk
-+++ jfreereport/java/libbase/makefile.mk
-@@ -50,7 +50,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/libfonts/makefile.mk jfreereport/java/libfonts/makefile.mk
-index f59b3cc..cd2ff34 100644
---- jfreereport/java/libfonts/makefile.mk
-+++ jfreereport/java/libfonts/makefile.mk
-@@ -50,7 +50,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/libformula/makefile.mk jfreereport/java/libformula/makefile.mk
-index 4372ce2..28fcf99 100644
---- jfreereport/java/libformula/makefile.mk
-+++ jfreereport/java/libformula/makefile.mk
-@@ -52,7 +52,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
-
-diff --git jfreereport/java/liblayout/makefile.mk jfreereport/java/liblayout/makefile.mk
-index 0340e43..ba70d79 100644
---- jfreereport/java/liblayout/makefile.mk
-+++ jfreereport/java/liblayout/makefile.mk
-@@ -50,7 +50,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/libloader/makefile.mk jfreereport/java/libloader/makefile.mk
-index ce97b40..cfb5955 100644
---- jfreereport/java/libloader/makefile.mk
-+++ jfreereport/java/libloader/makefile.mk
-@@ -50,7 +50,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/librepository/makefile.mk jfreereport/java/librepository/makefile.mk
-index e11639c..d39daa1 100644
---- jfreereport/java/librepository/makefile.mk
-+++ jfreereport/java/librepository/makefile.mk
-@@ -50,7 +50,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/libserializer/makefile.mk jfreereport/java/libserializer/makefile.mk
-index 12a301e..05cf850 100644
---- jfreereport/java/libserializer/makefile.mk
-+++ jfreereport/java/libserializer/makefile.mk
-@@ -50,7 +50,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/libxml/makefile.mk jfreereport/java/libxml/makefile.mk
-index d0c8bb4..17109ee 100644
---- jfreereport/java/libxml/makefile.mk
-+++ jfreereport/java/libxml/makefile.mk
-@@ -50,7 +50,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git jfreereport/java/sac/makefile.mk jfreereport/java/sac/makefile.mk
-index 44cb284..a0dafe9 100644
---- jfreereport/java/sac/makefile.mk
-+++ jfreereport/java/sac/makefile.mk
-@@ -60,7 +60,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
- .ENDIF
-
- .ENDIF # $(SOLAR_JAVA)!= ""
-diff --git tomcat/makefile.mk tomcat/makefile.mk
-index a4d8236..b440e84 100755
---- tomcat/makefile.mk
-+++ tomcat/makefile.mk
-@@ -49,7 +49,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/build.xml
- PATCH_FILES=tomcat.patch
-
- BUILD_DIR=jakarta-servletapi-5
-+
-+.IF "$(JAVACISGCJ)"=="yes"
- BUILD_ACTION=$(ANT)
-+.ELSE
-+BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
-+.ENDIF
-
- # --- Targets ------------------------------------------------------
-
---
-1.7.0.1
-
commit 26adf2ffe284daad680fcfdd2170299fe6d17d6d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:32:17 2010 +0200
apache-commons-build-fix-invalid-chars.diff: Migrated to git
diff --git a/patches/dev300/apache-commons-build-fix-invalid-chars.diff b/patches/dev300/apache-commons-build-fix-invalid-chars.diff
deleted file mode 100644
index b5b4836..0000000
--- a/patches/dev300/apache-commons-build-fix-invalid-chars.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- apache-commons/java/httpclient/makefile.mk | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git apache-commons/java/httpclient/makefile.mk apache-commons/java/httpclient/makefile.mk
-index 6e05150..8e4f2ca 100644
---- apache-commons/java/httpclient/makefile.mk
-+++ apache-commons/java/httpclient/makefile.mk
-@@ -58,6 +58,9 @@ OUT2CLASS=dist$/commons-httpclient.jar
- COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
- COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
-
-+ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
-+.EXPORT : ANT_OPTS
-+
- .IF "$(JAVACISGCJ)"=="yes"
- JAVA_HOME=
- .EXPORT : JAVA_HOME
---
-1.7.0.1
-
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 08defe9..a3ee88a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -300,8 +300,6 @@ offapi-typecheck-whitelist.diff, thorsten
redirect-extensions.diff
[ ExtensionFixes ]
-# 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
build-java-target-extensions.diff, i#93115, pmladek
# Fix from Andre, allows to step back one animation effect
commit ccc864fb09cae36ac55b703ad664245eaf6c9c16
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:29:26 2010 +0200
redirect-extensions-reportbuilder.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index edbaa9d..08defe9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -300,8 +300,6 @@ offapi-typecheck-whitelist.diff, thorsten
redirect-extensions.diff
[ ExtensionFixes ]
-redirect-extensions-reportbuilder.diff
-
# 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
build-java-target-extensions.diff, i#93115, pmladek
diff --git a/patches/dev300/redirect-extensions-reportbuilder.diff b/patches/dev300/redirect-extensions-reportbuilder.diff
deleted file mode 100644
index bfe297d..0000000
--- a/patches/dev300/redirect-extensions-reportbuilder.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs.old 2010-07-22 13:08:24.000000000 +0200
-+++ reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs 2010-07-29 14:58:55.000000000 +0200
-@@ -52,7 +52,7 @@
- <author>LLA</author>
- <desc>Direct download URL to the Oracle(tm) Report Builder extension.</desc>
- </info>
-- <value>http://extensions.services.openoffice.org</value>
-+ <value>http://extensions.go-oo.org</value>
- </prop>
- <prop oor:name="Name" oor:type="xs:string">
- <info>
commit 27fd42e9cd7935c4e05ae66fd2b772354999abda
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:26:20 2010 +0200
link-as-needed-bf.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0109f7b..edbaa9d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -996,13 +996,6 @@ warning-return-values-registry.diff, i#58979, pmladek
# fixes warnings about that a variable is used unitialized
warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
-[ BFBuildBits ]
-SectionOwner => pmladek
-
-# STLport fixes
-# use -Wl,--as-needed, save 1% of relocations
-link-as-needed-bf.diff, i#89511, pmladek
-
[ LinuxOnly ]
system-python-ure-bootstrap.diff, deb#501028, i#90701
diff --git a/patches/dev300/link-as-needed-bf.diff b/patches/dev300/link-as-needed-bf.diff
deleted file mode 100644
index 58efe5f..0000000
--- a/patches/dev300/link-as-needed-bf.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- binfilter/filter/source/bf_offwrp/makefile.mk | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git binfilter/filter/source/bf_offwrp/makefile.mk binfilter/filter/source/bf_offwrp/makefile.mk
-index 18d8730..d98d5c5 100644
---- binfilter/filter/source/bf_offwrp/makefile.mk
-+++ binfilter/filter/source/bf_offwrp/makefile.mk
-@@ -51,7 +51,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
- SHL1IMPLIB= ibf_wrp
- SHL1STDLIBS= \
-- $(BFSO3LIB) \
- $(BFSVTOOLLIB) \
- $(BFOFALIB) \
- $(VCLLIB) \
-@@ -66,6 +65,7 @@ SHL1STDLIBS= \
- $(BFSDLIB) \
- $(BFSCLIB) \
- $(BFSVXLIB) \
-+ $(BFSO3LIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(LEGACYSMGRLIB)
---
-1.7.0.1
-
commit b16b4d5e4a0ba8fa2ed3a16e3c477f3d54670c6d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:22:34 2010 +0200
binfilter-stl.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 47798e2..0109f7b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1000,8 +1000,6 @@ warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
SectionOwner => pmladek
# STLport fixes
-binfilter-stl.diff, i#63770, hmth
-
# use -Wl,--as-needed, save 1% of relocations
link-as-needed-bf.diff, i#89511, pmladek
diff --git a/patches/dev300/binfilter-stl.diff b/patches/dev300/binfilter-stl.diff
deleted file mode 100644
index 6ec982d..0000000
--- a/patches/dev300/binfilter-stl.diff
+++ /dev/null
@@ -1,59 +0,0 @@
----
- binfilter/bf_svx/source/svdraw/svx_svdouno.cxx | 2 +-
- binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx | 5 +++++
- .../bf_xmloff/source/style/xmloff_xmlnumfe.cxx | 4 ++--
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git binfilter/bf_svx/source/svdraw/svx_svdouno.cxx binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
-index 1610501..0e2fbda 100644
---- binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
-+++ binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
-@@ -376,7 +376,7 @@ namespace binfilter {
- /*N*/ SdrViewIter aIter( this );
- /*N*/ for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
- /*N*/ {
--/*N*/ ::std::set< SdrView* >::const_iterator aPrevPos = aPreviouslyVisible.find( pView );
-+/*N*/ ::std::set< SdrView* >::iterator aPrevPos = aPreviouslyVisible.find( pView );
- /*N*/ if ( aPreviouslyVisible.end() != aPrevPos )
- /*N*/ { // in pView, we were visible _before_ the layer change, and are
- /*N*/ // visible _after_ the layer change, too
-diff --git binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
-index 0012d6c..bb1c6d7 100644
---- binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
-+++ binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
-@@ -88,7 +88,12 @@ SvXMLNamespaceMap::~SvXMLNamespaceMap()
-
- int SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const
- {
-+#if STLPORT_VERSION >= 500
-+//FIXME: STLport5 alternative map compare?
-+ return static_cast < int > (aNameHash.size() == rCmp.aNameHash.size());
-+#else
- return static_cast < int > (aNameHash == rCmp.aNameHash);
-+#endif
- }
-
- sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey )
-diff --git binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
-index 7dddc0e..752ec11 100644
---- binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
-+++ binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
-@@ -149,13 +149,13 @@ void SvXMLNumUsedList_Impl::SetUsed( sal_uInt32 nKey )
-
- sal_Bool SvXMLNumUsedList_Impl::IsUsed( sal_uInt32 nKey ) const
- {
-- SvXMLuInt32Set::iterator aItr = aUsed.find(nKey);
-+ SvXMLuInt32Set::const_iterator aItr = aUsed.find(nKey);
- return (aItr != aUsed.end());
- }
-
- sal_Bool SvXMLNumUsedList_Impl::IsWasUsed( sal_uInt32 nKey ) const
- {
-- SvXMLuInt32Set::iterator aItr = aWasUsed.find(nKey);
-+ SvXMLuInt32Set::const_iterator aItr = aWasUsed.find(nKey);
- return (aItr != aWasUsed.end());
- }
-
---
-1.7.0.1
-
commit ee8e06169b2ea009dd12d6283667fe589231a2c2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:21:16 2010 +0200
Create a Raw distro that should not have any patches
diff --git a/bin/unpack b/bin/unpack
index 4e1b71d..4197d5a 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -121,7 +121,7 @@ cd $BUILDDIR
if test "z$BUILD_WIN32" != "z"; then
case "$DISTRO" in
- NovellWin32*|GoOoWin32|RawWin32*)
+ NovellWin32*|GoOoWin32|Raw*)
;;
*)
check_file $UNICOWS_SRC
diff --git a/configure.in b/configure.in
index 180d9d1..5c79021 100644
--- a/configure.in
+++ b/configure.in
@@ -683,7 +683,7 @@ case $DISTRO in
Pardus*) VENDORNAME="Pardus" ;;
rPath*|rpl*) VENDORNAME="rPath" ;;
SUSE*|Novell*|NLD*) VENDORNAME="Novell" ;;
- GoOo*) VENDORNAME="Go-oo Project" ;;
+ GoOo*|Raw) VENDORNAME="Go-oo Project" ;;
Slackware*) VENDORNAME="Slackware" ;;
PLD*) VENDORNAME="PLD" ;;
OxygenOffice*) VENDORNAME="OxygenOffice" ;;
@@ -1740,8 +1740,7 @@ distro-configs/Win32.conf
distro-configs/Solaris.conf
distro-configs/GoOoLinux.conf
distro-configs/GoOoMacOSX.conf
-distro-configs/RawLinux.conf
-distro-configs/RawWin32.conf
+distro-configs/Raw.conf
etc/Makefile
extensions/Makefile
extensions/tweakconfig/Makefile
diff --git a/distro-configs/Raw.conf.in b/distro-configs/Raw.conf.in
new file mode 100644
index 0000000..e69de29
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 54e09bd..47798e2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -38,7 +38,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
HPPA, AXP, Speed, GSoC2010, Toolbars
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
-Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
+Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
# Binfilter patches: a special distro; applied only when building with binfilter
Binfilter : BFBuildBits, BFFixes, BFShrink
# optional section for ConvertTextToNumber extension
@@ -129,7 +129,7 @@ NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, Novel
NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
# go-oo.org Win32
GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, GoOoSplash
-RawWin32: RawCommon RawWin32Patches
+Raw: RawCommon RawPatches
# Mac OS X
MacOSX : MacOSXCommon, MacOSXOnly
GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
@@ -140,7 +140,6 @@ Pardus2008: PardusOnly, LinuxCommon, NotDebian
Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
-RawLinux: RawCommon RawLinuxPatches
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, FontConfigTemporaryHacks, LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, Mono, AddressBooks, QuickStarter, KDE4,\
commit e219afb01630632728168a2559fe603c82db6fca
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 17:04:17 2010 +0200
Temporary commit
diff --git a/bin/unpack b/bin/unpack
index 6d4ffd3..4e1b71d 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -121,7 +121,7 @@ cd $BUILDDIR
if test "z$BUILD_WIN32" != "z"; then
case "$DISTRO" in
- NovellWin32*|GoOoWin32*)
+ NovellWin32*|GoOoWin32|RawWin32*)
;;
*)
check_file $UNICOWS_SRC
diff --git a/configure.in b/configure.in
index ef07d38..180d9d1 100644
--- a/configure.in
+++ b/configure.in
@@ -1740,6 +1740,8 @@ distro-configs/Win32.conf
distro-configs/Solaris.conf
distro-configs/GoOoLinux.conf
distro-configs/GoOoMacOSX.conf
+distro-configs/RawLinux.conf
+distro-configs/RawWin32.conf
etc/Makefile
extensions/Makefile
extensions/tweakconfig/Makefile
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fdabcad..54e09bd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -129,6 +129,7 @@ NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, Novel
NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
# go-oo.org Win32
GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, GoOoSplash
+RawWin32: RawCommon RawWin32Patches
# Mac OS X
MacOSX : MacOSXCommon, MacOSXOnly
GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
@@ -139,6 +140,7 @@ Pardus2008: PardusOnly, LinuxCommon, NotDebian
Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
+RawLinux: RawCommon RawLinuxPatches
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, FontConfigTemporaryHacks, LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, Mono, AddressBooks, QuickStarter, KDE4,\
More information about the ooo-build-commit
mailing list