import qt5-qtlocation-5.15.15-1.el10

i10ce changed/i10ce/qt5-qtlocation-5.15.15-1.el10
Arkady L. Shane 4 days ago
parent 0fd70ab703
commit 4c1d2b8852
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

2
.gitignore vendored

@ -1 +1 @@
SOURCES/qtlocation-everywhere-opensource-src-5.15.9.tar.xz SOURCES/qtlocation-everywhere-opensource-src-5.15.15.tar.xz

@ -1 +1 @@
bac7c66efd1bcf5c963e59466324a3ebabc00eab SOURCES/qtlocation-everywhere-opensource-src-5.15.9.tar.xz 5ee18b108fa71485fcf16b29fa672c7332b3f7f0 SOURCES/qtlocation-everywhere-opensource-src-5.15.15.tar.xz

@ -0,0 +1,25 @@
From 48a17e88fc1df5b6ae82a9787466226c830bcbf2 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Thu, 17 Mar 2022 18:40:27 +0100
Subject: [PATCH] Fix build of Qt.labs.location QML plugin
Should be conditional on "features.opengl", not on "config.opengl"
---
src/location/configure.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/location/configure.json b/src/location/configure.json
index 6d01a9a37..d1e623a1e 100644
--- a/src/location/configure.json
+++ b/src/location/configure.json
@@ -9,7 +9,7 @@
"label": "Qt.labs.location experimental QML plugin",
"purpose": "Provides experimental QtLocation QML types",
"section": "Location",
- "condition": "config.opengl",
+ "condition": "features.opengl",
"output": [ "privateFeature" ]
},
"geoservices_osm": {
--
GitLab

@ -0,0 +1,13 @@
diff --git a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h
index e3e20df..ad362a6 100644
--- a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h
+++ b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h
@@ -322,7 +322,7 @@ struct GenericStringRef {
operator const Ch *() const { return s; }
const Ch* const s; //!< plain CharType pointer
- const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
+ SizeType length; //!< length of the string (excluding the trailing NULL terminator)
private:
//! Disallow construction from non-const array

@ -10,13 +10,35 @@ index b75d038..b367ee6 100644
namespace mbgl { namespace mbgl {
diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp.me qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
index 510ff23..d5e0a92 100644 --- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp.me 2023-02-20 14:49:09.397384737 +0100
--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp 2023-02-20 14:50:09.654502801 +0100
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp @@ -1,5 +1,7 @@
@@ -1,4 +1,5 @@ #pragma once
#include <mbgl/util/convert.hpp>
+#include <cstdint>
+
#include <mapbox/geometry/geometry.hpp>
#include <mapbox/geometry/point_arithmetic.hpp>
#include <mapbox/geometry/for_each_point.hpp>
diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp.me1 qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp.me1 2023-02-20 15:00:23.967862291 +0100
+++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp 2023-02-20 15:00:41.398058051 +0100
@@ -4,6 +4,7 @@
#include <string>
#include <cassert>
#include <cstdlib>
+#include <cstdint> +#include <cstdint>
#include <exception>
#include <cstdint> // Polyfill needed by Qt when building for Android with GCC
diff -up qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp.me qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
--- qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp.me 2023-02-20 15:12:32.276042434 +0100
+++ qtlocation-everywhere-src-5.15.8/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp 2023-02-20 15:12:58.578501426 +0100
@@ -1,5 +1,6 @@
#pragma once
+#include <cstdint>
#include <mbgl/util/variant.hpp>
namespace mbgl {

@ -1,14 +1,12 @@
%global qt_module qtlocation %global qt_module qtlocation
%global build_tests 1
Summary: Qt5 - Location component Summary: Qt5 - Location component
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.15.9 Version: 5.15.15
Release: 1%{?dist} Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io Url: http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2) %global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
@ -19,6 +17,8 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
# eliminated which in turn forces packages to include the C++ headers they # eliminated which in turn forces packages to include the C++ headers they
# actually need. # actually need.
Patch0: qtlocation-gcc10.patch Patch0: qtlocation-gcc10.patch
Patch1: qtlocation-fix-build-qtlabs-location-qml-plugin.patch
Patch2: qtlocation-fix-rapidjson-build.patch
# filter plugin/qml provides # filter plugin/qml provides
%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
@ -53,18 +53,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples %description examples
%{summary}. %{summary}.
%if 0%{?build_tests}
%package tests
Summary: Unit tests for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests
%{summary}.
%endif
%prep %prep
%setup -q -n %{qt_module}-everywhere-src-%{version} %autosetup -n %{qt_module}-everywhere-src-%{version} -p1
%patch0 -p1 -b .gcc10
%build %build
# QT is known not to work properly with LTO at this point. Some of the issues # QT is known not to work properly with LTO at this point. Some of the issues
@ -78,17 +70,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%make_build %make_build
%if 0%{?build_tests}
%qt5_build_tests
%endif
%install %install
make install INSTALL_ROOT=%{buildroot} make install INSTALL_ROOT=%{buildroot}
%if 0%{?build_tests}
%qt5_install_tests
%endif
## .prl/.la file love ## .prl/.la file love
# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
pushd %{buildroot}%{_qt5_libdir} pushd %{buildroot}%{_qt5_libdir}
@ -108,6 +92,7 @@ popd
%license LICENSE.GPL* LICENSE.LGPL* %license LICENSE.GPL* LICENSE.LGPL*
%{_qt5_libdir}/libQt5Location.so.5* %{_qt5_libdir}/libQt5Location.so.5*
%{_qt5_archdatadir}/qml/QtLocation/ %{_qt5_archdatadir}/qml/QtLocation/
%{_qt5_libdir}/qt5/qml/Qt/labs/location/*
%{_qt5_plugindir}/geoservices/ %{_qt5_plugindir}/geoservices/
%{_qt5_libdir}/libQt5Positioning.so.5* %{_qt5_libdir}/libQt5Positioning.so.5*
%dir %{_qt5_archdatadir}/qml/QtPositioning %dir %{_qt5_archdatadir}/qml/QtPositioning
@ -141,34 +126,97 @@ popd
%files examples %files examples
%{_qt5_examplesdir}/ %{_qt5_examplesdir}/
%if 0%{?build_tests}
%files tests
%{_qt5_libdir}/qt5/tests
%endif
%changelog %changelog
* Tue Apr 18 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1 * Wed Dec 25 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 5.15.15-1
- Rebuilt for MSVSphere 10
* Wed Sep 04 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.15-1
- 5.15.15
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed May 29 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.14-1
- 5.15.14
* Thu Mar 14 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.13-1
- 5.15.13
* Thu Feb 01 2024 Pete Walter <pwalter@fedoraproject.org> - 5.15.12-5
- Rebuild for ICU 74
* Tue Jan 30 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.12-4
- Fix build of bundled rapidjson
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Jan 02 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.12-1
- 5.15.12
* Fri Oct 06 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-1
- 5.15.11
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 5.15.10-2
- Rebuilt for ICU 73.2
* Mon Jun 12 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.10-1
- 5.15.10
* Tue Apr 11 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
- 5.15.9 - 5.15.9
Resolves: bz#2175735
* Mon Mar 28 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1 * Mon Feb 20 2023 Than Ngo <than@redhat.com> - 5.15.8-4
- 5.15.3 - Fixed FTBFS
Resolves: bz#2061361
* Tue Jan 31 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-3
- migrated to SPDX license
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jan 05 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-1
- 5.15.8
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-9 * Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 5.15.7-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuild for ICU 72
Related: rhbz#1991688
* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.7-1
- 5.15.7
* Tue Sep 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.6-1
- 5.15.6
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.15.5-3
- Rebuilt for ICU 71.1
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
- 5.15.5
* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
- 5.15.4
* Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
- 5.15.3
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-8 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-8
- Rebuilt for RHEL 9 BETA for openssl 3.0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Related: rhbz#1971065
* Wed Jun 09 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-7 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-7
- Add gating tests - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Resolves: bz#1968466
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-6 * Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 5.15.2-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuild for ICU 69
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 5.15.2-5 * Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 5.15.2-5
- Rebuilt for removed libstdc++ symbol (#1937698) - Rebuilt for removed libstdc++ symbol (#1937698)

Loading…
Cancel
Save