corsepiu pushed to qtgpsc (master). "Reflect libgps API having changed (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 10 13:08:42 UTC 2015


>From b92a3b87639b84bd78fcb7e8f15ecb72456c68d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Fri, 10 Apr 2015 15:07:00 +0200
Subject: Reflect libgps API having changed

  (Add qtqpsc-0.3.1-libgps6.patch; Fix FTBFS RHBZ #1210727).

diff --git a/qtgpsc-0.3.1-libgps6.patch b/qtgpsc-0.3.1-libgps6.patch
new file mode 100644
index 0000000..bc7117c
--- /dev/null
+++ b/qtgpsc-0.3.1-libgps6.patch
@@ -0,0 +1,31 @@
+--- qtgpsc-0.3.1.orig/src/qtgpsc.cpp	2010-09-07 14:48:00.000000000 +0200
++++ qtgpsc-0.3.1/src/qtgpsc.cpp	2015-04-10 14:31:34.390891953 +0200
+@@ -286,16 +286,28 @@
+     QList<int> visible;
+     
+     for (int n=0; n<gpsd.gpsData()->satellites_used; n++) {
++#if (GPSD_API_MAJOR_VERSION >= 6)
++        visible.append(gpsd.gpsData()->skyview[n].used);
++#else
+         visible.append(gpsd.gpsData()->used[n]);
++#endif
+     }
+     
+     for (int n=0; n<gpsd.gpsData()->satellites_visible; n++) {
+         satlist.append(Satellite(
++#if (GPSD_API_MAJOR_VERSION >= 6)
++            gpsd.gpsData()->skyview[n].PRN,
++            gpsd.gpsData()->skyview[n].azimuth,
++            gpsd.gpsData()->skyview[n].elevation,
++            gpsd.gpsData()->skyview[n].ss,
++            visible.contains(gpsd.gpsData()->skyview[n].PRN),
++#else
+             gpsd.gpsData()->PRN[n],
+             gpsd.gpsData()->azimuth[n],
+             gpsd.gpsData()->elevation[n],
+             gpsd.gpsData()->ss[n],
+             visible.contains(gpsd.gpsData()->PRN[n]),
++#endif
+             true
+         ));
+     }
diff --git a/qtgpsc.spec b/qtgpsc.spec
index 30f9c95..b75c78a 100644
--- a/qtgpsc.spec
+++ b/qtgpsc.spec
@@ -1,12 +1,13 @@
 Name:           qtgpsc
 Version:        0.3.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A client for the gpsd GPS server
 
 License:        GPLv3
 URL:            http://code.google.com/p/qtgpsc/
 Source0:        http://qtgpsc.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+Patch0:         %{name}-0.3.1-libgps6.patch
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -21,6 +22,7 @@ It can also show the raw GPS data in GPSD or NMEA format.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %cmake
@@ -51,6 +53,10 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 %changelog
+* Fri Apr 10 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.3.1-12
+- Reflect libgps API having changed
+  (Add qtqpsc-0.3.1-libgps6.patch; Fix FTBFS RHBZ #1210727).
+
 * Mon Mar 09 2015 Fabian Affolter <mail at fabian-affolter.ch> - 0.3.1-11
 - Rebuilt (libgps)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qtgpsc.git/commit/?h=master&id=b92a3b87639b84bd78fcb7e8f15ecb72456c68d9


More information about the scm-commits mailing list