fix: replace qt5 rapidjson patch with sed command
This commit is contained in:
parent
775fd33260
commit
0af4b98dd5
@ -1,2 +1,5 @@
|
||||
# 5.15.12
|
||||
Updated to a newer upstream release
|
||||
|
||||
# 5.15.10
|
||||
First version
|
||||
|
@ -10,7 +10,6 @@ FILES=(
|
||||
"designer-qt5.desktop"
|
||||
"linguist-qt5.desktop"
|
||||
"qdbusviewer-qt5.desktop"
|
||||
"rapidjson-readonly-member-fix.patch"
|
||||
)
|
||||
HASHES=(
|
||||
"3fb1cd4f763f5d50d491508b7b99fb77"
|
||||
@ -20,7 +19,6 @@ HASHES=(
|
||||
"945d209667d4bdb01ddb9d5ee4968dee55e4386f0927246995de8bda93b0c274"
|
||||
"27b1237daf07ac00b9035f607744c42f5824455f20f94e3f1ac9eed64508542c"
|
||||
"5ce3d8b7550bdd1423c786b6ef543564aacaec61a62fdee1601bea249ff794cb"
|
||||
"5002ff20a65b7d057411e39adf7f5a29eddff818d20579900b655df4d838b984a1b68f488232e1990b592943a70943619d924da1c4e1d2ce0d3ef65bc40f75d6"
|
||||
)
|
||||
|
||||
DEPENDS=(
|
||||
@ -47,10 +45,8 @@ PACKAGE() {
|
||||
qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
|
||||
patch -Np1 -i "../qt-everywhere-opensource-src-${VERSION}-security_fix-1.patch"
|
||||
|
||||
pushd "deps/rapidjson/1.1.0"
|
||||
# https://github.com/Tencent/rapidjson/issues/2277
|
||||
patch -p1 -i "${ROOTDIR}/rapidjson-readonly-member-fix.patch"
|
||||
popd
|
||||
find . -type f -name document.h \
|
||||
-exec sed -i -e '/GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }/d' {} \;
|
||||
|
||||
./configure -prefix /usr \
|
||||
-sysconfdir /etc/xdg \
|
||||
@ -73,6 +69,7 @@ PACKAGE() {
|
||||
-docdir /usr/share/doc/qt5 \
|
||||
-translationdir /usr/share/qt5/translations \
|
||||
-examplesdir /usr/share/doc/qt5/examples
|
||||
|
||||
make
|
||||
make INSTALL_ROOT="${ROOTDIR}" install
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user