Commit 6d5e529c authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: small fixes

parent f91e3029
...@@ -7,8 +7,7 @@ PRODUCTDIR=/opt/WebDAVCloudMailRu ...@@ -7,8 +7,7 @@ PRODUCTDIR=/opt/WebDAVCloudMailRu
. $(dirname $0)/common.sh . $(dirname $0)/common.sh
add_bin_exec_command wdmrc $PRODUCTDIR/wdmrc.dll cat <<EOF | create_bin_exec_command /usr/bin/wdmrc
cat <<EOF >usr/bin/wdmrc
#!/bin/sh #!/bin/sh
dotnet $PRODUCTDIR/wdmrc.dll "\$@" dotnet $PRODUCTDIR/wdmrc.dll "\$@"
EOF EOF
......
...@@ -24,10 +24,10 @@ remove_file $PRODUCTDIR/office6/wpscloudsvr ...@@ -24,10 +24,10 @@ remove_file $PRODUCTDIR/office6/wpscloudsvr
remove_file $PRODUCTDIR/office6/addons/pdfbatchcompression/libpdfbatchcompressionapp.so remove_file $PRODUCTDIR/office6/addons/pdfbatchcompression/libpdfbatchcompressionapp.so
# Fix for icu>=71.1 # Fix for icu>=71.1
remove_file $PRODUCTDIR/office6/libstdc++.so.* remove_file $PRODUCTDIR/office6/libstdc++.so*
# Use system libjpeg # Use system libjpeg
remove_file $PRODUCTDIR/office6/libjpeg.so.* remove_file $PRODUCTDIR/office6/libjpeg.so*
# hack to fix bug somewhere in linking # hack to fix bug somewhere in linking
ignore_lib_requires "libc++.so" ignore_lib_requires "libc++.so"
...@@ -42,4 +42,8 @@ ignore_lib_requires "libuof.so" ...@@ -42,4 +42,8 @@ ignore_lib_requires "libuof.so"
# https://aur.archlinux.org/cgit/aur.git/tree/fix-wps-python-parse.patch?h=wps-office-cn # https://aur.archlinux.org/cgit/aur.git/tree/fix-wps-python-parse.patch?h=wps-office-cn
subst 's/python -c '\''import sys, urllib; print urllib.unquote(sys.argv\[1\])'\''/python3 -c '\''import sys, urllib.parse; print(urllib.parse.unquote(sys.argv[1]))'\''/' $BUILDROOT/usr/bin/wps subst 's/python -c '\''import sys, urllib; print urllib.unquote(sys.argv\[1\])'\''/python3 -c '\''import sys, urllib.parse; print(urllib.parse.unquote(sys.argv[1]))'\''/' $BUILDROOT/usr/bin/wps
# ошибка: Macro %20sequence not found
remove_file $PRODUCTDIR/office6/mui/zh_CN/resource/help/etrainbow/images/Ribbon/custom_%20sequence.gif
#remove_dir $PRODUCTDIR/office6/mui/zh_CN/resource/help/etrainbow/images
add_libs_requires add_libs_requires
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