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

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Wed Jan 30 17:20:44 2008
New Revision: 11468
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11468&view=rev

Log:
2008-01-30  Jan Holesovsky  <kendy suse cz>

        * patches/src680/buildfix-x86-64-visibility-workaround.diff: Disable
          -fvisibility-inlines-hidden for good if it's broken, not just for
          the affected headers.

        * patches/src680/webdav-locking.diff: Fix the 'too many error dialogs
          pops up problem', maybe will break WebDAV locking - have to test.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff
   trunk/patches/src680/webdav-locking.diff

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	Wed Jan 30 17:20:44 2008
@@ -39,98 +39,16 @@
  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
  ToFile( "HAVE_LD_BDIRECT",   "@HAVE_LD_BDIRECT@","e" );
  ToFile( "CXX",               $CXX,               "e" );
-diff --git a/hwpfilter/source/hwpeq.cpp b/hwpfilter/source/hwpeq.cpp
-index 600a443..c5824a7 100644
---- hwpfilter/source/hwpeq.cpp
-+++ hwpfilter/source/hwpeq.cpp
-@@ -42,7 +42,13 @@
- 
- // DVO: always use standard headers:
- #include <istream>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <sstream>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
- using namespace std;
- 
- #include "mzstring.h"
-diff --git a/scsolver/source/inc/numeric/matrix.hxx b/scsolver/source/inc/numeric/matrix.hxx
-index bd10dd6..023e48a 100644
---- scsolver/source/inc/numeric/matrix.hxx
-+++ scsolver/source/inc/numeric/matrix.hxx
-@@ -29,7 +29,13 @@
- #ifndef _SCSOLVER_NUMERIC_MATRIX_HXX_
- #define _SCSOLVER_NUMERIC_MATRIX_HXX_
- 
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <boost/numeric/ublas/matrix.hpp>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
- #include <boost/numeric/ublas/matrix_proxy.hpp>
- 
- #include <vector>
-diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
-index 0a86ffa..48eda4d 100644
---- shell/inc/internal/xml_parser.hxx
-+++ shell/inc/internal/xml_parser.hxx
-@@ -41,7 +41,14 @@
- #else
- #include <external/expat/xmlparse.h>
- #endif
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <stdexcept>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
- 
- //-----------------------------------------------------
- class xml_parser_exception : public std::runtime_error  
 diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk
 index 4afa0b6..91d9bf1 100644
 --- solenv/inc/unxlngx6.mk
 +++ solenv/inc/unxlngx6.mk
-@@ -103,6 +103,9 @@ CFLAGSCXX+= -fno-use-cxa-atexit
+@@ -101,7 +101,7 @@ CFLAGSCXX+= -fno-use-cxa-atexit
+ CFLAGSCXX+= -Wno-ctor-dtor-privacy
+ CFLAGSCXX+= -fno-use-cxa-atexit
  PICSWITCH:=-fpic
- .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE"
  CFLAGSCXX += -fvisibility-inlines-hidden
-+.IF "$(HAVE_GCC_VISIBILITY_BROKEN)" == "TRUE"
-+CFLAGSCXX += -DGCC_VISIBILITY_BROKEN
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_BROKEN)" == "TRUE"
  .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
  
- # Compiler flags for compiling static object in multi threaded environment with graphical user interface
-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
-+++ xmlhelp/source/com/sun/star/help/HelpCompiler.hxx
-@@ -36,13 +36,19 @@
- #ifndef HELPCOMPILER_HXX
- #define HELPCOMPILER_HXX
- 
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
-+#include <fstream>
-+#include <sstream>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
- #include <hash_map>
- #include <vector>
- #include <list>
--#include <fstream>
- #include <iostream>
--#include <sstream>
- #include <algorithm>
- #include <ctype.h>
- #ifdef SYSTEM_DB

Modified: trunk/patches/src680/webdav-locking.diff
==============================================================================
--- trunk/patches/src680/webdav-locking.diff	(original)
+++ trunk/patches/src680/webdav-locking.diff	Wed Jan 30 17:20:44 2008
@@ -1,21 +1,21 @@
-diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
-index 078309b..5e5d476 100644
---- comphelper/source/misc/mediadescriptor.cxx
-+++ comphelper/source/misc/mediadescriptor.cxx
-@@ -754,9 +754,12 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL(const ::rtl::OUString& sURL)
-     throw(::com::sun::star::uno::RuntimeException)
- {
-     // prepare the environment
-+	css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
- 	css::uno::Reference< css::task::XInteractionHandler > xOrgInteraction = getUnpackedValueOrDefault(
- 		MediaDescriptor::PROP_INTERACTIONHANDLER(),
--		css::uno::Reference< css::task::XInteractionHandler >());
-+		css::uno::Reference< css::task::XInteractionHandler > (
-+			xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), css::uno::UNO_QUERY )
-+		);
- 
-     StillReadWriteInteraction* pInteraction = new StillReadWriteInteraction(xOrgInteraction);
- 	css::uno::Reference< css::task::XInteractionHandler > xInteraction(static_cast< css::task::XInteractionHandler* >(pInteraction), css::uno::UNO_QUERY);
+#diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
+#index 078309b..5e5d476 100644
+#--- comphelper/source/misc/mediadescriptor.cxx
+#+++ comphelper/source/misc/mediadescriptor.cxx
+#@@ -754,9 +754,12 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL(const ::rtl::OUString& sURL)
+#     throw(::com::sun::star::uno::RuntimeException)
+# {
+#     // prepare the environment
+#+	css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+# 	css::uno::Reference< css::task::XInteractionHandler > xOrgInteraction = getUnpackedValueOrDefault(
+# 		MediaDescriptor::PROP_INTERACTIONHANDLER(),
+#-		css::uno::Reference< css::task::XInteractionHandler >());
+#+		css::uno::Reference< css::task::XInteractionHandler > (
+#+			xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), css::uno::UNO_QUERY )
+#+		);
+# 
+#     StillReadWriteInteraction* pInteraction = new StillReadWriteInteraction(xOrgInteraction);
+# 	css::uno::Reference< css::task::XInteractionHandler > xInteraction(static_cast< css::task::XInteractionHandler* >(pInteraction), css::uno::UNO_QUERY);
 diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
 index 069faa7..7efa34e 100644
 --- ucb/source/ucp/webdav/DAVRequestEnvironment.hxx