fix: replace qt5 rapidjson patch with sed command

This commit is contained in:
ngn 2024-08-23 07:29:56 +03:00
parent 775fd33260
commit 0af4b98dd5
2 changed files with 6 additions and 6 deletions

View File

@ -1,2 +1,5 @@
# 5.15.12
Updated to a newer upstream release
# 5.15.10 # 5.15.10
First version First version

View File

@ -10,7 +10,6 @@ FILES=(
"designer-qt5.desktop" "designer-qt5.desktop"
"linguist-qt5.desktop" "linguist-qt5.desktop"
"qdbusviewer-qt5.desktop" "qdbusviewer-qt5.desktop"
"rapidjson-readonly-member-fix.patch"
) )
HASHES=( HASHES=(
"3fb1cd4f763f5d50d491508b7b99fb77" "3fb1cd4f763f5d50d491508b7b99fb77"
@ -20,7 +19,6 @@ HASHES=(
"945d209667d4bdb01ddb9d5ee4968dee55e4386f0927246995de8bda93b0c274" "945d209667d4bdb01ddb9d5ee4968dee55e4386f0927246995de8bda93b0c274"
"27b1237daf07ac00b9035f607744c42f5824455f20f94e3f1ac9eed64508542c" "27b1237daf07ac00b9035f607744c42f5824455f20f94e3f1ac9eed64508542c"
"5ce3d8b7550bdd1423c786b6ef543564aacaec61a62fdee1601bea249ff794cb" "5ce3d8b7550bdd1423c786b6ef543564aacaec61a62fdee1601bea249ff794cb"
"5002ff20a65b7d057411e39adf7f5a29eddff818d20579900b655df4d838b984a1b68f488232e1990b592943a70943619d924da1c4e1d2ce0d3ef65bc40f75d6"
) )
DEPENDS=( DEPENDS=(
@ -47,10 +45,8 @@ PACKAGE() {
qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
patch -Np1 -i "../qt-everywhere-opensource-src-${VERSION}-security_fix-1.patch" patch -Np1 -i "../qt-everywhere-opensource-src-${VERSION}-security_fix-1.patch"
pushd "deps/rapidjson/1.1.0" find . -type f -name document.h \
# https://github.com/Tencent/rapidjson/issues/2277 -exec sed -i -e '/GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }/d' {} \;
patch -p1 -i "${ROOTDIR}/rapidjson-readonly-member-fix.patch"
popd
./configure -prefix /usr \ ./configure -prefix /usr \
-sysconfdir /etc/xdg \ -sysconfdir /etc/xdg \
@ -73,6 +69,7 @@ PACKAGE() {
-docdir /usr/share/doc/qt5 \ -docdir /usr/share/doc/qt5 \
-translationdir /usr/share/qt5/translations \ -translationdir /usr/share/qt5/translations \
-examplesdir /usr/share/doc/qt5/examples -examplesdir /usr/share/doc/qt5/examples
make make
make INSTALL_ROOT="${ROOTDIR}" install make INSTALL_ROOT="${ROOTDIR}" install