From 79342db415111e5c9d2dd29270cd76ffe30fee55 Mon Sep 17 00:00:00 2001
From: Thomas Sailer <sailer@tsailer.ch>
Date: Jan 12 2021 21:26:24 +0000
Subject: disable osmium for now due to inability for g++11 to compile osmium in C++17 mode


---

diff --git a/vfrnav-gps9.patch b/vfrnav-gps9.patch
deleted file mode 100644
index d0b5448..0000000
--- a/vfrnav-gps9.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up vfrnav-20200427/src/Navigate.cc.orig vfrnav-20200427/src/Navigate.cc
---- vfrnav-20200427/src/Navigate.cc.orig	2020-05-01 09:11:44.000000000 +0200
-+++ vfrnav-20200427/src/Navigate.cc	2020-06-18 13:04:58.205712686 +0200
-@@ -1109,7 +1109,11 @@ Navigate::GPSCommGPSD::fixstatus_t Navig
- 
- double Navigate::GPSCommGPSD::get_fixtime(void) const
- {
-+#if GPSD_API_MAJOR_VERSION >= 9
-+        return m_gpsdata.fix.time.tv_sec + m_gpsdata.fix.time.tv_nsec / 1e9;
-+#else
-         return m_gpsdata.fix.time;
-+#endif
- }
- 
- Point Navigate::GPSCommGPSD::get_coord(void) const
diff --git a/vfrnav.spec b/vfrnav.spec
index b142bba..35edb61 100644
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@ -9,8 +9,10 @@ Source0:        https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%
 
 %bcond_without webservice
 %bcond_with wetterdl
+%bcond_with osmium
 
-BuildRequires: make
+BuildRequires:  make
+BuildRequires:  autoconf-archive
 BuildRequires:  gtkmm30-devel
 BuildRequires:  libxml++-devel >= 2.14.0
 BuildRequires:  sqlite-devel >= 3.0
@@ -70,7 +72,9 @@ BuildRequires:  selinux-policy-devel
 BuildRequires:  qrencode-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  yaml-cpp-devel
+%if %{with osmium}
 BuildRequires:  libosmium-devel
+%endif
 BuildRequires:  protozero-devel
 BuildRequires:  utf8cpp-devel
 BuildRequires:  expat-devel
@@ -424,9 +428,11 @@ fi
 %{_bindir}/vfrnavgrib2fcst
 %{_bindir}/vfrdbbasulmimport
 %{_bindir}/vfrnavmodes
+%if %{with osmium}
 %{_bindir}/osmbdry2shp
 %{_bindir}/osm2odb
 %{_bindir}/osm2sdb
+%endif
 %{_bindir}/odbquery
 %{_bindir}/sdbquery
 %{_bindir}/cartoquery
@@ -463,6 +469,7 @@ fi
 %changelog
 * Mon Jan 11 2021 Thomas Sailer <t.sailer@alumni.ethz.ch> - 20201231-1
 - update to 20201231
+- make osmium conditional and disable for now as libosmium-devel is broken with g++ 11
 
 * Wed Nov 11 13:13:38 CET 2020 Sandro Mani <manisandro@gmail.com> - 20200429-4
 - Rebuild (proj, gdal)