openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1569065 - in /openoffice/trunk/main/boost: boost-os2.patch makefile.mk
Date Mon, 17 Feb 2014 18:08:13 GMT
Author: ydario
Date: Mon Feb 17 18:08:12 2014
New Revision: 1569065

URL: http://svn.apache.org/r1569065
Log:
#i123817# restored OS/2 boost patches.

Added:
    openoffice/trunk/main/boost/boost-os2.patch   (contents, props changed)
      - copied, changed from r1556155, openoffice/trunk/main/boost/boost-os2.patch
Modified:
    openoffice/trunk/main/boost/makefile.mk

Copied: openoffice/trunk/main/boost/boost-os2.patch (from r1556155, openoffice/trunk/main/boost/boost-os2.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/boost/boost-os2.patch?p2=openoffice/trunk/main/boost/boost-os2.patch&p1=openoffice/trunk/main/boost/boost-os2.patch&r1=1556155&r2=1569065&rev=1569065&view=diff
==============================================================================
--- openoffice/trunk/main/boost/boost-os2.patch (original)
+++ openoffice/trunk/main/boost/boost-os2.patch Mon Feb 17 18:08:12 2014
@@ -1,5 +1,5 @@
---- misc/boost_1_48_0/boost/tr1/detail/config.hpp	2010-06-12 11:30:02.000000000 +0200
-+++ misc/build/boost_1_48_0/boost/tr1/detail/config.hpp	2013-07-04 12:49:12.000000000 +0200
+--- misc/boost_1_55_0/boost/tr1/detail/config.hpp	2010-06-12 11:30:02.000000000 +0200
++++ misc/build/boost_1_55_0/boost/tr1/detail/config.hpp	2013-07-04 12:49:12.000000000 +0200
 @@ -9,6 +9,7 @@
  #include <cstddef>
  
@@ -8,8 +8,8 @@
     || (!defined(_AIX) && defined(__IBMCPP__)  && (__IBMCPP__ >= 800))

     // Disable use of #include_next on Linux as typically we are installed in a 
     // directory that is searched *after* the std lib include path.
---- misc/boost_1_48_0/boost/tr1/detail/config_all.hpp	2011-07-25 11:28:58.000000000 +0200
-+++ misc/build/boost_1_48_0/boost/tr1/detail/config_all.hpp	2013-07-04 12:50:44.000000000
+0200
+--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp	2011-07-25 11:28:58.000000000 +0200
++++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp	2013-07-04 12:50:44.000000000
+0200
 @@ -107,7 +107,7 @@
  #    endif
  
@@ -19,4 +19,4 @@
           // Disable use of #include_next on Linux as typically we are installed in a directory
that is searched
           // *after* the std lib include path:
  #        define BOOST_TR1_DISABLE_INCLUDE_NEXT
-Binary files misc/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf
differ
+Binary files misc/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf
differ

Propchange: openoffice/trunk/main/boost/boost-os2.patch
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 17 18:08:12 2014
@@ -0,0 +1,4 @@
+/openoffice/branches/AOO400/main/boost/boost-os2.patch:1503684
+/openoffice/branches/ia2/main/boost/boost-os2.patch:1417739-1541842
+/openoffice/branches/ooxml-osba/main/boost/boost-os2.patch:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/boost/boost-os2.patch:1480411,1534063,1534098,1549902

Modified: openoffice/trunk/main/boost/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/boost/makefile.mk?rev=1569065&r1=1569064&r2=1569065&view=diff
==============================================================================
--- openoffice/trunk/main/boost/makefile.mk (original)
+++ openoffice/trunk/main/boost/makefile.mk Mon Feb 17 18:08:12 2014
@@ -47,6 +47,9 @@ all:
 TARFILE_NAME=boost_1_55_0
 TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
 PATCH_FILES= $(TARFILE_NAME).patch
+.IF "$(GUI)"=="OS2"
+PATCH_FILES+=boost-os2.patch
+.ENDIF
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=



Mime
View raw message