xxx ++1

component/onlyoffice-core/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../pole/buildout.cfg
   ../cryptopp/buildout.cfg
   ../v8/buildout.cfg
+  ../gcc/buildout.cfg
 # for 3dparty dependencies
   ../p7zip/buildout.cfg
 # for qmake
@@ -12,16 +13,20 @@ parts +=
   onlyoffice-core
 
 [onlyoffice-core]
-dummy = ${pole:location}:${icu4c-55.1:location}:${cryptopp-5.6:location}:${v8-4.10:location}
+dummy = ${pole:location}:${icu4c-55.1:location}:${cryptopp-5.6:location}:${v8-4.10:location}:${gcc:location}
 # XXX please, put the third party component in slapos !
 #     boost, cef, icu, v8 and pole (is there others ??? XXX TRISTAN XXX)
 recipe = slapos.recipe.cmmi
-url = https://github.com/ONLYOFFICE/core/archive/win-v4.3.0.61.tar.gz
-md5sum = 7e735af4f964f6adf82ec9265e84ac8c
+# This url contains the hash provided by the DocumentServer core submodule hash.
+# https://github.com/ONLYOFFICE/DocumentServer/tree/ONLYOFFICE-DocumentServer-4.2.9
+url = https://github.com/ONLYOFFICE/core/archive/0bd10c28acd79a1e25a8b3fb94689819642e5eb5.tar.gz
+md5sum = f7e77ff35f12e9ab485b60b7889e5d53
+#url = https://github.com/ONLYOFFICE/core/archive/win-v4.3.0.61.tar.gz
+#md5sum = 7e735af4f964f6adf82ec9265e84ac8c
 patch-options = -p0
 patches =
-  ${:_profile_base_location_}/rewrite-scripts.patch#2b0eeb57f1f70ee2d3344b4ec165b41d
-  ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
+  ${:_profile_base_location_}/rewrite-scripts.patch#3c82738b72fe2765d7da8c98a872f15d
+#  ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
 #  ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
 # error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/
 #  ${:_profile_base_location_}/to_wstring-is-not-a-member-of-std3.patch#bcc755d9629613ff702b1ad0129b1587
@@ -39,26 +44,27 @@ patches =
 # }
 
 configure-command =
-#  echo 'QMAKESPEC = ${qmake:location}/mkspecs/linux-g++' >> Comment/3dParty/cryptopp/project/cryptopp.pro
-  sed 's:^V8_ABSOLUTE_PATH=SED_IT$:V8_ABSOLUTE_PATH=${v8-4.10:location}:' -i Common/3dParty/v8/fetch.sh || exit 1
+  sed 's:^CRYPTOPP_QMAKE_SPEC=SED_IT$:CRYPTOPP_QMAKE_SPEC="${qt5-qmake:location}/qtbase/mkspecs/linux-g++":' -i Common/3dParty/cryptopp/build.sh || exit 1
+#  sed 's:^V8_ABSOLUTE_PATH=SED_IT$:V8_ABSOLUTE_PATH=${v8-4.10:location}:' -i Common/3dParty/v8/fetch.sh || exit 1
   sed 's,\(include($$PWD/OfficeUtils.pri)\)),\1,g' -i OfficeUtils/OfficeUtils.pro || exit 1
   sed 's,\$\$SOURCES_UTILS,'"$PWD/OfficeUtils/src,g" -i OfficeUtils/OfficeUtils.pri || exit 1
-#  sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11 -fPIC -I${zlib:location}/include -Wl,-rpath=${zlib:location}/lib"@g' -i Makefile || exit 1
-  sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11"@g' -i Makefile || exit 1
+#  sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/qtbase/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11 -fPIC -I${zlib:location}/include -Wl,-rpath=${zlib:location}/lib"@g' -i Makefile || exit 1
+  sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/qtbase/mkspecs/linux-g++ "QMAKE_CXXFLAGS += -std=c++11"@g' -i Makefile || exit 1
   ( cd Common/3dParty && ./make.sh ) || exit 1
 #  cp -rnt DesktopEditor/doctrenderer ${nodejs-4:location}/include/node/*
 #  echo 'QMAKE_CXXFLAGS += -std=c++11' >> PdfWriter/PdfWriter.pro
 make-targets =
   lib bin
 environment =
