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

From: jholesovsky svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11858 - in trunk: . patches/src680
Date: Mon, 10 Mar 2008 18:08:39 +0000 (GMT)
Author: jholesovsky
Date: Mon Mar 10 18:08:39 2008
New Revision: 11858
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11858&view=rev

Log:
2008-03-10  Jan Holesovsky  <kendy suse cz>

        * patches/src680/odf-converter-ignore-writerfilter.diff,
          patches/src680/apply: Hack to ignore writerfilter if odf-converter
          is present. n#348471

        * patches/src680/cws-s390port01.diff: New extract.


Added:
   trunk/patches/src680/odf-converter-ignore-writerfilter.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/cws-s390port01.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Mar 10 18:08:39 2008
@@ -309,10 +309,6 @@
 [ CWSBackports < ooh680-m2 ]
 buildfix-stl-anachronism.diff, i#83519
 
-[ CWSBackports ]
-# not for upstreaming: hack to work even on gcc's with broken -fvisibility-inlines-hidden
-buildfix-x86-64-visibility-workaround.diff
-
 [ CWSBackports < ooh680-m3 ]
 cws-thiscomponent-basctl.diff
 cws-thiscomponent-sfx2.diff
@@ -320,6 +316,8 @@
 [ CWSBackports ]
 cws-ia64port01.diff, i#84999
 cws-s390port01.diff, i#86425
+# not for upstreaming: hack to work even on gcc's with broken -fvisibility-inlines-hidden
+#buildfix-x86-64-visibility-workaround.diff
 
 # fix build with neon 0.28
 cws-cmcfixes42-ucb.diff, i#86123
@@ -1585,6 +1583,8 @@
 # Pre- and postprocessing capabilities for loading and saving.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
 sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
+# hack to ignore writerfilter if odf-converter is present
+odf-converter-ignore-writerfilter.diff, n#348471, jholesov
 
 [ Lockdown ]
 # Disable UI [toolbars, menus] customization

Modified: trunk/patches/src680/cws-s390port01.diff
==============================================================================
--- trunk/patches/src680/cws-s390port01.diff	(original)
+++ trunk/patches/src680/cws-s390port01.diff	Mon Mar 10 18:08:39 2008
@@ -1,24 +1,9 @@
-cvs diff: Diffing automation
-cvs diff: Diffing automation/inc
-cvs diff: Diffing automation/inc/automation
-cvs diff: Diffing automation/inc/pch
-cvs diff: Diffing automation/packimages
-cvs diff: Diffing automation/prj
-cvs diff: Diffing automation/source
-cvs diff: Diffing automation/source/app
-cvs diff: Diffing automation/source/communi
-cvs diff: Diffing automation/source/inc
-cvs diff: Diffing automation/source/miniapp
-cvs diff: Diffing automation/source/mozillaserver
-cvs diff: Diffing automation/source/server
-cvs diff: Diffing automation/source/simplecm
-cvs diff: Diffing automation/source/testtool
 Index: automation/source/testtool/objtest.cxx
 ===================================================================
 RCS file: /cvs/util/automation/source/testtool/objtest.cxx,v
 retrieving revision 1.37
 retrieving revision 1.37.2.1
-diff -u -u -p -b -w -B -r1.37 -r1.37.2.1
+diff -u -p -u -p -b -w -B -r1.37 -r1.37.2.1
 --- automation/source/testtool/objtest.cxx	27 Feb 2008 09:44:28 -0000	1.37
 +++ automation/source/testtool/objtest.cxx	1 Mar 2008 15:16:43 -0000	1.37.2.1
 @@ -544,6 +544,8 @@ void TestToolObj::LoadIniFile()				// La
@@ -30,29 +15,12 @@
  #else
  #error ("unknown platform. please request an ID for your platform on qa/dev")
  #endif
