commit 5277967c5f98fcc05e68b937b20286f6e9a5f944
Author: Jan Palus <at...@pld-linux.org>
Date: Sun May 26 11:35:55 2024 +0200
use system rapidjson
qt5-qtlocation.spec | 3 +++
system-rapidjson.patch | 11 +++++++++++
2 files changed, 14 insertions(+)
---
diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec
index 382bd3e..ce7f3c2 100644
--- a/qt5-qtlocation.spec
+++ b/qt5-qtlocation.spec
@@ -30,6 +30,7 @@ Source0:
https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/
Source1:
https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-opensource-src-%{version}.tar.xz
# Source1-md5: a7fe34c317fbba74a9f97c36679fec47
Patch0: gcc13.patch
+Patch1: system-rapidjson.patch
URL: https://www.qt.io/
%{?with_gypsy:BuildRequires: GConf2-devel >= 2.0}
BuildRequires: Qt5Concurrent-devel >= %{qtbase_ver}
@@ -49,6 +50,7 @@ BuildRequires: qt5-assistant >= %{qttools_ver}
BuildRequires: qt5-build >= %{qtbase_ver}
%{?with_qm:BuildRequires: qt5-linguist >= %{qttools_ver}}
BuildRequires: qt5-qmake >= %{qtbase_ver}
+BuildRequires: rapidjson-devel >= 1.1.0
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 2.016
BuildRequires: tar >= 1:1.22
@@ -189,6 +191,7 @@ Przykłady do bibliotek Qt5 Location i Positioning.
%prep
%setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
%patch0 -p1
+%patch1 -p1
%build
%{qmake_qt5} -- \
diff --git a/system-rapidjson.patch b/system-rapidjson.patch
new file mode 100644
index 0000000..e8acab3
--- /dev/null
+++ b/system-rapidjson.patch
@@ -0,0 +1,11 @@
+---
qtlocation-everywhere-src-5.15.14/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro.orig
2024-05-08 07:14:45.000000000 +0200
++++
qtlocation-everywhere-src-5.15.14/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
2024-05-25 11:38:27.727264462 +0200
+@@ -424,8 +424,6 @@
+ deps/polylabel/1.0.3/include \
+ deps/protozero/1.5.2 \
+ deps/protozero/1.5.2/include \
+- deps/rapidjson/1.1.0 \
+- deps/rapidjson/1.1.0/include \
+ deps/shelf-pack/2.1.1 \
+ deps/shelf-pack/2.1.1/include \
+ deps/supercluster/0.2.2 \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtlocation.git/commitdiff/b445b4890a4b1514668ea8b9ae15b13f19fe82fc
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
