Sync from SUSE:ALP:Source:Standard:1.0 libqt5-qtlocation revision 45e49c39616e736feb45e5417da453b6
This commit is contained in:
parent
8ed15267e4
commit
714a03d63b
@ -1,26 +0,0 @@
|
||||
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 6d01a9a3..d1e623a1 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": {
|
||||
--
|
||||
2.42.0
|
||||
|
4
_service
4
_service
@ -1,12 +1,12 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="versionformat">5.15.11+kde@TAG_OFFSET@</param>
|
||||
<param name="versionformat">5.15.12+kde@TAG_OFFSET@</param>
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtlocation.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">qtlocation-everywhere-src</param>
|
||||
<param name="revision">kde/5.15</param>
|
||||
<param name="parent-tag">v5.15.11-lts-lgpl</param>
|
||||
<param name="parent-tag">v5.15.12-lts-lgpl</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
|
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtlocation.git</param>
|
||||
<param name="changesrevision">b4c42e255ee0f04eec4cf5cde35398f3c303ddb9</param></service></servicedata>
|
||||
<param name="changesrevision">5b27b8921f1f2de93573df903c47aee634209f80</param></service></servicedata>
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 29 13:29:13 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.12+kde6, rebased upstream:
|
||||
* Fix HereMap plugin not supporting authentication via apiKey
|
||||
* Fix build of Qt.labs.location QML plugin
|
||||
* PositionSource: fix lastKnownPosition request at startup
|
||||
* Bump version to 5.15.12
|
||||
- Drop patches, now upstream:
|
||||
* 0001-Fix-build-of-Qt.labs.location-QML-plugin.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 6 06:40:54 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
@ -22,11 +22,11 @@
|
||||
%define qt5_snapshot 1
|
||||
%define libname libQt5Positioning5
|
||||
%define base_name libqt5
|
||||
%define real_version 5.15.11
|
||||
%define so_version 5.15.11
|
||||
%define real_version 5.15.12
|
||||
%define so_version 5.15.12
|
||||
%define tar_version qtlocation-everywhere-src-%{version}
|
||||
Name: libqt5-qtlocation
|
||||
Version: 5.15.11+kde4
|
||||
Version: 5.15.12+kde6
|
||||
Release: 0
|
||||
Summary: Qt 5 Location Library
|
||||
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
|
||||
@ -34,8 +34,6 @@ Group: Development/Libraries/X11
|
||||
URL: https://www.qt.io
|
||||
Source: %{tar_version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
# https://invent.kde.org/qt/qt/qtlocation/-/merge_requests/4
|
||||
Patch1: 0001-Fix-build-of-Qt.labs.location-QML-plugin.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libqt5-qtbase-private-headers-devel >= %{real_version}
|
||||
|
BIN
qtlocation-everywhere-src-5.15.11+kde4.obscpio
(Stored with Git LFS)
BIN
qtlocation-everywhere-src-5.15.11+kde4.obscpio
(Stored with Git LFS)
Binary file not shown.
BIN
qtlocation-everywhere-src-5.15.12+kde6.obscpio
(Stored with Git LFS)
Normal file
BIN
qtlocation-everywhere-src-5.15.12+kde6.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
name: qtlocation-everywhere-src
|
||||
version: 5.15.11+kde4
|
||||
mtime: 1696453125
|
||||
commit: b4c42e255ee0f04eec4cf5cde35398f3c303ddb9
|
||||
version: 5.15.12+kde6
|
||||
mtime: 1703803143
|
||||
commit: 5b27b8921f1f2de93573df903c47aee634209f80
|
||||
|
Loading…
Reference in New Issue
Block a user