Commit 4ceff1df authored by Tristan Cavelier's avatar Tristan Cavelier

fixup

parent 0182b96f
...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d ...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d
md5sum = 2ead88646094941dc8de12cdc72ba3b2 md5sum = 2ead88646094941dc8de12cdc72ba3b2
patch-options = -p0 patch-options = -p0
patches = patches =
${:_profile_base_location_}/rewrite-scripts.patch#1c9c9bf36c264a9e0c0bbd6f838fb441 ${:_profile_base_location_}/rewrite-scripts.patch#6d987ef62655f000b05e2e4dcdbb6b2d
${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
# ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7 # ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
# error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/ # error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/
......
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
fi fi
--- Common/3dParty/v8/fetch.sh.orig 2017-01-30 15:01:43.810152465 +0100 --- 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 +++ Common/3dParty/v8/fetch.sh 2017-02-01 15:24:37.740189528 +0100
@@ -1,20 +1,23 @@ @@ -1,20 +1,24 @@
#!/bin/bash #!/bin/bash
+# XXX actualy, this file should be named fetch.bash +# XXX actualy, this file should be named fetch.bash
+set -e +set -e
...@@ -334,6 +334,7 @@ ...@@ -334,6 +334,7 @@
fi fi
gclient sync -r 4.10.253 gclient sync -r 4.10.253
+cd v8
+git apply ../slapos-v8.patch +git apply ../slapos-v8.patch
--- /dev/null 2017-01-30 09:00:09.914078893 +0100 --- /dev/null 2017-01-30 09:00:09.914078893 +0100
+++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100 +++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment