From 86612d640b8f7eeb0cc7b530d8302f64ee519d22 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Sun, 27 May 2018 07:27:43 -0500
Subject: [PATCH] 5.11.0 drop old G_INIT_VALUE patch (el6 too old anyway)

---
 .gitignore                                     |  5 +----
 qt5-qtlocation.spec                            | 18 ++++++++----------
 ...ion-opensource-src-5.6.0-G_VALUE_INIT.patch | 13 -------------
 sources                                        |  2 +-
 4 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch

diff --git a/.gitignore b/.gitignore
index 2004d81..fd2daed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/qtlocation-opensource-src-5.9.1.tar.xz
-/qtlocation-opensource-src-5.9.2.tar.xz
-/qtlocation-opensource-src-5.9.3.tar.xz
-/qtlocation-everywhere-src-5.10.0.tar.xz
 /qtlocation-everywhere-src-5.10.1.tar.xz
+/qtlocation-everywhere-src-5.11.0.tar.xz
diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec
index 9e2058d..cb5d59f 100644
--- a/qt5-qtlocation.spec
+++ b/qt5-qtlocation.spec
@@ -2,21 +2,18 @@
 
 Summary: Qt5 - Location component
 Name:    qt5-%{qt_module}
-Version: 5.10.1
-Release: 4%{?dist}
+Version: 5.11.0
+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
-Source0: https://download.qt.io/official_releases/qt/5.10/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
 
 # filter plugin/qml provides
 %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
 
-## upstreamable patches
-# try to support older glib2 (like el6)
-Patch50: qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
-
 BuildRequires: qt5-qtbase-devel >= 5.9.0
 # QtPositioning core-private
 BuildRequires: qt5-qtbase-private-devel
@@ -49,8 +46,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{version}
-## G_VALUE_INIT is new in glib-2.30+ only
-%patch50 -p1 -b .G_VALUE_INIT
 
 
 %build
@@ -103,12 +98,15 @@ popd
 %{_qt5_libdir}/cmake/Qt5Positioning/Qt5Positioning*.cmake
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
 
-
 %files examples
 %{_qt5_examplesdir}/
 
 
 %changelog
+* Sun May 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
+- 5.11.0
+- drop old G_INIT_VALUE patch (el6 too old anyway)
+
 * Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 5.10.1-4
 - Rebuild for ICU 61.1
 
diff --git a/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch b/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
deleted file mode 100644
index 4ed7bec..0000000
--- a/qtlocation-opensource-src-5.6.0-G_VALUE_INIT.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qtlocation-opensource-src-5.6.0-beta1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp	2015-11-03 12:20:38.000000000 -0200
-+++ qtlocation-opensource-src-5.6.0-beta1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.new	2015-11-10 16:04:55.661725365 -0200
-@@ -57,6 +57,10 @@
- #define MINIMUM_UPDATE_INTERVAL 1000
- #define UPDATE_TIMEOUT_COLD_START 120000
- 
-+#ifndef G_VALUE_INIT
-+#define G_VALUE_INIT  { 0 }
-+#endif
-+
- QT_BEGIN_NAMESPACE
- 
- namespace
diff --git a/sources b/sources
index f1b4b80..d77ba6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtlocation-everywhere-src-5.10.1.tar.xz) = c804de1026d8fd1d98aae2d8ac9e9383414f3d3316637463a059c2ed56e39d66d48126a2ad421df1a747cb4629fa4520a0ff18f56a5597fb6f73e8da7352fa0d
+SHA512 (qtlocation-everywhere-src-5.11.0.tar.xz) = 92caa91172a0d0a1662cbe26b8d40d7f120c09f97456c48a9b9092a8b2e91aab74e31e273efabca9730d44f79eb3b2b7e2754cf6594f01291e8c1df5d133e363