[packages/qlandkartegt] - added patch for gpsd 3.20+, updated dependensies; release 7

[qboosh]

commit c4dd87ee1b25a25334ac952d5bc320ec39962188
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 23 13:20:26 2024 +0200

    - added patch for gpsd 3.20+, updated dependensies; release 7

 gpsd-3.20.patch   | 20 ++++++++++++++++++++
 qlandkartegt.spec | 50 ++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 60 insertions(+), 10 deletions(-)
---
diff --git a/qlandkartegt.spec b/qlandkartegt.spec
index f7ea693..61c8b23 100644
--- a/qlandkartegt.spec
+++ b/qlandkartegt.spec
@@ -6,29 +6,36 @@ Summary:	Garmin's MapSource clone for Linux
 Summary(pl.UTF-8):	Klon MapSource pod Linuksa
 Name:		qlandkartegt
 Version:	1.8.1
-Release:	6
+Release:	7
 License:	GPL v2
 Group:		X11/Applications
 Source0:	https://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 # Source0-md5:	2bfe90aff7e21b19572b7b250d76a540
 Patch0:		gcc8.patch
 Patch1:		gpsd-3.19.patch
+Patch2:		gpsd-3.20.patch
 URL:		http://qlandkarte.org/
+BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	QtCore-devel >= 4.6.0
 BuildRequires:	QtDBus-devel >= 4.6.0
-BuildRequires:	QtGui-devel
-BuildRequires:	QtNetwork-devel
+BuildRequires:	QtGui-devel >= 4.6.0
+BuildRequires:	QtNetwork-devel >= 4.6.0
 BuildRequires:	QtOpenGL-devel >= 4.6.0
 BuildRequires:	QtSql-devel >= 4.6.0
 BuildRequires:	QtWebKit-devel >= 4.6.0
-BuildRequires:	QtXml-devel
+BuildRequires:	QtXml-devel >= 4.6.0
 BuildRequires:	cmake >= 2.6.0
 BuildRequires:	gdal-devel
-BuildRequires:	libusb-devel
+BuildRequires:	gpsd-devel >= 3.20
+BuildRequires:	libdmtx-devel
+BuildRequires:	libexif-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	proj-devel
 BuildRequires:	qt4-build >= 4.6.0
-BuildRequires:	qt4-linguist
+BuildRequires:	qt4-linguist >= 4.6.0
 BuildRequires:	qt4-qmake >= 4.6.0
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		filterout	-flto
@@ -43,6 +50,7 @@ Klon MapSource pod Linuksa.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
@@ -61,17 +69,39 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_datadir}/qlandkartegt,%{_libdir}}
 cp build/lib/*.so $RPM_BUILD_ROOT%{_libdir}
 
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/qlandkartegt/translations/qlandkartegt_{es_ES,es}.qm
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/qlandkartegt/translations/qlandkartegt_{it_IT,it}.qm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc INSTALL changelog.txt
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/cache2gtiff
+%attr(755,root,root) %{_bindir}/map2gcm
+%attr(755,root,root) %{_bindir}/map2jnx
+%attr(755,root,root) %{_bindir}/map2rmap
+%attr(755,root,root) %{_bindir}/map2rmp
+%attr(755,root,root) %{_bindir}/qlandkartegt
 %dir %{_datadir}/qlandkartegt
 %dir %{_datadir}/qlandkartegt/translations
-%{_datadir}/qlandkartegt/translations/*.qm
-%attr(755,root,root) %{_libdir}/*.so
+%lang(cs) %{_datadir}/qlandkartegt/translations/qlandkartegt_cs.qm
+%lang(de) %{_datadir}/qlandkartegt/translations/qlandkartegt_de.qm
+%lang(es) %{_datadir}/qlandkartegt/translations/qlandkartegt_es.qm
+%lang(fr) %{_datadir}/qlandkartegt/translations/qlandkartegt_fr.qm
+%lang(it) %{_datadir}/qlandkartegt/translations/qlandkartegt_it.qm
+%lang(nl) %{_datadir}/qlandkartegt/translations/qlandkartegt_nl.qm
+%lang(ru) %{_datadir}/qlandkartegt/translations/qlandkartegt_ru.qm
+%attr(755,root,root) %{_libdir}/libSerialPort.so
+%attr(755,root,root) %{_libdir}/libqextserialport.so
+%attr(755,root,root) %{_libdir}/libqtexthtmlexporter.so
+%attr(755,root,root) %{_libdir}/libqtsoap.so
+%attr(755,root,root) %{_libdir}/libqzip.so
+%attr(755,root,root) %{_libdir}/libtzone.so
 %{_desktopdir}/qlandkartegt.desktop
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/qlandkartegt.1*
 %{_pixmapsdir}/qlandkartegt.png
diff --git a/gpsd-3.20.patch b/gpsd-3.20.patch
new file mode 100644
index 0000000..e7ee40a
--- /dev/null
+++ b/gpsd-3.20.patch
@@ -0,0 +1,20 @@
+--- qlandkartegt-1.8.1/src/CDeviceGPSD.cpp.orig	2024-06-23 12:45:57.679963814 +0200
++++ qlandkartegt-1.8.1/src/CDeviceGPSD.cpp	2024-06-23 12:49:29.844582606 +0200
+@@ -235,7 +235,7 @@ void CGPSDThread::run()
+ bool CGPSDThread::decodeData()
+ {
+     // see, if it's interesting
+-    if( gpsdata->fix.time == 0 )
++    if( gpsdata->fix.time.tv_sec == 0 )
+         return true;
+     static const gps_mask_t interesting_mask = TIME_SET | LATLON_SET
+         | ALTITUDE_SET | SPEED_SET | TRACK_SET | STATUS_SET | MODE_SET
+@@ -265,7 +265,7 @@ bool CGPSDThread::decodeData()
+     current_log.lon = gpsdata->fix.longitude;
+     current_log.lat = gpsdata->fix.latitude;
+     current_log.ele = gpsdata->fix.altitude;
+-    current_log.timestamp = gpsdata->fix.time;
++    current_log.timestamp = gpsdata->fix.time.tv_sec;
+     current_log.error_horz = gpsdata->fix.epx;
+     current_log.error_vert = gpsdata->fix.epv;
+     current_log.heading = gpsdata->fix.track;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qlandkartegt.git/commitdiff/c4dd87ee1b25a25334ac952d5bc320ec39962188