The package rpms/qt6-qtlocation.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qt6-qtlocation.git/commit/?id=48b...
https://src.fedoraproject.org/cgit/rpms/qt6-qtlocation.git/commit/?id=5f1...
https://src.fedoraproject.org/cgit/rpms/qt6-qtlocation.git/commit/?id=7a5...
https://src.fedoraproject.org/cgit/rpms/qt6-qtlocation.git/commit/?id=4d9....
Change:
-ExcludeArch: s390x
+ExcludeArch: s390x
-ExcludeArch: s390x
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 21130e629094f42748253d705cdadd3f60531891
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Thu May 25 15:23:24 2023 +0200
Earcut is no longer bundled
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
index 8bada90..2e49071 100644
--- a/qt6-qtlocation.spec
+++ b/qt6-qtlocation.spec
@@ -13,9 +13,8 @@ Name: qt6-%{qt_module}
Version: 6.5.1
Release: 1%{?dist}
-# ISC license is used in earcut
# Rest of the licenses are for Qt code in src/location and src/plugins
-License: (LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0) AND ISC
+License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url:
http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
%global qt_version %(echo %{version} | cut -d~ -f1)
@@ -41,10 +40,6 @@ BuildRequires: qt6-qtpositioning-devel >= %{version}
BuildRequires: qt6-qtshadertools-devel >= %{version}
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
-# Qt doesn't support using system earcut and bundles
-# a different version, but it might be worth looking
-# into it in the future and use the system one.
-Provides: bundled(earcut-hpp-devel) = 2.2.1
%description
The Qt Location API helps you create viable mapping solutions using
@@ -100,7 +95,7 @@ popd
%files
-%license LICENSES/GPL* LICENSES/LGPL* src/3rdparty/earcut/LICENSE
+%license LICENSES/GPL* LICENSES/LGPL*
%{_qt6_libdir}/libQt6Location.so.6*
%dir %{_qt6_archdatadir}/qml/QtLocation
%{_qt6_archdatadir}/qml/QtLocation/*
commit 48b12dde2fe110900f3db8bbf4cf3b0eb03c253b
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Thu May 25 12:13:33 2023 +0200
6.5.1
diff --git a/.gitignore b/.gitignore
index f6afd13..d425402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/qtlocation-everywhere-src-6.2.0-rc2.tar.xz
/qtlocation-everywhere-src-6.2.0.tar.xz
/qtlocation-everywhere-src-6.2.1.tar.xz
+/qtlocation-everywhere-src-6.5.1.tar.xz
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
index c728be5..8bada90 100644
--- a/qt6-qtlocation.spec
+++ b/qt6-qtlocation.spec
@@ -1,6 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG:
https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
%global qt_module qtlocation
@@ -9,13 +6,16 @@ ExcludeArch: s390x
%global prerelease rc2
%endif
-Summary: Qt6 - Location component
+%global examples 1
+
+Summary: Qt6 - Location Libraries
Name: qt6-%{qt_module}
-Version: 6.2.2
+Version: 6.5.1
Release: 1%{?dist}
-# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
-License: LGPLv2 with exceptions or GPLv3 with exceptions
+# ISC license is used in earcut
+# Rest of the licenses are for Qt code in src/location and src/plugins
+License: (LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0) AND ISC
Url:
http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
%global qt_version %(echo %{version} | cut -d~ -f1)
@@ -26,13 +26,6 @@ Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/
Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
%endif
-# build failure with gcc10
-# various C++ runtime headers indirectly included <string> which in turn
-# included <local> and <cerrno>. Those indirect inclusions have been
-# eliminated which in turn forces packages to include the C++ headers they
-# actually need.
-Patch0: qtlocation-gcc10.patch
-
# filter plugin/qml provides
%global __provides_exclude_from
^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
@@ -41,37 +34,38 @@ BuildRequires: gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
-# QtPositioning core-private
BuildRequires: qt6-qtbase-private-devel
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
BuildRequires: qt6-qtdeclarative-devel >= %{version}
-BuildRequires: qt6-qtserialport-devel >= %{version}
-
-BuildRequires: pkgconfig(dconf)
-BuildRequires: pkgconfig(zlib)
-BuildRequires: pkgconfig(icu-i18n)
-BuildRequires: pkgconfig(libssl)
-BuildRequires: pkgconfig(libcrypto)
+BuildRequires: qt6-qtpositioning-devel >= %{version}
+BuildRequires: qt6-qtshadertools-devel >= %{version}
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+# Qt doesn't support using system earcut and bundles
+# a different version, but it might be worth looking
+# into it in the future and use the system one.
+Provides: bundled(earcut-hpp-devel) = 2.2.1
+
%description
-The Qt Location and Qt Positioning APIs gives developers the ability to
-determine a position by using a variety of possible sources, including
-satellite, or wifi, or text file, and so on.
+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 for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt6-qtbase-devel%{?_isa}
+Requires: qt6-qtdeclarative-devel%{?_isa}
+Requires: qt6-qtpositioning-devel%{?_isa}
%description devel
%{summary}.
+%if 0%{?examples}
%package examples
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
-
+%endif
%prep
%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
@@ -82,9 +76,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# are being worked on upstream and disabling LTO should be re-evaluated as
# we update this change. Until such time...
# Disable LTO
-%define _lto_cflags %{nil}
+%global _lto_cflags %{nil}
-%cmake_qt6
+%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
%cmake_build
@@ -105,51 +99,33 @@ done
popd
-%ldconfig_scriptlets
-
%files
-%license LICENSE.GPL* LICENSE.LGPL*
-%{_qt6_libdir}/libQt6Positioning.so.6*
-%dir %{_qt6_archdatadir}/qml/QtPositioning
-%{_qt6_archdatadir}/qml/QtPositioning/*
-%{_qt6_plugindir}/position/
-%{_qt6_libdir}/libQt6PositioningQuick.so.6*
+%license LICENSES/GPL* LICENSES/LGPL* src/3rdparty/earcut/LICENSE
+%{_qt6_libdir}/libQt6Location.so.6*
+%dir %{_qt6_archdatadir}/qml/QtLocation
+%{_qt6_archdatadir}/qml/QtLocation/*
+%{_qt6_plugindir}/geoservices/
%files devel
-%{_qt6_headerdir}/QtPositioning/
-%{_qt6_libdir}/libQt6Positioning.so
-%{_qt6_libdir}/libQt6Positioning.prl
-%{_qt6_headerdir}/QtPositioningQuick/
-%{_qt6_libdir}/libQt6PositioningQuick.so
-%{_qt6_libdir}/libQt6PositioningQuick.prl
-%dir %{_qt6_libdir}/cmake/Qt6Positioning
-%{_qt6_libdir}/cmake/Qt6/*.cmake
+%dir %{_qt6_headerdir}/QtLocation
+%{_qt6_headerdir}/QtLocation/*
+%{_qt6_libdir}/libQt6Location.so
+%{_qt6_libdir}/libQt6Location.prl
+%dir %{_qt6_libdir}/cmake/Qt6Location
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLocationTestsConfig.cmake
-%{_qt6_libdir}/cmake/Qt6Bundled_Clip2Tri/Qt6Bundled_Clip2TriDependencies.cmake
-%{_qt6_libdir}/cmake/Qt6Positioning/*.cmake
-%{_qt6_libdir}/cmake/Qt6PositioningQuick/*.cmake
+%{_qt6_libdir}/cmake/Qt6Location/*.cmake
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
-%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
-%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
-%{_qt6_libdir}/metatypes/qt6*_metatypes.json
-%{_qt6_datadir}/modules/*.json
+%{_qt6_archdatadir}/mkspecs/modules/qt_lib_location*.pri
+%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
+%{_qt6_libdir}/qt6/modules/*.json
+%{_qt6_libdir}/pkgconfig/*.pc
+%if 0%{?examples}
%files examples
%{_qt6_examplesdir}/
-
+%endif
%changelog
-* Tue Dec 14 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.2-1
-- 6.2.2
-
-* Fri Oct 29 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.1-1
-- 6.2.1
-
-* Thu Sep 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0-1
-- 6.2.0
-
-* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
-- 6.2.0 - rc2
+* Wed May 24 2023 Jan Grulich <jgrulich(a)redhat.com> - 6.5.1-1
+- 6.5.1
-* Thu Sep 16 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
-- 6.2.0 - rc
diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch
deleted file mode 100644
index 58c84f7..0000000
--- a/qtlocation-gcc10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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>
-
diff --git a/sources b/sources
index 0b57710..803bc83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtlocation-everywhere-src-6.2.1.tar.xz) =
b1b0a770a27348823099e6d150db32087fec4febf47534a5cff9eb76c12ea8715f095b608dfa270624ae7e5b8e859a26ff40c8a14f04d166e808bbcf0afef4f4
+SHA512 (qtlocation-everywhere-src-6.5.1.tar.xz) =
31190ca57feb4ed8b72d5bb5896a81da56632f873609470e760b390a3839f84bf8f6771c6acfcccec6781c694642b85ea34b0c7321528df5a0529af3d2bc5ad1
commit 5f1e62360a6038d485e5e97ba281b21cde5d29a4
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Wed May 24 10:05:01 2023 +0200
Unretirement request:
https://pagure.io/releng/issue/11432
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f6afd13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/qtlocation-everywhere-src-6.2.0-rc.tar.xz
+/qtlocation-everywhere-src-6.2.0-rc2.tar.xz
+/qtlocation-everywhere-src-6.2.0.tar.xz
+/qtlocation-everywhere-src-6.2.1.tar.xz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 3d1414b..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Replaced with qt6-qtpositioning
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
new file mode 100644
index 0000000..c728be5
--- /dev/null
+++ b/qt6-qtlocation.spec
@@ -0,0 +1,155 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG:
https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
+%global qt_module qtlocation
+
+#global unstable 1
+%if 0%{?unstable}
+%global prerelease rc2
+%endif
+
+Summary: Qt6 - Location component
+Name: qt6-%{qt_module}
+Version: 6.2.2
+Release: 1%{?dist}
+
+# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
+License: LGPLv2 with exceptions or GPLv3 with exceptions
+Url:
http://www.qt.io
+%global majmin %(echo %{version} | cut -d. -f1-2)
+%global qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{?unstable}
+Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/su...
+%else
+Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
+%endif
+
+# build failure with gcc10
+# various C++ runtime headers indirectly included <string> which in turn
+# included <local> and <cerrno>. Those indirect inclusions have been
+# eliminated which in turn forces packages to include the C++ headers they
+# actually need.
+Patch0: qtlocation-gcc10.patch
+
+# filter plugin/qml provides
+%global __provides_exclude_from
^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: ninja-build
+BuildRequires: qt6-rpm-macros
+BuildRequires: qt6-qtbase-devel >= %{version}
+# QtPositioning core-private
+BuildRequires: qt6-qtbase-private-devel
+%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
+BuildRequires: qt6-qtdeclarative-devel >= %{version}
+BuildRequires: qt6-qtserialport-devel >= %{version}
+
+BuildRequires: pkgconfig(dconf)
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(icu-i18n)
+BuildRequires: pkgconfig(libssl)
+BuildRequires: pkgconfig(libcrypto)
+BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+
+%description
+The Qt Location and Qt Positioning APIs gives developers the ability to
+determine a position by using a variety of possible sources, including
+satellite, or wifi, or text file, and so on.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: qt6-qtbase-devel%{?_isa}
+%description devel
+%{summary}.
+
+%package examples
+Summary: Programming examples for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description examples
+%{summary}.
+
+
+%prep
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
+
+
+%build
+# QT is known not to work properly with LTO at this point. Some of the issues
+# are being worked on upstream and disabling LTO should be re-evaluated as
+# we update this change. Until such time...
+# Disable LTO
+%define _lto_cflags %{nil}
+
+%cmake_qt6
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+## .prl/.la file love
+# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
+pushd %{buildroot}%{_qt6_libdir}
+for prl_file in libQt6*.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
+popd
+
+
+%ldconfig_scriptlets
+
+%files
+%license LICENSE.GPL* LICENSE.LGPL*
+%{_qt6_libdir}/libQt6Positioning.so.6*
+%dir %{_qt6_archdatadir}/qml/QtPositioning
+%{_qt6_archdatadir}/qml/QtPositioning/*
+%{_qt6_plugindir}/position/
+%{_qt6_libdir}/libQt6PositioningQuick.so.6*
+
+%files devel
+%{_qt6_headerdir}/QtPositioning/
+%{_qt6_libdir}/libQt6Positioning.so
+%{_qt6_libdir}/libQt6Positioning.prl
+%{_qt6_headerdir}/QtPositioningQuick/
+%{_qt6_libdir}/libQt6PositioningQuick.so
+%{_qt6_libdir}/libQt6PositioningQuick.prl
+%dir %{_qt6_libdir}/cmake/Qt6Positioning
+%{_qt6_libdir}/cmake/Qt6/*.cmake
+%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLocationTestsConfig.cmake
+%{_qt6_libdir}/cmake/Qt6Bundled_Clip2Tri/Qt6Bundled_Clip2TriDependencies.cmake
+%{_qt6_libdir}/cmake/Qt6Positioning/*.cmake
+%{_qt6_libdir}/cmake/Qt6PositioningQuick/*.cmake
+%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
+%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
+%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
+%{_qt6_datadir}/modules/*.json
+
+%files examples
+%{_qt6_examplesdir}/
+
+
+%changelog
+* Tue Dec 14 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.2-1
+- 6.2.2
+
+* Fri Oct 29 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.1-1
+- 6.2.1
+
+* Thu Sep 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0-1
+- 6.2.0
+
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
+* Thu Sep 16 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch
new file mode 100644
index 0000000..58c84f7
--- /dev/null
+++ 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>
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..0b57710
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (qtlocation-everywhere-src-6.2.1.tar.xz) =
b1b0a770a27348823099e6d150db32087fec4febf47534a5cff9eb76c12ea8715f095b608dfa270624ae7e5b8e859a26ff40c8a14f04d166e808bbcf0afef4f4
commit 7a58f2dcea98e4b507408058abd2693cc9c6fc81
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Wed Dec 15 15:46:37 2021 +0100
Replaced with qt6-qtpositioning
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f6afd13..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/qtlocation-everywhere-src-6.2.0-rc.tar.xz
-/qtlocation-everywhere-src-6.2.0-rc2.tar.xz
-/qtlocation-everywhere-src-6.2.0.tar.xz
-/qtlocation-everywhere-src-6.2.1.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3d1414b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Replaced with qt6-qtpositioning
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
deleted file mode 100644
index c728be5..0000000
--- a/qt6-qtlocation.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG:
https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x
-
-%global qt_module qtlocation
-
-#global unstable 1
-%if 0%{?unstable}
-%global prerelease rc2
-%endif
-
-Summary: Qt6 - Location component
-Name: qt6-%{qt_module}
-Version: 6.2.2
-Release: 1%{?dist}
-
-# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
-License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:
http://www.qt.io
-%global majmin %(echo %{version} | cut -d. -f1-2)
-%global qt_version %(echo %{version} | cut -d~ -f1)
-
-%if 0%{?unstable}
-Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/su...
-%else
-Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
-%endif
-
-# build failure with gcc10
-# various C++ runtime headers indirectly included <string> which in turn
-# included <local> and <cerrno>. Those indirect inclusions have been
-# eliminated which in turn forces packages to include the C++ headers they
-# actually need.
-Patch0: qtlocation-gcc10.patch
-
-# filter plugin/qml provides
-%global __provides_exclude_from
^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
-
-BuildRequires: cmake
-BuildRequires: gcc-c++
-BuildRequires: ninja-build
-BuildRequires: qt6-rpm-macros
-BuildRequires: qt6-qtbase-devel >= %{version}
-# QtPositioning core-private
-BuildRequires: qt6-qtbase-private-devel
-%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
-BuildRequires: qt6-qtdeclarative-devel >= %{version}
-BuildRequires: qt6-qtserialport-devel >= %{version}
-
-BuildRequires: pkgconfig(dconf)
-BuildRequires: pkgconfig(zlib)
-BuildRequires: pkgconfig(icu-i18n)
-BuildRequires: pkgconfig(libssl)
-BuildRequires: pkgconfig(libcrypto)
-BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
-
-%description
-The Qt Location and Qt Positioning APIs gives developers the ability to
-determine a position by using a variety of possible sources, including
-satellite, or wifi, or text file, and so on.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: qt6-qtbase-devel%{?_isa}
-%description devel
-%{summary}.
-
-%package examples
-Summary: Programming examples for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-%description examples
-%{summary}.
-
-
-%prep
-%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
-
-
-%build
-# QT is known not to work properly with LTO at this point. Some of the issues
-# are being worked on upstream and disabling LTO should be re-evaluated as
-# we update this change. Until such time...
-# Disable LTO
-%define _lto_cflags %{nil}
-
-%cmake_qt6
-
-%cmake_build
-
-
-%install
-%cmake_install
-
-## .prl/.la file love
-# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
-pushd %{buildroot}%{_qt6_libdir}
-for prl_file in libQt6*.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
-popd
-
-
-%ldconfig_scriptlets
-
-%files
-%license LICENSE.GPL* LICENSE.LGPL*
-%{_qt6_libdir}/libQt6Positioning.so.6*
-%dir %{_qt6_archdatadir}/qml/QtPositioning
-%{_qt6_archdatadir}/qml/QtPositioning/*
-%{_qt6_plugindir}/position/
-%{_qt6_libdir}/libQt6PositioningQuick.so.6*
-
-%files devel
-%{_qt6_headerdir}/QtPositioning/
-%{_qt6_libdir}/libQt6Positioning.so
-%{_qt6_libdir}/libQt6Positioning.prl
-%{_qt6_headerdir}/QtPositioningQuick/
-%{_qt6_libdir}/libQt6PositioningQuick.so
-%{_qt6_libdir}/libQt6PositioningQuick.prl
-%dir %{_qt6_libdir}/cmake/Qt6Positioning
-%{_qt6_libdir}/cmake/Qt6/*.cmake
-%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLocationTestsConfig.cmake
-%{_qt6_libdir}/cmake/Qt6Bundled_Clip2Tri/Qt6Bundled_Clip2TriDependencies.cmake
-%{_qt6_libdir}/cmake/Qt6Positioning/*.cmake
-%{_qt6_libdir}/cmake/Qt6PositioningQuick/*.cmake
-%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
-%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
-%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
-%{_qt6_libdir}/metatypes/qt6*_metatypes.json
-%{_qt6_datadir}/modules/*.json
-
-%files examples
-%{_qt6_examplesdir}/
-
-
-%changelog
-* Tue Dec 14 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.2-1
-- 6.2.2
-
-* Fri Oct 29 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.1-1
-- 6.2.1
-
-* Thu Sep 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0-1
-- 6.2.0
-
-* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
-- 6.2.0 - rc2
-
-* Thu Sep 16 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
-- 6.2.0 - rc
diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch
deleted file mode 100644
index 58c84f7..0000000
--- a/qtlocation-gcc10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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>
-
diff --git a/sources b/sources
deleted file mode 100644
index 0b57710..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (qtlocation-everywhere-src-6.2.1.tar.xz) =
b1b0a770a27348823099e6d150db32087fec4febf47534a5cff9eb76c12ea8715f095b608dfa270624ae7e5b8e859a26ff40c8a14f04d166e808bbcf0afef4f4
commit a8ec7537094948d2df3df62f90ed7d6ee40ac811
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Dec 14 10:23:38 2021 +0100
6.2.2
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
index 1d97c41..c728be5 100644
--- a/qt6-qtlocation.spec
+++ b/qt6-qtlocation.spec
@@ -11,7 +11,7 @@ ExcludeArch: s390x
Summary: Qt6 - Location component
Name: qt6-%{qt_module}
-Version: 6.2.1
+Version: 6.2.2
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@@ -139,6 +139,9 @@ popd
%changelog
+* Tue Dec 14 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.2-1
+- 6.2.2
+
* Fri Oct 29 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.1-1
- 6.2.1
commit 90777190cb7c9e9c901f02c786ac2c5cad1afc6f
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Oct 29 13:22:28 2021 +0200
6.2.1
diff --git a/.gitignore b/.gitignore
index 03e284a..f6afd13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/qtlocation-everywhere-src-6.2.0-rc.tar.xz
/qtlocation-everywhere-src-6.2.0-rc2.tar.xz
/qtlocation-everywhere-src-6.2.0.tar.xz
+/qtlocation-everywhere-src-6.2.1.tar.xz
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
index ecba192..1d97c41 100644
--- a/qt6-qtlocation.spec
+++ b/qt6-qtlocation.spec
@@ -11,7 +11,7 @@ ExcludeArch: s390x
Summary: Qt6 - Location component
Name: qt6-%{qt_module}
-Version: 6.2.0%{?unstable:~%{prerelease}}
+Version: 6.2.1
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@@ -139,6 +139,9 @@ popd
%changelog
+* Fri Oct 29 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.1-1
+- 6.2.1
+
* Thu Sep 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0-1
- 6.2.0
diff --git a/sources b/sources
index 8d4ba1e..0b57710 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtlocation-everywhere-src-6.2.0.tar.xz) =
ce80941f206380a0e214aaa3e84548166c29e8691ebbf84585cbcb71e151acf52c43bfceb7c641aab0a656d2183d0d36fbd866343578d82c6d87799865fbf073
+SHA512 (qtlocation-everywhere-src-6.2.1.tar.xz) =
b1b0a770a27348823099e6d150db32087fec4febf47534a5cff9eb76c12ea8715f095b608dfa270624ae7e5b8e859a26ff40c8a14f04d166e808bbcf0afef4f4
commit 75c3cd2ac0185ef9c9def82554b69308c615af99
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Thu Sep 30 13:38:45 2021 +0200
6.2.0
diff --git a/.gitignore b/.gitignore
index 377f1b5..03e284a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtlocation-everywhere-src-6.2.0-rc.tar.xz
/qtlocation-everywhere-src-6.2.0-rc2.tar.xz
+/qtlocation-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
index 34012ae..ecba192 100644
--- a/qt6-qtlocation.spec
+++ b/qt6-qtlocation.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtlocation
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -20,7 +20,7 @@ Url:
http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
%global qt_version %(echo %{version} | cut -d~ -f1)
-%if 0%{unstable}
+%if 0%{?unstable}
Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/su...
%else
Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
@@ -139,6 +139,9 @@ popd
%changelog
+* Thu Sep 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0-1
+- 6.2.0
+
* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
- 6.2.0 - rc2
diff --git a/sources b/sources
index 254e640..8d4ba1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtlocation-everywhere-src-6.2.0-rc2.tar.xz) =
d48df309172abff73a7c1ece729aadea4dad968023e5e45fe7a4f096f9a78d26ad845d41dd58aff57397937052cceb0879f7689d584c4860e8d9185ec100fb8b
+SHA512 (qtlocation-everywhere-src-6.2.0.tar.xz) =
ce80941f206380a0e214aaa3e84548166c29e8691ebbf84585cbcb71e151acf52c43bfceb7c641aab0a656d2183d0d36fbd866343578d82c6d87799865fbf073
commit 0b9a41f432a3a7d1414e52c4a982d64d9eb61f26
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 27 14:14:34 2021 +0200
6.2.0 - rc2
diff --git a/.gitignore b/.gitignore
index 9770866..377f1b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtlocation-everywhere-src-6.2.0-rc.tar.xz
+/qtlocation-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
index c64cb0f..34012ae 100644
--- a/qt6-qtlocation.spec
+++ b/qt6-qtlocation.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - Location component
@@ -139,5 +139,8 @@ popd
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Thu Sep 16 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index c280db2..254e640 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtlocation-everywhere-src-6.2.0-rc.tar.xz) =
263ddde1f36440dc8368b37bdba3ab79a71c31f906f2dcb5b3d7ce684957d9f3046affd6d3f67ececbd11438d051d18ac5c2e3410fe4df1aa937f4a0e8130e4c
+SHA512 (qtlocation-everywhere-src-6.2.0-rc2.tar.xz) =
d48df309172abff73a7c1ece729aadea4dad968023e5e45fe7a4f096f9a78d26ad845d41dd58aff57397937052cceb0879f7689d584c4860e8d9185ec100fb8b
commit b9e53096727c9368338cb4a0842ff9bda2133f7a
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 20 13:08:27 2021 +0200
Add missing patch
diff --git a/qtlocation-gcc10.patch b/qtlocation-gcc10.patch
new file mode 100644
index 0000000..58c84f7
--- /dev/null
+++ 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>
+
commit 4d9d38dfe58f4c37751f3a1b071b3e68e32eb614
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 20 13:04:22 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9770866
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/qtlocation-everywhere-src-6.2.0-rc.tar.xz
diff --git a/README.md b/README.md
deleted file mode 100644
index a6b1e56..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# qt6-qtlocation
-
-The qt6-qtlocation package
diff --git a/qt6-qtlocation.spec b/qt6-qtlocation.spec
new file mode 100644
index 0000000..c64cb0f
--- /dev/null
+++ b/qt6-qtlocation.spec
@@ -0,0 +1,143 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG:
https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
+%global qt_module qtlocation
+
+%global unstable 1
+%if 0%{unstable}
+%global prerelease rc
+%endif
+
+Summary: Qt6 - Location component
+Name: qt6-%{qt_module}
+Version: 6.2.0%{?unstable:~%{prerelease}}
+Release: 1%{?dist}
+
+# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
+License: LGPLv2 with exceptions or GPLv3 with exceptions
+Url:
http://www.qt.io
+%global majmin %(echo %{version} | cut -d. -f1-2)
+%global qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/su...
+%else
+Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
+%endif
+
+# build failure with gcc10
+# various C++ runtime headers indirectly included <string> which in turn
+# included <local> and <cerrno>. Those indirect inclusions have been
+# eliminated which in turn forces packages to include the C++ headers they
+# actually need.
+Patch0: qtlocation-gcc10.patch
+
+# filter plugin/qml provides
+%global __provides_exclude_from
^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: ninja-build
+BuildRequires: qt6-rpm-macros
+BuildRequires: qt6-qtbase-devel >= %{version}
+# QtPositioning core-private
+BuildRequires: qt6-qtbase-private-devel
+%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
+BuildRequires: qt6-qtdeclarative-devel >= %{version}
+BuildRequires: qt6-qtserialport-devel >= %{version}
+
+BuildRequires: pkgconfig(dconf)
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(icu-i18n)
+BuildRequires: pkgconfig(libssl)
+BuildRequires: pkgconfig(libcrypto)
+BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+
+%description
+The Qt Location and Qt Positioning APIs gives developers the ability to
+determine a position by using a variety of possible sources, including
+satellite, or wifi, or text file, and so on.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: qt6-qtbase-devel%{?_isa}
+%description devel
+%{summary}.
+
+%package examples
+Summary: Programming examples for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description examples
+%{summary}.
+
+
+%prep
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
+
+
+%build
+# QT is known not to work properly with LTO at this point. Some of the issues
+# are being worked on upstream and disabling LTO should be re-evaluated as
+# we update this change. Until such time...
+# Disable LTO
+%define _lto_cflags %{nil}
+
+%cmake_qt6
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+## .prl/.la file love
+# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
+pushd %{buildroot}%{_qt6_libdir}
+for prl_file in libQt6*.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
+popd
+
+
+%ldconfig_scriptlets
+
+%files
+%license LICENSE.GPL* LICENSE.LGPL*
+%{_qt6_libdir}/libQt6Positioning.so.6*
+%dir %{_qt6_archdatadir}/qml/QtPositioning
+%{_qt6_archdatadir}/qml/QtPositioning/*
+%{_qt6_plugindir}/position/
+%{_qt6_libdir}/libQt6PositioningQuick.so.6*
+
+%files devel
+%{_qt6_headerdir}/QtPositioning/
+%{_qt6_libdir}/libQt6Positioning.so
+%{_qt6_libdir}/libQt6Positioning.prl
+%{_qt6_headerdir}/QtPositioningQuick/
+%{_qt6_libdir}/libQt6PositioningQuick.so
+%{_qt6_libdir}/libQt6PositioningQuick.prl
+%dir %{_qt6_libdir}/cmake/Qt6Positioning
+%{_qt6_libdir}/cmake/Qt6/*.cmake
+%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLocationTestsConfig.cmake
+%{_qt6_libdir}/cmake/Qt6Bundled_Clip2Tri/Qt6Bundled_Clip2TriDependencies.cmake
+%{_qt6_libdir}/cmake/Qt6Positioning/*.cmake
+%{_qt6_libdir}/cmake/Qt6PositioningQuick/*.cmake
+%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
+%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
+%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
+%{_qt6_datadir}/modules/*.json
+
+%files examples
+%{_qt6_examplesdir}/
+
+
+%changelog
+* Thu Sep 16 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
diff --git a/sources b/sources
new file mode 100644
index 0000000..c280db2
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (qtlocation-everywhere-src-6.2.0-rc.tar.xz) =
263ddde1f36440dc8368b37bdba3ab79a71c31f906f2dcb5b3d7ce684957d9f3046affd6d3f67ececbd11438d051d18ac5c2e3410fe4df1aa937f4a0e8130e4c