ooo-build r11209 - in trunk: . patches/src680

[brosenk svn gnome org]

Author: brosenk
Date: Mon Jan  7 17:28:37 2008
New Revision: 11209
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11209&view=rev

Log:
Fix build without binfilter


Added:
   trunk/patches/src680/buildfix-x86-64-visibility-workaround-binfilter.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Mon Jan  7 17:28:37 2008
@@ -1,3 +1,10 @@
+2008-01-07  Bernhard Rosenkraenzer <bero arklinux org>
+
+	* patches/src680/buildfix-x86-64-visibility-workaround.diff,
+	  patches/src680/buildfix-x86-64-visibility-workaround-binfilter.diff,
+	  patches/src680/apply: Split buildfix-x86-64-visibility-workaround
+	  into a core and binfilter component, fixing builds without binfilter
+
 2008-01-07  Fridrich Strba  <fridrich strba bluewin ch>
 
 	* patches/src680/solenv-really-use-unsinged-char-on-ppc.diff:

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Jan  7 17:28:37 2008
@@ -972,6 +972,8 @@
 stlport-solaris-fileno.diff, fridrich
 #FIXME ooh680: gcc-4.3-binfilter.diff, i#83276, pmladek
 
+buildfix-x86-64-visibility-workaround-binfilter.diff
+
 [ VCL ]
 
 # Don't let the splash screen take over

Added: trunk/patches/src680/buildfix-x86-64-visibility-workaround-binfilter.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/buildfix-x86-64-visibility-workaround-binfilter.diff	Mon Jan  7 17:28:37 2008
@@ -0,0 +1,74 @@
+diff --git a/writerfilter/inc/odiapi/xxml/ContentHandler.hxx b/writerfilter/inc/odiapi/xxml/ContentHandler.hxx
+index b38cc2f..da847f3 100644
+--- writerfilter/inc/odiapi/xxml/ContentHandler.hxx
++++ writerfilter/inc/odiapi/xxml/ContentHandler.hxx
+@@ -40,7 +40,13 @@
+ #include <odiapi/qname/QName.hxx>
+ #include <WriterFilterDllApi.hxx>
+ #include <rtl/ustring.hxx>
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility push(default)
++#endif
+ #include <string>
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility pop
++#endif
+ 
+ 
+ namespace writerfilter { namespace xxml {
+diff --git a/writerfilter/inc/resourcemodel/OutputWithDepth.hxx b/writerfilter/inc/resourcemodel/OutputWithDepth.hxx
+index 20b564c..b06db5d 100644
+--- writerfilter/inc/resourcemodel/OutputWithDepth.hxx
++++ writerfilter/inc/resourcemodel/OutputWithDepth.hxx
+@@ -37,7 +37,14 @@
+ #define INCLUDED_OUTPUT_WITH_DEPTH
+ 
+ #include <vector>
++
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility push(default)
++#endif
+ #include <iostream>
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility pop
++#endif
+ 
+ namespace writerfilter
+ {
+diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+index 0beaa93..dceabb7 100644
+--- writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
++++ writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+@@ -36,7 +36,13 @@
+ #ifndef INCLUDED_WW8_EVENT_HANDLER_HXX
+ #define INCLUDED_WW8_EVENT_HANDLER_HXX
+ 
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility push(default)
++#endif
+ #include <string>
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility pop
++#endif
+ #include <memory>
+ #include <boost/shared_ptr.hpp>
+ 
+diff --git a/writerfilter/inc/resourcemodel/exceptions.hxx b/writerfilter/inc/resourcemodel/exceptions.hxx
+index 0bde3a2..5f8c442 100644
+--- writerfilter/inc/resourcemodel/exceptions.hxx
++++ writerfilter/inc/resourcemodel/exceptions.hxx
+@@ -36,7 +36,14 @@
+ #ifndef _DOCTOK_EXCEPTIONS_HXX
+ #define _DOCTOK_EXCEPTIONS_HXX
+ 
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility push(default)
++#endif
+ #include <string>
++#ifdef GCC_VISIBILITY_BROKEN
++#pragma GCC visibility pop
++#endif
++
+ #include <WriterFilterDllApi.hxx>
+ 
+ namespace writerfilter {

Modified: trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff
==============================================================================
--- trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff	(original)
+++ trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff	Mon Jan  7 17:28:37 2008
@@ -108,80 +108,6 @@
  .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
  
  # Compiler flags for compiling static object in multi threaded environment with graphical user interface
-diff --git a/writerfilter/inc/odiapi/xxml/ContentHandler.hxx b/writerfilter/inc/odiapi/xxml/ContentHandler.hxx
-index b38cc2f..da847f3 100644
---- writerfilter/inc/odiapi/xxml/ContentHandler.hxx
-+++ writerfilter/inc/odiapi/xxml/ContentHandler.hxx
-@@ -40,7 +40,13 @@
- #include <odiapi/qname/QName.hxx>
- #include <WriterFilterDllApi.hxx>
- #include <rtl/ustring.hxx>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
- 
- 
- namespace writerfilter { namespace xxml {
-diff --git a/writerfilter/inc/resourcemodel/OutputWithDepth.hxx b/writerfilter/inc/resourcemodel/OutputWithDepth.hxx
-index 20b564c..b06db5d 100644
---- writerfilter/inc/resourcemodel/OutputWithDepth.hxx
-+++ writerfilter/inc/resourcemodel/OutputWithDepth.hxx
-@@ -37,7 +37,14 @@
- #define INCLUDED_OUTPUT_WITH_DEPTH
- 
- #include <vector>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <iostream>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
- 
- namespace writerfilter
- {
-diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
-index 0beaa93..dceabb7 100644
---- writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
-+++ writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
-@@ -36,7 +36,13 @@
- #ifndef INCLUDED_WW8_EVENT_HANDLER_HXX
- #define INCLUDED_WW8_EVENT_HANDLER_HXX
- 
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
- #include <memory>
- #include <boost/shared_ptr.hpp>
- 
-diff --git a/writerfilter/inc/resourcemodel/exceptions.hxx b/writerfilter/inc/resourcemodel/exceptions.hxx
-index 0bde3a2..5f8c442 100644
---- writerfilter/inc/resourcemodel/exceptions.hxx
-+++ writerfilter/inc/resourcemodel/exceptions.hxx
-@@ -36,7 +36,14 @@
- #ifndef _DOCTOK_EXCEPTIONS_HXX
- #define _DOCTOK_EXCEPTIONS_HXX
- 
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <WriterFilterDllApi.hxx>
- 
- namespace writerfilter {
 diff --git a/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx b/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx
 index d33007a..77e7cc4 100644
 --- xmlhelp/source/com/sun/star/help/HelpCompiler.hxx