GNOME.org
 

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

Author: jannieuw
Date: Wed Jan  9 15:11:27 2008
New Revision: 11231
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11231&view=rev

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

	* patches/src680/layout-dialogs-config_office-scp2.diff: 
	* patches/src680/layout-dialogs-svx-sw.diff:
	* patches/src680/layout-dialogs-layout.diff: In makefiles, disable
	layout harder; check for ENABLE_LAYOUT == "TRUE" (was: != "").
	This should fix disabling on Sun (thanks Fridrich).



Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-config_office-scp2.diff
   trunk/patches/src680/layout-dialogs-layout.diff
   trunk/patches/src680/layout-dialogs-svx-sw.diff

Modified: trunk/patches/src680/layout-dialogs-config_office-scp2.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-config_office-scp2.diff	(original)
+++ trunk/patches/src680/layout-dialogs-config_office-scp2.diff	Wed Jan  9 15:11:27 2008
@@ -146,7 +146,7 @@
 +// End
 diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk
 new file mode 100644
-index 0000000..e5f294b
+index 0000000..53c2ba3
 --- /dev/null
 +++ scp2/source/layout/makefile.mk
 @@ -0,0 +1,58 @@
@@ -201,24 +201,24 @@
 +
 +PARFILES=
 +
-+.IF "$(ENABLE_LAYOUT)" != ""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +PARFILES+= layout.par
-+.ENDIF
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
 +# --- File ---------------------------------------------------------
 +
 +.INCLUDE :  target.mk
 diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
-index 271bbc6..bb82da8 100644
+index 271bbc6..4fedb2d 100644
 --- scp2/util/makefile.mk
 +++ scp2/util/makefile.mk
 @@ -172,6 +172,10 @@ SCP1FILES += \
  SCP1FILES += cairocanvas.par
  .ENDIF
  
-+.IF "$(ENABLE_LAYOUT)" != ""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +SCP1FILES += layout.par
-+.ENDIF
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
  .IF "$(BUILD_SPECIAL)"!=""
  SCP1FILES += \
@@ -227,9 +227,9 @@
  SCP2FILES += \
               vclcanvas.par
  
-+.IF "$(ENABLE_LAYOUT)" != ""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +SCP2FILES += layout.par
-+.ENDIF
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
  .IF "$(BUILD_SPECIAL)"!=""
  SCP2FILES += \

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 15:11:27 2008
@@ -606,12 +606,39 @@
 +   ./soffice.bin
 diff --git a/layout/TODO b/layout/TODO
 new file mode 100644
-index 0000000..ca102f0
+index 0000000..d68260f
 --- /dev/null
 +++ layout/TODO
-@@ -0,0 +1,140 @@
+@@ -0,0 +1,167 @@
 +-*-outline-*-
 +
++* portability
++** --enable-layout does not compile on Sun
++
++"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 412: Error: layout is not a member of layout.
++"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 412: Error: Formal argument 1 of type layout::RadioButton* in call to SvxZoomDialog::UserHdl(layout::RadioButton*) is being passed RadioButton*.
++"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 431: Error: layout is not a member of layout.
++"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 431: Error: Formal argument 1 of type layout::MetricField* in call to SvxZoomDialog::SpinHdl(layout::MetricField*) is being passed MetricField*.
++"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 441: Error: layout is not a member of layout.
++"/export/home/fstrba/devel-cvs/ooo-build/build/ooh680-m1/layout/workben/zoom.cxx", line 441: Error: Formal argument 1 of type layout::Button* in call to SvxZoomDialog::OKHdl(layout::Button*) is being passed Button*.
++6 Error(s) detected.
++
++    #412
++    ( ( layout :: layout :: RadioButton * ) pCaller ) ; } long SvxZoomDialog :: UserHdl ( layout :: RadioButton * pBtn )
++    {
++    fprintf ( ( & __iob [ 2 ] ) , "SvxZoomDialog::UserHdl\n" ) ;
++    bModified |= 1 ;
++    if ( pBtn == & aUserBtn )
++    {
++    aUserEdit . Enable ( ) ;
++    aUserEdit . GrabFocus ( ) ;
++    }
++    else
++    aUserEdit . Disable ( ) ;
++    return 0 ;
++    }
++
++
 +* code
 +** features
 +*** localization
@@ -17579,10 +17606,10 @@
 +</dialog>
 diff --git a/layout/workben/makefile.mk b/layout/workben/makefile.mk
 new file mode 100644
-index 0000000..fb2b001
+index 0000000..c061840
 --- /dev/null
 +++ layout/workben/makefile.mk
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,77 @@
 +PRJ=..
 +PRJNAME=layout
 +TARGET=test
@@ -17599,7 +17626,7 @@
 +
 +.INCLUDE : $(PRJ)$/util$/makefile.pmk
 +
-+.IF "$(ENABLE_LAYOUT)"!=""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +
 +CXXFILES=\
 +	editor.cxx \
@@ -17613,7 +17640,7 @@
 +	$(OBJ)$/wordcountdialog.obj \
 +	$(OBJ)$/zoom.obj
 +
-+.ENDIF # ENABLE_LAYOUT
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
 +APP1TARGET=$(TARGET)
 +APP1OBJS=$(OBJFILES)
@@ -17635,16 +17662,23 @@
 +
 +# FIXME: move this rule and .xml files into sw/svx trees,
 +#        install into xml directory instead of lib.
-+.IF "$(ENABLE_LAYOUT)"!=""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +ALLTAR: \
 +    $(DLLDEST)$/wordcount.xml\
-+    $(DLLDEST)$/zoom.xml
++    $(DLLDEST)$/zoom.xml\
++    $(DLLDEST)$/wordcount.nl.xml\
++    $(DLLDEST)$/zoom.nl.xml
 +
 +$(DLLDEST)$/%.xml: %.xml
 +# modes, INSTALL?
 +	-$(MKDIR) $(@:d)
 +	$(COPY) $< $@
-+.ENDIF # ENABLE_LAYOUT
++
++$(DLLDEST)$/nl/%.xml: %.nl.xml
++# modes, INSTALL?
++	-$(MKDIR) $(@:d)
++	$(COPY) $< $@
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
 +dist .PHONY :
 +	./un-test.sh zoom.cxx > ../$(PRJ)/svx/source/dialog/zoom.cxx

Modified: trunk/patches/src680/layout-dialogs-svx-sw.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-svx-sw.diff	(original)
+++ trunk/patches/src680/layout-dialogs-svx-sw.diff	Wed Jan  9 15:11:27 2008
@@ -9,16 +9,16 @@
  sx	svx\inc									nmake	-	all	sx_inc NULL
  sx	svx\prj									get		-	all	sx_prj NULL
 diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
-index 1c07576..f2cff67 100644
+index 1c07576..e0d2553 100644
 --- svx/source/dialog/makefile.mk
 +++ svx/source/dialog/makefile.mk
 @@ -52,6 +52,10 @@ CFLAGS+=-DENABLE_GTK
  CFLAGS+=-DENABLE_KDE
  .ENDIF
  
-+.IF "$(ENABLE_LAYOUT)" != ""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-+.ENDIF # ENABLE_LAYOUT
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
  # --- Files --------------------------------------------------------
  
@@ -77,32 +77,32 @@
  #endif
  
 diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
-index 31559a7..89f1091 100644
+index 31559a7..0d19f20 100644
 --- svx/util/makefile.mk
 +++ svx/util/makefile.mk
 @@ -187,6 +187,11 @@ SHL2STDLIBS+= \
               $(ADVAPI32LIB)
  .ENDIF # WNT
  
-+.IF "$(ENABLE_LAYOUT)" != ""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +LINKFLAGS+= -L../$(PRJ)/layout/$(INPATH)/lib
 +SHL2STDLIBS += -llayout$(UPD)$(DLLPOSTFIX)
-+.ENDIF # ENABLE_LAYOUT
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
  # ------------------------------------------------------------------------------
  
  # Resource files
 diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
-index 6985438..7c200ae 100644
+index 6985438..c57a47a 100644
 --- sw/source/ui/dialog/makefile.mk
 +++ sw/source/ui/dialog/makefile.mk
 @@ -46,6 +46,10 @@ LIBTARGET=no
  .INCLUDE :  settings.mk
  .INCLUDE :  $(PRJ)$/inc$/sw.mk
  
-+.IF "$(ENABLE_LAYOUT)" != ""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-+.ENDIF
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
  # --- Files --------------------------------------------------------
  
@@ -140,17 +140,17 @@
 +
  #endif
 diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
-index b673a65..8dcf28e 100644
+index b673a65..c5c18d8 100644
 --- sw/util/makefile.mk
 +++ sw/util/makefile.mk
 @@ -199,6 +199,11 @@ SHL3STDLIBS= \
              $(SALLIB) \
  			$(SOTLIB)
  
-+.IF "$(ENABLE_LAYOUT)" != ""
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +LINKFLAGS+= -L../$(PRJ)/layout/$(INPATH)/lib
 +SHL3STDLIBS += -llayout$(UPD)$(DLLPOSTFIX)
-+.ENDIF # ENABLE_LAYOUT
++.ENDIF # ENABLE_LAYOUT == TRUE
 +
  SHL3LIBS=   $(SLB)$/swui.lib
  LIB3TARGET = $(SLB)$/swui.lib
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]