-  PATH=${p7zip:location}/bin:${qt5-qmake:location}/bin:%(PATH)s
-  CPPFLAGS=-I${qt5-qmake:location}/include -I${zlib:location}/include -fPIC
-  CXXFLAGS=-I${qt5-qmake:location}/include -I${zlib:location}/include -fPIC
-  LD_LIBRARY_PATH=${qt5-qmake:location}/lib:${qt5-qmake:location}/lib64:${zlib:location}/lib
+  PATH=${gcc:location}/bin:${p7zip:location}/bin:${qt5-qmake:location}/qtbase/bin:%(PATH)s
+  CPPFLAGS=-I${qt5-qmake:location}/qtbase//include -I${zlib:location}/include -fPIC
+  CXXFLAGS=-I${qt5-qmake:location}/qtbase/include -I${zlib:location}/include -fPIC
+  LD_LIBRARY_PATH=${gcc:location}/lib64:${gcc:location}/lib:${qt5-qmake:location}/qtbase/lib:${zlib:location}/lib
 #  PATH=${gcc:location}/bin:${nodejs:location}/bin:%(PATH)s
 #  CPPFLAGS=-I${gcc:location}/include
 #  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
-##  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib
+#-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 #  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 

component/onlyoffice-core/rewrite-scripts.patch

@@ -111,13 +111,21 @@
  fi
 --- Common/3dParty/cryptopp/build.sh.orig	2017-01-30 15:04:58.221156379 +0100
 +++ Common/3dParty/cryptopp/build.sh	2017-01-30 15:04:48.103156175 +0100
-@@ -1,4 +1,6 @@
+@@ -1,4 +1,7 @@
  #!/bin/bash
 +# XXX actualy, this file should be named build.bash
 +set -e
++CRYPTOPP_QMAKE_SPEC=SED_IT
  
  BUILD_DIR=project/cryptopp.build
  mkdir -p $BUILD_DIR
+@@ -3,5 +6,5 @@
+ BUILD_DIR=project/cryptopp.build
+ mkdir -p $BUILD_DIR
+ cd $BUILD_DIR
+-qmake ../cryptopp.pro
++qmake -spec "$CRYPTOPP_QMAKE_SPEC" ../cryptopp.pro
+ make && echo "build: OK!"
 --- Common/3dParty/icu/fetch.sh.orig	2017-01-30 14:22:41.881105314 +0100
 +++ Common/3dParty/icu/fetch.sh	2017-01-30 14:54:19.715143524 +0100
 @@ -1,4 +1,6 @@
@@ -264,86 +272,6 @@
  
  export PATH=`pwd`/depot_tools:"$PATH"
  