-cvs diff: Diffing automation/util
-cvs diff: Diffing automation/util/defs
-cvs diff: Diffing solenv
-cvs diff: Diffing solenv/bin
-cvs diff: Diffing solenv/bin/modules
-cvs diff: Diffing solenv/bin/modules/PCVSLib
-cvs diff: Diffing solenv/bin/modules/PCVSLib/lib
-cvs diff: Diffing solenv/bin/modules/PCVSLib/lib/PCVSLib
-cvs diff: Diffing solenv/bin/modules/PCVSLib/samples
-cvs diff: Diffing solenv/bin/modules/PCVSLib/t
-cvs diff: Diffing solenv/bin/modules/installer
-cvs diff: Diffing solenv/bin/modules/installer/windows
-cvs diff: Diffing solenv/bin/modules/packager
-cvs diff: Diffing solenv/bin/modules/par2script
-cvs diff: Diffing solenv/bin/modules/pre2par
-cvs diff: Diffing solenv/config
-cvs diff: Diffing solenv/inc
 Index: solenv/inc/unxlngs3904.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/unxlngs3904.mk,v
 retrieving revision 1.18
 retrieving revision 1.18.124.1
-diff -u -u -p -b -w -B -r1.18 -r1.18.124.1
+diff -u -p -u -p -b -w -B -r1.18 -r1.18.124.1
 --- solenv/inc/unxlngs3904.mk	12 Dec 2007 13:21:06 -0000	1.18
 +++ solenv/inc/unxlngs3904.mk	29 Feb 2008 14:49:56 -0000	1.18.124.1
 @@ -33,11 +33,11 @@
@@ -234,48 +202,12 @@
  
  #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
  
-cvs diff: Diffing solenv/inc/startup
-cvs diff: Diffing solenv/inc/startup/AIX
-cvs diff: Diffing solenv/inc/startup/FREEBSD
-cvs diff: Diffing solenv/inc/startup/HPUX
-cvs diff: Diffing solenv/inc/startup/IRIX
-cvs diff: Diffing solenv/inc/startup/LINUX
-cvs diff: Diffing solenv/inc/startup/MACOSX
-cvs diff: Diffing solenv/inc/startup/NETBSD
-cvs diff: Diffing solenv/inc/startup/SOLARIS
-cvs diff: Diffing solenv/inc/startup/UNIX
-cvs diff: Diffing solenv/inc/startup/wnt
-cvs diff: Diffing solenv/prj
-cvs diff: Diffing solenv/src
-cvs diff: Diffing solenv/unxmacxp
-cvs diff: Diffing solenv/unxmacxp/inc
-cvs diff: Diffing bridges
-cvs diff: Diffing bridges/inc
-cvs diff: Diffing bridges/inc/bridges
-cvs diff: Diffing bridges/inc/bridges/cpp_uno
-cvs diff: Diffing bridges/inc/bridges/cpp_uno/shared
-cvs diff: Diffing bridges/inc/bridges/remote
-cvs diff: Diffing bridges/inc/pch
-cvs diff: Diffing bridges/prj
-cvs diff: Diffing bridges/source
-cvs diff: Diffing bridges/source/cpp_uno
-cvs diff: Diffing bridges/source/cpp_uno/cc50_solaris_intel
-cvs diff: Diffing bridges/source/cpp_uno/cc50_solaris_sparc
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_freebsd_intel
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_freebsd_x86-64
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_arm
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_ia64
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_intel
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_mips
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_powerpc
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_powerpc64
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_s390
 Index: bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
 ===================================================================
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx,v
 retrieving revision 1.4
 retrieving revision 1.4.92.2
-diff -u -u -p -b -w -B -r1.4 -r1.4.92.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.92.2
 --- bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	16 Sep 2006 15:48:49 -0000	1.4
 +++ bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	4 Mar 2008 10:14:37 -0000	1.4.92.2
 @@ -36,34 +36,26 @@
@@ -844,7 +776,7 @@
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx,v
 retrieving revision 1.5
 retrieving revision 1.5.92.3
