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

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Jan  9 08:25:03 2008
New Revision: 11227
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11227&view=rev

Log:
2008-01-09  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/src680/layout-dialogs-layout.diff: Put GCC specific
	flags inside GCC conditional.  Should fix build with Sun compiler
	(thanks Fridrich).




Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-layout.diff

Modified: trunk/patches/src680/layout-dialogs-layout.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-layout.diff	(original)
+++ trunk/patches/src680/layout-dialogs-layout.diff	Wed Jan  9 08:25:03 2008
@@ -606,15 +606,12 @@
 +   ./soffice.bin
 diff --git a/layout/TODO b/layout/TODO
 new file mode 100644
-index 0000000..af6c453
+index 0000000..ca102f0
 --- /dev/null
 +++ layout/TODO
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,140 @@
 +-*-outline-*-
 +
-+* fixes before enabling LayoutDialogs
-+** button / icons included
-+
 +* code
 +** features
 +*** localization
@@ -674,7 +671,7 @@
 +m241': b8e24264
 +m241'': 53ddc663
 +m1: fbde8234
-+m1': d1f42c9
++m1': d1f42c99
 +
 +* porting
 +** Zoom dialog
@@ -739,7 +736,6 @@
 +
 +
 +* i18n
-+    + Find & fix dangerous uncontrolled translation of strings
 +    + forget java property files nonsense
 +	- dump old wiki pointers into layout/doc for reference
 +    + hit on transex3
@@ -15002,24 +14998,15 @@
 +.INCLUDE :	target.mk
 diff --git a/layout/util/makefile.pmk b/layout/util/makefile.pmk
 new file mode 100644
-index 0000000..39b3516
+index 0000000..c904c51
 --- /dev/null
 +++ layout/util/makefile.pmk
-@@ -0,0 +1,13 @@
-+# visibility markup ...
-+
-+CFLAGS+=-Wall -Wno-non-virtual-dtor
+@@ -0,0 +1,5 @@
 +CFLAGS+=-DENABLE_LAYOUT=1 -DTEST_LAYOUT=1
 +
-+.IF "false" == "true"
-+CDEFS += -DLAYOUT_DLLIMPLEMENTATION
-+.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGS += -fvisibility=hidden
-+.ELIF "$(COMNAME)" == "sunpro5" && "$(CCNUMVER)" >= "00050005"
-+CFLAGS += -xldscope=hidden
-+.ENDIF
++.IF "$(COMNAME)" == "gcc3"
++CFLAGS+=-Wall -Wno-non-virtual-dtor
 +.ENDIF
-\ No newline at end of file
 diff --git a/layout/workben/.gitignore b/layout/workben/.gitignore
 new file mode 100644
 index 0000000..e89ac98