-@@ -22,49 +24,43 @@
-   *)        arch="_32" ;;
- esac
- 
--if [[ -d "$SCRIPTPATH/$platform$arch" ]]
--then
--echo
--else
--mkdir "$SCRIPTPATH/$platform$arch"
-+if [ ! -d "$SCRIPTPATH/$platform$arch" ] ; then
-+  mkdir "$SCRIPTPATH/$platform$arch"
- fi
- 
- cd "$SCRIPTPATH/v8"
- 
--if [[ "$platform" == *"linux"* ]]
--then
--CFLAGS="-fPIC" CXXFLAGS="-fPIC" make native GYPFLAGS=-Dclang=0
--
--cp "./out/native/obj.target/tools/gyp/libv8_base.a" "./../$platform$arch/"
--cp "./out/native/obj.target/tools/gyp/libv8_libbase.a" "./../$platform$arch/"
--cp "./out/native/obj.target/tools/gyp/libv8_libplatform.a" "./../$platform$arch/"
--cp "./out/native/obj.target/tools/gyp/libv8_nosnapshot.a" "./../$platform$arch/"
--cp "./out/native/obj.target/tools/gyp/libv8_external_snapshot.a" "./../$platform$arch/"
--
--cp "./out/native/obj.target/third_party/icu/libicui18n.a" "./../$platform$arch/"
--cp "./out/native/obj.target/third_party/icu/libicuuc.a" "./../$platform$arch/"
--cp "./out/native/obj.target/third_party/icu/libicudata.a" "./../$platform$arch/"
-+if [[ "$platform" == *linux* ]] ; then
-+  CFLAGS="-fPIC" CXXFLAGS="-fPIC" make native GYPFLAGS=-Dclang=0
- 
--cp "./third_party/icu/linux/icudtl_dat.S" "./../$platform$arch/"
-+  cp "./out/native/obj.target/tools/gyp/libv8_base.a" "./../$platform$arch/"
-+  cp "./out/native/obj.target/tools/gyp/libv8_libbase.a" "./../$platform$arch/"
-+  cp "./out/native/obj.target/tools/gyp/libv8_libplatform.a" "./../$platform$arch/"
-+  cp "./out/native/obj.target/tools/gyp/libv8_nosnapshot.a" "./../$platform$arch/"
-+  cp "./out/native/obj.target/tools/gyp/libv8_external_snapshot.a" "./../$platform$arch/"
- 
--cp "./third_party/icu/source/data/in/icudtl.dat" "./../$platform$arch/"
--fi
-+  cp "./out/native/obj.target/third_party/icu/libicui18n.a" "./../$platform$arch/"
-+  cp "./out/native/obj.target/third_party/icu/libicuuc.a" "./../$platform$arch/"
-+  cp "./out/native/obj.target/third_party/icu/libicudata.a" "./../$platform$arch/"
-+
-+  cp "./third_party/icu/linux/icudtl_dat.S" "./../$platform$arch/"
-+
-+  cp "./third_party/icu/source/data/in/icudtl.dat" "./../$platform$arch/"
-+
-+elif [[ "$platform" == *mac* ]] ; then
-+  CFLAGS="-fPIC" CXXFLAGS="-fPIC -stdlib=libc++" LDFLAGS="-stdlib=libc++"  make native
-+
-+  cp "./out/native/libv8_base.a" "./../$platform$arch/"
-+  cp "./out/native/libv8_libbase.a" "./../$platform$arch/"
-+  cp "./out/native/libv8_libplatform.a" "./../$platform$arch/"
-+  cp "./out/native/libv8_nosnapshot.a" "./../$platform$arch/"
-+  cp "./out/native/libv8_external_snapshot.a" "./../$platform$arch/"
- 
--if [[ "$platform" == *"mac"* ]]
--then
--CFLAGS="-fPIC" CXXFLAGS="-fPIC -stdlib=libc++" LDFLAGS="-stdlib=libc++"  make native
--
--cp "./out/native/libv8_base.a" "./../$platform$arch/"
--cp "./out/native/libv8_libbase.a" "./../$platform$arch/"
--cp "./out/native/libv8_libplatform.a" "./../$platform$arch/"
--cp "./out/native/libv8_nosnapshot.a" "./../$platform$arch/"
--cp "./out/native/libv8_external_snapshot.a" "./../$platform$arch/"
--
--cp "./out/native/libicui18n.a" "./../$platform$arch/"
--cp "./out/native/libicuuc.a" "./../$platform$arch/"
--cp "./out/native/icudtl.dat" "./../$platform$arch/"
-+  cp "./out/native/libicui18n.a" "./../$platform$arch/"
-+  cp "./out/native/libicuuc.a" "./../$platform$arch/"
-+  cp "./out/native/icudtl.dat" "./../$platform$arch/"
- 
--cp "./out/native/libv8_libsampler.a" "./../$platform$arch/"
-+  cp "./out/native/libv8_libsampler.a" "./../$platform$arch/"
- 
--cp "./third_party/icu/mac/icudtl_dat.S" "./../$platform$arch/"
-+  cp "./third_party/icu/mac/icudtl_dat.S" "./../$platform$arch/"
- fi
 --- Common/3dParty/v8/fetch.sh.orig	2017-01-30 15:01:43.810152465 +0100
 +++ Common/3dParty/v8/fetch.sh	2017-02-01 15:24:37.740189528 +0100
 @@ -1,20 +1,24 @@