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

Kohei Yoshida kohei at kemper.freedesktop.org
Fri Apr 16 20:05:40 PDT 2010


 patches/dev300/apply                            |    1 
 patches/dev300/boost-deliver-ptr-container.diff |   55 ++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

New commits:
commit 9a24a178272a076dc401529b808482d8baeb234b
Author: U-lenovo-quad\Kohei <Kohei at lenovo-quad.(none)>
Date:   Fri Apr 16 23:03:35 2010 -0400

    Deliver extra boost headers to enable ptr_container on Windows.
    
    * patches/dev300/apply:
    * patches/dev300/boost-deliver-ptr-container.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a89fd3d..0e7f891 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3524,6 +3524,7 @@ svx-msdff-import-connector-style-fix.diff, n#559393, i#108086, kohei
 [ Fixes ]
 # deliver extra headers for svg import filter.
 boost-1.39-extra-header.diff, kohei
+boost-deliver-ptr-container.diff, kohei
 
 [ Win32Only ]
 win32-boost-crack.diff
diff --git a/patches/dev300/boost-deliver-ptr-container.diff b/patches/dev300/boost-deliver-ptr-container.diff
new file mode 100755
index 0000000..b904186
--- /dev/null
+++ b/patches/dev300/boost-deliver-ptr-container.diff
@@ -0,0 +1,55 @@
+diff --git boost/makefile.mk boost/makefile.mk
+index e58e893..85b81fd 100644
+--- boost/makefile.mk
++++ boost/makefile.mk
+@@ -94,6 +94,8 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/preprocessor $(INCCOM)$/$(PRJNAME)
++    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/ptr_container $(INCCOM)$/$(PRJNAME)
++    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/range $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME)
+     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME)
+diff --git boost/prj/d.lst boost/prj/d.lst
+index fbbb575..e83633d 100644
+--- boost/prj/d.lst
++++ boost/prj/d.lst
+@@ -83,6 +83,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
+ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
+ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
+ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
++mkdir: %_DEST%\inc%_EXT%\boost\ptr_container
++mkdir: %_DEST%\inc%_EXT%\boost\ptr_container\detail
++mkdir: %_DEST%\inc%_EXT%\boost\range
++mkdir: %_DEST%\inc%_EXT%\boost\range\detail
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
+ mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute
+@@ -154,6 +158,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail
+ mkdir: %_DEST%\inc%_EXT%\boost\type_traits
+ mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail
+ mkdir: %_DEST%\inc%_EXT%\boost\utility
++mkdir: %_DEST%\inc%_EXT%\boost\utility\detail
+ mkdir: %_DEST%\inc%_EXT%\boost\variant
+ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
+ 
+@@ -239,6 +244,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
+ ..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
+ ..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
+ ..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
++..\%__SRC%\inc\boost\ptr_container\* %_DEST%\inc%_EXT%\boost\ptr_container
++..\%__SRC%\inc\boost\ptr_container\detail\* %_DEST%\inc%_EXT%\boost\ptr_container\detail
++..\%__SRC%\inc\boost\range\* %_DEST%\inc%_EXT%\boost\range
++..\%__SRC%\inc\boost\range\detail\* %_DEST%\inc%_EXT%\boost\range\detail
+ ..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit
+ ..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor
+ ..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute
+@@ -304,6 +313,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
+ ..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits
+ ..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail
+ ..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
++..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
+ ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
+ ..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
+ ..\%__SRC%\misc\build\boost_1_39_0\boost\concept\* %_DEST%\inc%_EXT%\boost\concept


More information about the ooo-build-commit mailing list