fix: qt5 rapidjson depend patch

This commit is contained in:
ngn 2024-08-23 03:33:40 +03:00
parent 587d7f310c
commit 775fd33260
2 changed files with 37 additions and 4 deletions

View File

@ -10,15 +10,17 @@ FILES=(
"designer-qt5.desktop"
"linguist-qt5.desktop"
"qdbusviewer-qt5.desktop"
"rapidjson-readonly-member-fix.patch"
)
HASHES=(
"3fb1cd4f763f5d50d491508b7b99fb77"
"50db2eb15bada7e87ddbe43a9a6a8f2844513356dd9c9adc9f4fedfc12b0db6d"
"82257f13e8c3b85955bf1d0750049b945dedadc3f2f76960f3d922347372b1da"
"50db2eb15bada7e87ddbe43a9a6a8f2844513356dd9c9adc9f4fedfc12b0db6d"
"162c1b77fa48db234f483148337c57f3850d9749cfdb8660054a8c81a52c1f4b"
"945d209667d4bdb01ddb9d5ee4968dee55e4386f0927246995de8bda93b0c274"
"27b1237daf07ac00b9035f607744c42f5824455f20f94e3f1ac9eed64508542c"
"5ce3d8b7550bdd1423c786b6ef543564aacaec61a62fdee1601bea249ff794cb"
"5002ff20a65b7d057411e39adf7f5a29eddff818d20579900b655df4d838b984a1b68f488232e1990b592943a70943619d924da1c4e1d2ce0d3ef65bc40f75d6"
)
DEPENDS=(
@ -33,6 +35,10 @@ PACKAGE() {
tar xf "qt-everywhere-opensource-src-${VERSION}.tar.xz"
cd "qt-everywhere-src-${VERSION}"
export CFLAGS="${CFLAGS} -std=gnu89"
export CXXFLAGS="${CFLAGS} -std=gnu89"
export CPPFLAGS="${CFLAGS} -std=gnu89"
patch -Np1 -i "../qt-everywhere-opensource-src-${VERSION}-kf5-1.patch"
mkdir -pv qtbase/.git
sed -e "/pragma once/a#include <cstdint>" \
@ -41,6 +47,11 @@ 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
./configure -prefix /usr \
-sysconfdir /etc/xdg \
-confirm-license \
@ -65,14 +76,14 @@ PACKAGE() {
make
make INSTALL_ROOT="${ROOTDIR}" install
find "${ROOTDIR}/usr/lib" -name \*.prl \
find "${ROOTDIR}/usr" -name \*.prl \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -v -dm755 "${ROOTDIR}/usr/share/pixmaps/"
install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
"${ROOTDIR}/usr/share/pixmaps/assistant-qt5.png"
install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
"${ROOTDIR}/usr/share/pixmaps/designer-qt5.png"
"${ROOTDIR}/usr/share/pixmaps/designer-qt5.png"
install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
"${ROOTDIR}/usr/share/pixmaps/linguist-qt5.png"
install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \

View File

@ -0,0 +1,22 @@
From 3b2441b87f99ab65f37b141a7b548ebadb607b96 Mon Sep 17 00:00:00 2001
From: Janusz Chorko <janusz.chorko@apdu.pl>
Date: Fri, 26 Aug 2016 21:17:38 +0200
Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718
---
include/rapidjson/document.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
index e3e20dfbd..b0f1f70be 100644
--- a/include/rapidjson/document.h
+++ b/include/rapidjson/document.h
@@ -316,8 +316,6 @@ struct GenericStringRef {
GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
-
//! implicit conversion to plain CharType pointer
operator const Ch *() const { return s; }