rpms/qt5-qtlocation
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f21

Browse Source
This commit is contained in:
Rex Dieter 2014-09-17 06:08:14 -05:00
commit ce719d3999
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,3 +1 @@
/qtlocation-opensource-src-5.2.1.tar.xz
/qtlocation-opensource-src-5.3.0.tar.xz
/qtlocation-opensource-src-5.3.1.tar.xz
/qtlocation-opensource-src-5.3.2.tar.xz

20
qt5-qtlocation.spec
View File

@ -5,7 +5,7 @@
Summary: Qt5 - Location component
Name: qt5-%{qt_module}
Version: 5.3.1
Version: 5.3.2
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@ -20,9 +20,15 @@ Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/subm
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(geoclue)
%if 0%{?rhel} < 7
# gyspy currently not available on epel7, https://bugzilla.redhat.com/1069225
%if 0%{?rhel} != 7
BuildRequires: pkgconfig(gypsy)
%define g_value_init_hack 1
# # try to support older glib2 (like el6)
Patch50: qtlocation-opensource-src-5.3.1-G_VALUE_INIT.patch
%else
# G_VALUE_INIT is new in 2.30
BuildRequiers: pkgconfig(glib-2.0) >= 2.30
%endif
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@ -61,6 +67,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
%if 0%{?g_value_init_hack}
%patch50 -p1 -b .G_VALUE_INIT
%endif
%build
%{_qt5_qmake}
@ -123,6 +133,12 @@ popd
%changelog
* Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-1
- 5.3.2
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Jun 17 2014 Jan Grulich <jgrulich@redhat.com> - 5.3.1-1
- 5.3.1

14
qtlocation-opensource-src-5.3.1-G_VALUE_INIT.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.G_VALUE_INIT qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
--- qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp.G_VALUE_INIT 2014-06-19 05:08:32.000000000 -0500
+++ qtlocation-opensource-src-5.3.1/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp 2014-07-24 09:48:59.800638065 -0500
@@ -61,6 +61,10 @@ QT_BEGIN_NAMESPACE
#define MINIMUM_UPDATE_INTERVAL 1000
#define UPDATE_TIMEOUT_COLD_START 120000
+#ifndef G_VALUE_INIT
+#define G_VALUE_INIT { 0 }
+#endif
+
namespace
{

2
sources
View File

@ -1 +1 @@
697731ec5aaf482826495cd419cab4f0 qtlocation-opensource-src-5.3.1.tar.xz
1ad3ee98f6f5d71df8dda14edc06346c qtlocation-opensource-src-5.3.2.tar.xz