!10 [sync] PR-9: update to upstream version 5.15.2

Merge pull request !10 from openeuler-sync-bot/sync-pr9-master-to-openEuler-22.03-LTS-Next
update to upstream version 5.15.2
2022-01-18 06:36:59 +00:00 · 2022-01-17 14:58:22 +08:00 · 2021-08-01 11:11:08 +00:00 · 2021-08-01 18:36:36 +08:00 · 2020-09-14 14:30:05 +08:00 · 2020-09-14 14:02:43 +08:00
4 changed files with 126 additions and 0 deletions
--- a/qt5-qtlocation.spec
+++ b/qt5-qtlocation.spec
@ -0,0 +1,100 @@
+%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
+
+Name:             qt5-qtlocation
+Version:          5.15.2
+Release:          1
+Summary:          Qt5 module for Location framework
+License:          LGPLv2 with exceptions or GPLv3 with exceptions
+Url:              http://www.qt.io
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0:          https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtlocation-everywhere-src-%{version}.tar.xz
+
+Patch0:           qtlocation-gcc10.patch
+
+BuildRequires: make
+BuildRequires:    qt5-qtbase-devel >= 5.9.0 qt5-qtbase-private-devel pkgconfig(zlib)
+BuildRequires:    pkgconfig(icu-i18n) pkgconfig(libssl) pkgconfig(libcrypto) qt5-qtdeclarative-devel >= 5.9.0
+%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
+
+%description
+The Qt Location API helps you create viable mapping solutions using the
+data available from some of the popular location services.
+
+%package devel
+Summary:          Development files provided for qt5-qtlocation
+Requires:         %{name} = %{version}-%{release} qt5-qtbase-devel
+Provides:         %{name}-examples = %{version}-%{release}
+Obsoletes:        %{name}-examples < %{version}-%{release}
+%description devel
+This package is a developing files for t5-qtlocation.
+
+%prep
+%autosetup -n qtlocation-everywhere-src-%{version} -p1
+
+%build
+%{qmake_qt5}
+
+%make_build
+
+%install
+%make_install INSTALL_ROOT=%{buildroot}
+
+cd %{buildroot}%{_qt5_libdir}
+for prl_file in libQt5*.prl ; do
+  sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
+  if [ -f "$(basename ${prl_file} .prl).so" ]; then
+    rm -fv "$(basename ${prl_file} .prl).la"
+    sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
+  fi
+done
+cd -
+
+%post
+/sbin/ldconfig
+%postun
+/sbin/ldconfig
+
+%files
+%license LICENSE.GPL* LICENSE.LGPL*
+%{_qt5_libdir}/{libQt5Location.so.5*,libQt5Positioning.so.5*,libQt5PositioningQuick.so.5*}
+
+%{_qt5_archdatadir}/qml/QtLocation/
+%{_qt5_archdatadir}/qml/QtPositioning/*
+%{_qt5_archdatadir}/qml/Qt/labs/location
+
+%{_qt5_plugindir}/position/
+%{_qt5_plugindir}/geoservices/
+
+%dir %{_qt5_archdatadir}/qml/Qt
+%dir %{_qt5_archdatadir}/qml/Qt/labs
+%dir %{_qt5_archdatadir}/qml/QtPositioning
+
+%files devel
+%{_qt5_headerdir}/{QtLocation/,QtPositioning/,QtPositioningQuick/}
+
+%{_qt5_libdir}/{libQt5Location.so,libQt5Location.prl,libQt5Positioning.so}
+%{_qt5_libdir}/{libQt5Positioning.prl,libQt5PositioningQuick.so,libQt5PositioningQuick.prl}
+%{_qt5_libdir}/pkgconfig/{Qt5Location.pc,Qt5Positioning.pc,Qt5PositioningQuick.pc}
+
+%dir %{_qt5_libdir}/cmake/{Qt5Location,Qt5Positioning,Qt5PositioningQuick/}
+
+%{_qt5_libdir}/cmake/Qt5Location/Qt5Location*.cmake
+%{_qt5_libdir}/cmake/Qt5Positioning/Qt5Positioning*.cmake
+%{_qt5_libdir}/cmake/Qt5PositioningQuick/Qt5PositioningQuick*.cmake
+
+%{_qt5_archdatadir}/mkspecs/modules/{qt_lib_location*.pri,qt_lib_positioning*.pri,qt_lib_positioning*.pri}
+
+%{_qt5_examplesdir}/
+
+%changelog
+* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
+- update to upstream version 5.15.2
+
+* Sat Jul 31 2021 wangyong<wangyong187@huawei.com> - 5.11.1-7
+- Patch for GCC-10
+
+* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-6
+- Fix Source0
+
+* Fri Feb 14 2020 lingsheng <lingsheng@huawei.com> - 5.11.1-5
+- Package init
--- a/qt5-qtlocation.yaml
+++ b/qt5-qtlocation.yaml
@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://code.qt.io/qt/qtlocation.git
+tag_prefix: "^v"
+separator: "."
--- a/qtlocation-everywhere-src-5.15.2.tar.xz
+++ b/qtlocation-everywhere-src-5.15.2.tar.xz
--- a/qtlocation-gcc10.patch
+++ b/qtlocation-gcc10.patch
@ -0,0 +1,22 @@
+diff --git a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
+index b75d038..b367ee6 100644
+--- a/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
+++ b/src/3rdparty/mapbox-gl-native/platform/qt/src/bidi.cpp
+@@ -3,6 +3,7 @@
+ #include <mbgl/text/bidi.hpp>
+ 
+ #include <QString>
+#include <stdexcept>
+ 
+ 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
+index 510ff23..d5e0a92 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
+@@ -1,4 +1,5 @@
+ #include <mbgl/util/convert.hpp>
+#include <cstdint>
+ 
+ #include <cstdint>
+
Author	SHA1	Message	Date
openeuler-ci-bot	1d6e6a5fbd	!10 [sync] PR-9: update to upstream version 5.15.2 Merge pull request !10 from openeuler-sync-bot/sync-pr9-master-to-openEuler-22.03-LTS-Next	2022-01-18 06:36:59 +00:00
pei-jiankang	4840f010d1	update to upstream version 5.15.2 (cherry picked from commit 157c009212a105077c30d1d05f306f8a571ea612)	2022-01-17 14:58:22 +08:00
openeuler-ci-bot	3d72f4c44f	!8 fix build error caused by upgrade to GCC-10 From: @aslfjk Reviewed-by: @small_leek Signed-off-by: @small_leek	2021-08-01 11:11:08 +00:00
王勇	db2770bbce	fix build error caused by upgrade to GCC-10	2021-08-01 18:36:36 +08:00
openeuler-ci-bot	1549ca874a	!3 Fix source0 From: @kkkl12 Reviewed-by: @small_leek Signed-off-by: @small_leek	2020-09-14 14:30:05 +08:00
kkkl12	4f10cdb750	Fix Source0	2020-09-14 14:02:43 +08:00
openeuler-ci-bot	2baf2affd2	!2 add yaml file Merge pull request !2 from sugarfillet/master	2020-05-26 15:18:44 +08:00
sugarfillet	bf402b8378	add yaml file	2020-05-08 15:58:18 +08:00
openeuler-ci-bot	9cb4f3959b	!1 package init Merge pull request !1 from ultra_planet/new	2020-02-14 17:49:43 +08:00
ultra_planet	9f340e65e9	package init	2020-02-14 14:33:06 +08:00