-diff -u -u -p -b -w -B -r1.5 -r1.5.92.3
+diff -u -p -u -p -b -w -B -r1.5 -r1.5.92.3
 --- bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	16 Sep 2006 15:49:02 -0000	1.5
 +++ bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	4 Mar 2008 19:49:29 -0000	1.5.92.3
 @@ -37,6 +37,7 @@
@@ -875,7 +807,7 @@
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk,v
 retrieving revision 1.5
 retrieving revision 1.5.24.1
-diff -u -u -p -b -w -B -r1.5 -r1.5.24.1
+diff -u -p -u -p -b -w -B -r1.5 -r1.5.24.1
 --- bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk	15 Oct 2007 11:57:04 -0000	1.5
 +++ bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk	29 Feb 2008 14:56:00 -0000	1.5.24.1
 @@ -52,6 +52,10 @@ ENABLE_EXCEPTIONS=TRUE
@@ -907,7 +839,7 @@
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx,v
 retrieving revision 1.3
 retrieving revision 1.3.162.1
-diff -u -u -p -b -w -B -r1.3 -r1.3.162.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.162.1
 --- bridges/source/cpp_uno/gcc3_linux_s390/share.hxx	7 Sep 2005 22:24:36 -0000	1.3
 +++ bridges/source/cpp_uno/gcc3_linux_s390/share.hxx	29 Feb 2008 14:56:00 -0000	1.3.162.1
 @@ -33,6 +33,8 @@
@@ -939,7 +871,7 @@
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx,v
 retrieving revision 1.4
 retrieving revision 1.4.92.1
-diff -u -u -p -b -w -B -r1.4 -r1.4.92.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.92.1
 --- bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx	16 Sep 2006 15:49:15 -0000	1.4
 +++ bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx	29 Feb 2008 14:56:00 -0000	1.4.92.1
 @@ -37,23 +37,26 @@
@@ -1209,53 +1141,109 @@
 -
 +} } }
 +/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_sparc
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_linux_x86-64
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_macosx_intel
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_macosx_powerpc
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_netbsd_intel
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_os2_intel
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_os2_intel/defs
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_solaris_intel
-cvs diff: Diffing bridges/source/cpp_uno/gcc3_solaris_sparc
-cvs diff: Diffing bridges/source/cpp_uno/mingw_intel
-cvs diff: Diffing bridges/source/cpp_uno/msvc_win32_intel
-cvs diff: Diffing bridges/source/cpp_uno/shared
-cvs diff: Diffing bridges/source/jni_uno
-cvs diff: Diffing bridges/source/jni_uno/java
-cvs diff: Diffing bridges/source/jni_uno/java/com
-cvs diff: Diffing bridges/source/jni_uno/java/com/sun
-cvs diff: Diffing bridges/source/jni_uno/java/com/sun/star
-cvs diff: Diffing bridges/source/jni_uno/java/com/sun/star/bridges
-cvs diff: Diffing bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno
-cvs diff: Diffing bridges/source/remote
-cvs diff: Diffing bridges/source/remote/context
-cvs diff: Diffing bridges/source/remote/idl
-cvs diff: Diffing bridges/source/remote/static
-cvs diff: Diffing bridges/source/remote/urp
-cvs diff: Diffing bridges/test
-cvs diff: Diffing bridges/test/com
-cvs diff: Diffing bridges/test/com/sun
-cvs diff: Diffing bridges/test/com/sun/star
-cvs diff: Diffing bridges/test/com/sun/star/lib
-cvs diff: Diffing bridges/test/com/sun/star/lib/uno
-cvs diff: Diffing bridges/test/com/sun/star/lib/uno/bridges
-cvs diff: Diffing bridges/test/com/sun/star/lib/uno/bridges/java_remote
-cvs diff: Diffing bridges/test/inter_libs_exc
-cvs diff: Diffing bridges/test/java_uno
-cvs diff: Diffing bridges/test/java_uno/acquire
-cvs diff: Diffing bridges/test/java_uno/any
-cvs diff: Diffing bridges/test/java_uno/equals
-cvs diff: Diffing bridges/test/java_uno/nativethreadpool
-cvs diff: Diffing bridges/test/performance
-cvs diff: Diffing bridges/unotypes
-cvs diff: Diffing config_office
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.249
+retrieving revision 1.249.10.1
+diff -u -p -u -p -b -w -B -r1.249 -r1.249.10.1
+--- config_office/configure.in	19 Feb 2008 12:37:37 -0000	1.249
++++ config_office/configure.in	6 Mar 2008 12:37:36 -0000	1.249.10.1
+@@ -1318,20 +1318,6 @@ if test \( "$_os" != "WINNT" -o "$WITH_M
+ fi 
+ AC_SUBST(GCCVER)
+ 
+-if test "$GCC" = "yes"; then
+-   AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+-   save_CFLAGS=$CFLAGS
+-   CFLAGS="$CFLAGS -fvisibility=hidden"
+-   AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
+-   CFLAGS=$save_CFLAGS
+-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+-      AC_MSG_RESULT([yes])
+-   else
+-      AC_MSG_RESULT([no])
+-   fi
+-fi
+-AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+-
+ dnl ===================================================================
+ dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
+ dnl ===================================================================
+@@ -2270,6 +2256,22 @@ AC_SUBST(STLPORT_VER)
+ AC_SUBST(USE_SYSTEM_STL)
+ 
+ dnl ===================================================================
++dnl visibility feature
++dnl ===================================================================
++if test "$GCC" = "yes"; then
++   AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
++   save_CFLAGS=$CFLAGS
++   CFLAGS="$CFLAGS -fvisibility=hidden"
++   AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
++   CFLAGS=$save_CFLAGS
++   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
++      AC_MSG_RESULT([yes])
++   else
++      AC_MSG_RESULT([no])
++   fi
++fi
++
++dnl ===================================================================
+ dnl system stl sanity tests
+ dnl ===================================================================
+ if test "$USE_SYSTEM_STL" = "YES"; then
+@@ -2292,9 +2294,13 @@ using namespace __gnu_cxx;
+       AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
+       AC_MSG_RESULT([$stlvisok])
+       if test "$stlvisok" = "no"; then
+-         AC_MSG_ERROR([Your gcc STL headers are not visibility safe. Try with --with-stlport])
++         AC_MSG_WARN([Your gcc STL headers are not visibility safe. Disabling visibility])
++         echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn
++         unset HAVE_GCC_VISIBILITY_FEATURE
++      fi
+       fi
+ 
++   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+       sharedlink_ldflags_save=$LDFLAGS
+       LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
+ 
+@@ -2302,20 +2308,24 @@ using namespace __gnu_cxx;
+       AC_TRY_LINK([#include <sstream>
+ using namespace std;
+ ],[istringstream strm( "test" ); return 0;],
+-     gccvisok=yes, gccvisok=no)
+-
+-      LDFLAGS=$sharedlink_ldflags_save
+-
++      $EGREP -q  unresolvable conftest.err;
++      if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi, 
++      gccvisok=no)
+       AC_MSG_RESULT([$gccvisok])
+       if test "$gccvisok" = "no"; then
+-         AC_MSG_ERROR([Your gcc is not -fvisibility-inlines-hidden safe. Try with --with-stlport])
++         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility])
++         echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
++         unset HAVE_GCC_VISIBILITY_FEATURE
+       fi
+ 
++      LDFLAGS=$sharedlink_ldflags_save
+    fi
+ 
+    AC_LANG_POP([C++])
+ fi
+ 
++AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
++
+ dnl ===================================================================
+ dnl allocator
+ dnl ===================================================================
 Index: config_office/set_soenv.in
 ===================================================================
 RCS file: /cvs/tools/config_office/set_soenv.in,v
 retrieving revision 1.174
 retrieving revision 1.174.4.1
-diff -u -u -p -b -w -B -r1.174 -r1.174.4.1
+diff -u -p -u -p -b -w -B -r1.174 -r1.174.4.1
 --- config_office/set_soenv.in	27 Feb 2008 10:03:23 -0000	1.174
 +++ config_office/set_soenv.in	29 Feb 2008 14:47:00 -0000	1.174.4.1
 @@ -374,7 +374,7 @@ elsif ( $platform =~ m/freebsd/ ) 
@@ -1339,22 +1327,12 @@
      {  $SOLARINC  .= $I.$XINC;
      }
      elsif ($platform =~ m/osf1/)
-cvs diff: Diffing config_office/guw
-cvs diff: Diffing bean
-cvs diff: Diffing bean/com
-cvs diff: Diffing bean/com/sun
-cvs diff: Diffing bean/com/sun/star
-cvs diff: Diffing bean/com/sun/star/beans
-cvs diff: Diffing bean/com/sun/star/comp
-cvs diff: Diffing bean/com/sun/star/comp/beans
-cvs diff: Diffing bean/native
-cvs diff: Diffing bean/native/unix
 Index: bean/native/unix/makefile.mk
 ===================================================================
 RCS file: /cvs/api/bean/native/unix/makefile.mk,v
 retrieving revision 1.9
 retrieving revision 1.9.10.1
-diff -u -u -p -b -w -B -r1.9 -r1.9.10.1
+diff -u -p -u -p -b -w -B -r1.9 -r1.9.10.1
 --- bean/native/unix/makefile.mk	26 Jun 2007 17:45:46 -0000	1.9
 +++ bean/native/unix/makefile.mk	29 Feb 2008 23:19:13 -0000	1.9.10.1
 @@ -30,9 +30,6 @@ SHL1LIBS=	$(SLB)$/$(TARGET).lib
@@ -1367,11 +1345,3 @@
  SHL1STDLIBS+=-lstdc++
  .ENDIF
  
-cvs diff: Diffing bean/native/win32
-cvs diff: Diffing bean/prj
-cvs diff: Diffing bean/qa
-cvs diff: Diffing bean/qa/complex
-cvs diff: Diffing bean/test
-cvs diff: Diffing bean/test/applet
-cvs diff: Diffing bean/test/applet/oooapplet
-cvs diff: Diffing bean/util

Added: trunk/patches/src680/odf-converter-ignore-writerfilter.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/odf-converter-ignore-writerfilter.diff	Mon Mar 10 18:08:39 2008
@@ -0,0 +1,35 @@
+diff --git writerfilter/source/filter/WriterFilterDetection.cxx writerfilter/source/filter/WriterFilterDetection.cxx
+index e9030ac..9f910ae 100644
+--- writerfilter/source/filter/WriterFilterDetection.cxx
++++ writerfilter/source/filter/WriterFilterDetection.cxx
+@@ -58,6 +58,10 @@
+ #ifndef _UNOTOOLS_STREAMHELPER_HXX_
+ #include <unotools/ucbstreamhelper.hxx>
+ #endif
++
++#include <unotools/bootstrap.hxx>
++#include <osl/file.hxx>
++
+ using namespace ::rtl;
+ using namespace ::cppu;
+ using namespace ::com::sun::star;
+@@ -91,6 +95,19 @@ OUString WriterFilterDetection_getImplementationName () throw (uno::RuntimeExcep
+ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& rDescriptor )
+    throw( uno::RuntimeException )
+ {
++    // hack for odf-converter - we ignore the built-in oox import filter if
++    // OdfConverter is present
++    rtl::OUString aPath;
++    ::utl::Bootstrap::PathStatus aBaseLocateResult = ::utl::Bootstrap::locateBaseInstallation( aPath );
++    if ( aBaseLocateResult == ::utl::Bootstrap::PATH_EXISTS )
++    {
++        aPath += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/OdfConverter" ) );
++
++        osl::DirectoryItem aDirItem;
++        if ( osl::DirectoryItem::get( aPath, aDirItem ) == osl::FileBase::E_None )
++            return rtl::OUString();
++    }
++
+     OUString sTypeName;
+     bool bWord = false;
+     sal_Int32 nPropertyCount = rDescriptor.getLength();
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]