Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
slapos
Commits
27db0c02
Commit
27db0c02
authored
Feb 06, 2017
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xxx review boost/fetch.sh patch
parent
5a18739a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
30 deletions
+7
-30
component/onlyoffice-core/buildout.cfg
component/onlyoffice-core/buildout.cfg
+1
-1
component/onlyoffice-core/rewrite-scripts.patch
component/onlyoffice-core/rewrite-scripts.patch
+6
-29
No files found.
component/onlyoffice-core/buildout.cfg
View file @
27db0c02
...
...
@@ -12,7 +12,7 @@ url = https://github.com/ONLYOFFICE/core/archive/win-v4.3.0.56.tar.gz
md5sum = 76c0e29ed783067799b72294edcb00db
patch-options = -p0
patches =
${:_profile_base_location_}/rewrite-scripts.patch#
332e95ceda960f50bd3f7db5da1f3de5
${:_profile_base_location_}/rewrite-scripts.patch#
d10bd4a75b8aa51b714bd9de092db276
${:_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/
...
...
component/onlyoffice-core/rewrite-scripts.patch
View file @
27db0c02
--- Common/3dParty/boost/fetch.sh.orig 2017-0
1-30 14:38:07.950123959 +01
00
+++ Common/3dParty/boost/fetch.sh 2017-0
1-30 15:02:14.799153089 +01
00
--- Common/3dParty/boost/fetch.sh.orig 2017-0
2-03 15:34:43.000000000 +00
00
+++ Common/3dParty/boost/fetch.sh 2017-0
2-06 10:34:23.113177706 +00
00
@@ -1,4 +1,6 @@
#!/bin/bash
+# XXX actualy, this file should be named fetch.bash
...
...
@@ -7,12 +7,7 @@
SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
@@ -8,36 +10,18 @@
case "$os" in
Linux*) platform="linux" ;;
- Darwin*) platform="mac" ;;
+ Darwin*) platform="mac" ;;
@@ -12,32 +14,14 @@
*) exit ;;
esac
...
...
@@ -21,7 +16,7 @@
-if [[ -f "$SCRIPTPATH/7zX_1.7.1.dmg" ]]
-then
-echo "7z already downloaded"
+if [ -f "$SCRIPTPATH/boost_1_58_0.tar.gz" ]
; then
+if [ -f "$SCRIPTPATH/boost_1_58_0.tar.gz" ]; then
+ echo "boost already downloaded"
else
-wget http://static.updatestar.net/dl/7zX/7zX_1.7.1.dmg
...
...
@@ -36,12 +31,12 @@
+ wget http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.gz
fi
if [ -d "$SCRIPTPATH/boost" ]; then
if [ -d "$SCRIPTPATH/boost
_1_58_0
" ]; then
-echo "boost already extracted"
-else
-if [[ "$platform" == *"linux"* ]]
-then
-7z x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
-7z x
-y
"$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
+ echo "boost already extracted"
else
-hdiutil mount "$SCRIPTPATH/7zX_1.7.1.dmg"
...
...
@@ -68,15 +63,6 @@
SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
@@ -8,7 +10,7 @@
case "$os" in
Linux*) platform="linux" ;;
- Darwin*) platform="mac" ;;
+ Darwin*) platform="mac" ;;
*) exit ;;
esac
@@ -20,57 +22,44 @@
*) arch="_32" ;;
esac
...
...
@@ -214,15 +200,6 @@
export PATH=`pwd`/depot_tools:"$PATH"
@@ -10,7 +12,7 @@
case "$os" in
Linux*) platform="linux" ;;
- Darwin*) platform="mac" ;;
+ Darwin*) platform="mac" ;;
*) exit ;;
esac
@@ -22,49 +24,43 @@
*) arch="_32" ;;
esac
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment