[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                 |    3 +
 patches/dev300/svg-import-boost.diff |   79 +++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

New commits:
commit d46f9743be641f9d070ec023db5bdff1a9e6eebe
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jul 16 08:43:51 2010 +0200

    Deliver boost headers needed for svg import
    
    * patches/dev300/apply:
    * patches/dev300/svg-import-boost.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9fcb4c9..00aff36 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2329,6 +2329,9 @@ svg-import-empty-gradient-fix.diff, n#560255, thorsten
 # eat exceptions before they reach unaware code
 svg-import-eh-fix.diff, cmc
 
+# deliver requrired boost headers when building with internal boost
+svg-import-boost.diff, fridrich
+
 [ NovellLikeOnlyWin32 ]
 novell-win32-msi-patchability.diff, tml
 
diff --git a/patches/dev300/svg-import-boost.diff b/patches/dev300/svg-import-boost.diff
new file mode 100644
index 0000000..6e665c0
--- /dev/null
+++ b/patches/dev300/svg-import-boost.diff
@@ -0,0 +1,79 @@
+diff -urEbwB boost/makefile.mk boost/makefile.mk
+--- boost/makefile.mk	2010-06-18 10:31:52.000000000 +0200
++++ boost/makefile.mk	2010-07-15 22:26:24.000000000 +0200
+@@ -80,6 +80,7 @@
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME)
++    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME)
+diff -urEbwB boost/prj/d.lst boost/prj/d.lst
+--- boost/prj/d.lst	2010-06-18 10:31:52.000000000 +0200
++++ boost/prj/d.lst	2010-07-15 22:49:57.000000000 +0200
+@@ -1,5 +1,7 @@
+ mkdir: %_DEST%\inc%_EXT%\boost
+ mkdir: %_DEST%\inc%_EXT%\boost\bind
++mkdir: %_DEST%\inc%_EXT%\boost\concept
++mkdir: %_DEST%\inc%_EXT%\boost\concept\detail
+ mkdir: %_DEST%\inc%_EXT%\boost\config
+ mkdir: %_DEST%\inc%_EXT%\boost\config\compiler
+ mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1
+@@ -110,8 +112,12 @@
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core
+@@ -128,6 +134,10 @@
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols
++mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset
+@@ -157,6 +167,8 @@
+ 
+ ..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost
+ ..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind
++..\%__SRC%\inc\boost\concept\* %_DEST%\inc%_EXT%\boost\concept
++..\%__SRC%\inc\boost\concept\detail\* %_DEST%\inc%_EXT%\boost\concept\detail
+ ..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config
+ ..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler
+ ..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1
+@@ -266,8 +278,12 @@
+ ..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic
+ ..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
+ ..\%__SRC%\inc\boost\spirit\home\classic\actor\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl
++..\%__SRC%\inc\boost\spirit\home\classic\attribute\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute
++..\%__SRC%\inc\boost\spirit\home\classic\attribute\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl
+ ..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug
+ ..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl
++..\%__SRC%\inc\boost\spirit\home\classic\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic
++..\%__SRC%\inc\boost\spirit\home\classic\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl
+ ..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta
+ ..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl
+ ..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core
+@@ -284,6 +300,10 @@
+ ..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl
+ ..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator
+ ..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl
++..\%__SRC%\inc\boost\spirit\home\classic\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix
++..\%__SRC%\inc\boost\spirit\home\classic\phoenix\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl
++..\%__SRC%\inc\boost\spirit\home\classic\symbols\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols
++..\%__SRC%\inc\boost\spirit\home\classic\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl
+ ..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility
+ ..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl
+ ..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset