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

fix/hack build on epel-6

Browse Source 
otherwise, bump glib2 build-dep to 2.30
This commit is contained in:
Rex Dieter 2014-07-24 10:32:11 -05:00
parent 18ddb13421
commit 79232b89c0
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt5-qtlocation.spec
View File

@ -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}

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
{