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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Sep 11 09:48:12 2008
New Revision: 13876
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13876&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/jurt-jnilib-deliver.diff:
    * patches/dev300/solenv-silent-mac-build.diff:
    Two build-related fixes that only affect the mac platform (but are
    generally applicable)

    * patches/dev300/buildfix-boost-gcc33.diff: removed, gcc33 is dead
    on mac & patch does not apply anymore anyway.



Added:
   trunk/patches/dev300/jurt-jnilib-deliver.diff
   trunk/patches/dev300/solenv-silent-mac-build.diff
Removed:
   trunk/patches/dev300/buildfix-boost-gcc33.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Sep 11 09:48:12 2008
@@ -1984,10 +1984,6 @@
 
 # fix lpsolve build for OSX
 macosx-lpsolve-makefile.diff
-# fixes build with gcc-3.3; required for MacOSX build
-# it is usable only until anyone uses the disabled code => MacOSXOnly
-# we will move to gcc-4.x, so it does not make sense to push it upstream
-buildfix-boost-gcc33.diff
 
 [ PardusOnly ]
 pardus-default-ExternalMailer.diff
@@ -2618,6 +2614,8 @@
 sw-filter-import-TOX.diff ,n#40425, Amelia Wang
 gnome-fpicker-transient-win.diff, i#92878, cmc
 gnome-fpicker-main-thread.diff, i#93366, cmc
+jurt-jnilib-deliver.diff, i#93516, thorsten
+solenv-silent-mac-build.diff, thorsten
 
 [ ImpressFontSize ]
 [ Fixes <= dev300-m30 <= ooo300-m3 ]

Added: trunk/patches/dev300/jurt-jnilib-deliver.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/jurt-jnilib-deliver.diff	Thu Sep 11 09:48:12 2008
@@ -0,0 +1,10 @@
+--- jurt/prj/d.lst	24 Oct 2006 13:41:43 -0000	1.9
++++ jurt/prj/d.lst	5 Sep 2008 11:13:51 -0000
+@@ -1,6 +1,6 @@
+ ..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar
+ ..\%__SRC%\bin\jpipe*.dll %_DEST%\bin%_EXT%\jpipe*.dll
+ ..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
+-..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
++..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib%_EXT%\libjpipe.jnilib
+ 
+ ..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip

Added: trunk/patches/dev300/solenv-silent-mac-build.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/solenv-silent-mac-build.diff	Thu Sep 11 09:48:12 2008
@@ -0,0 +1,22 @@
+--- solenv/inc/rules.mk
++++ solenv/inc/rules.mk
+@@ -459,15 +459,17 @@ not_existing$/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
+ 
+ # Objective-C++ files
+ $(OBJ)$/%.obj : %.mm
++.IF "$(QUIET_BUILD)"==""
+ 	@echo ------------------------------
++.ENDIF
+ 	@echo Making: $@
+ .IF "$(OS)"=="MACOSX"
+ .IF "$(TEST)"!=""
+ 	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
+-	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
++	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
++	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+ .ENDIF
+ .IF "$(nodep)"==""
+ 	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)