ooo-build r12627 - in trunk: . patches/dev300



Author: kyoshida
Date: Thu May 22 05:52:12 2008
New Revision: 12627
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12627&view=rev

Log:
2008-05-22  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/buildfix-bridges-strdup-header.diff: fixed a build 
	breakage for gcc 4.3 (i#89762).
	* patches/dev300/apply: apply this patch.
	
	* patches/dev300/layout-tab-toolkit.diff: removed a duplicate case value
	block that caused a build failure.


Added:
   trunk/patches/dev300/buildfix-bridges-strdup-header.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/layout-tab-toolkit.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu May 22 05:52:12 2008
@@ -1013,6 +1013,9 @@
 [ BuildBits == dev300-m12 ]
 fixup-system-hyph.diff, i#89468
 
+# gcc 4.3 requires #include <string.h> for strdup.
+buildfix-bridges-strdup-header.diff, i#89762, kohei
+
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 

Added: trunk/patches/dev300/buildfix-bridges-strdup-header.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-bridges-strdup-header.diff	Thu May 22 05:52:12 2008
@@ -0,0 +1,12 @@
+diff --git bridges/source/cpp_uno/gcc3_linux_intel/except.cxx bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+index 163bf41..2eab1b5 100644
+--- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
++++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
++#include <string.h>
+ #include <hash_map>
+ 
+ #include <rtl/strbuf.hxx>

Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff	Thu May 22 05:52:12 2008
@@ -478,19 +478,6 @@
 +#endif /* LAYOUT_AWT_VCLXTABPAGE_HXX */
 diff --git a/source/awt/vclxwindow.cxx b/source/awt/vclxwindow.cxx
 index 44cb49f..47d2af3 100644
---- toolkit/source/awt/vclxwindow.cxx
-+++ toolkit/source/awt/vclxwindow.cxx
-@@ -2107,6 +2107,10 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
- 				aProp <<= (sal_Bool) GetWindow()->IsVisible();
- 			    break;
- 
-+			case BASEPROPERTY_VISIBLE:
-+				aProp <<= (sal_Bool) GetWindow()->IsVisible();
-+			    break;
-+
- 			case BASEPROPERTY_TEXT:
- 			case BASEPROPERTY_LABEL:
- 			case BASEPROPERTY_TITLE:
 diff --git a/source/layout/container.cxx b/source/layout/container.cxx
 index 22e3b08..b34bfe5 100644
 --- toolkit/source/layout/container.cxx



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]