[packages/gpsbabel] - stick to qt5 by default to have map preview on x86 and consistent qt versions across archs

qboosh qboosh at pld-linux.org
Wed Jun 26 22:19:34 CEST 2024


commit 5b53db59646154a8ba96c16af2242a52b47113b1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jun 26 22:15:26 2024 +0200

    - stick to qt5 by default to have map preview on x86 and consistent qt versions across archs

 gpsbabel.spec | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/gpsbabel.spec b/gpsbabel.spec
index 04b1681..9ceddaa 100644
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -1,18 +1,23 @@
 #
 # Conditional build:
 %bcond_without	doc		# HTML documentation
-%bcond_with	qt5		# Qt5 instead of Qt6
+%bcond_without	qt5		# Qt5 instead of Qt6
 %bcond_without	qtwebengine	# map preview using Qt WebEngine
 #
 %define		qt5_ver	5.12
 %define		qt6_ver	6.0
 %define         fver	%(echo %{version} | tr . _)
 
-# disable qt5 on x32 until qt5-qtwebengine builds
-# (python segfaults as of 20181212)
-%ifarch x32
+# Qt WebEngine has limited availability
+%if %{with qt5}
+%ifnarch %{ix86} %{x8664} %{arm} aarch64
 %undefine with_qtwebengine
 %endif
+%else
+%ifnarch %{x8664} aarch64
+%undefine with_qtwebengine
+%endif
+%endif
 
 Summary:	GPSBabel - convert GPS waypoint, route and track data
 Summary(pl.UTF-8):	GPSBabel - konwertowanie danych GPS: waypointów, tras i śladów
@@ -133,7 +138,8 @@ cd ..
 
 %if %{with doc}
 # docs generation requires in-source build
-%cmake .
+%cmake . \
+	%{!?with_qtwebengine:-DGPSBABEL_MAPPREVIEW=OFF}
 
 %{__make} gpsbabel.html
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gpsbabel.git/commitdiff/5b53db59646154a8ba96c16af2242a52b47113b1



More information about the pld-cvs-commit mailing list