.gitignore

@@ -5,4 +5,3 @@ xastir-1.9.8.tar.gz
 /xastir-2.0.8.tar.gz
 /Release-2.1.0.tar.gz
 /Release-2.1.4.tar.gz
-/Release-2.2.0.tar.gz

org.xastir.Xastir.metainfo.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>org.xastir.Xastir</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0</project_license>
-
-  <name>Xastir</name>
-  <summary>APRS client</summary>
-  <description>
-    <p>
-      Xastir is a graphical application that interfaces HAM radio and internet access to realtime mapping software.
-    </p>
-
-    <p>
-      Automatic Packet Reporting System (APRS) is an amateur radio based digital communication system for real-time exchange
-      of digital information to users on the network.
-    </p>
-  </description>
-
-  <launchable type="desktop-id">xastir.desktop</launchable>
-
-  <screenshots>
-    <screenshot type="default">
-      <caption>Main window</caption>
-      <image>https://xastir.org/images/51875.jpg</image>
-    </screenshot>
-  </screenshots>
-
-  <url type="homepage">https://xastir.org</url>
-  <url type="bugtracker">https://github.com/Xastir/Xastir/issues</url>
-
-  <content_rating type="oars-1.1" />
-</component>

sources

@@ -1 +1 @@
-SHA512 (Release-2.2.0.tar.gz) = d420118e9118ff837d72f17e78563c7e9d39cfcaf05fe12cbf51b50ed36b9307e4b33b0e8a0d056c504a280683c6eb97637e9c4fec3bf1f0d920cb46f6e2cc0b
+SHA512 (Release-2.1.4.tar.gz) = e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1

xastir.spec

@@ -1,18 +1,16 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Epoch:   1
-Version: 2.2.0
-Release: 11%{?dist}
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License: GPL-2.0-or-later
+Version: 2.1.4
+Release: 13%{?dist}
+License: GPLv2+
 Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
-Source3: %{name}.svg
-Source4: org.xastir.Xastir.metainfo.xml
+# Fix GCC10 FTBFS
+Patch0:  xastir_gcc10.patch
 URL:     http://www.xastir.org
 Requires: wget
-Requires: hicolor-icon-theme
 BuildRequires: make
 BuildRequires: perl-generators
 BuildRequires: wget, libXt-devel, GraphicsMagick-devel
@@ -21,10 +19,9 @@ BuildRequires: motif-devel
 %else
 BuildRequires: lesstif-devel
 %endif
-BuildRequires: dos2unix, libax25-devel, curl-devel, proj-devel, libXpm-devel
-BuildRequires: python3-devel, gdal-devel, libdb-devel
+BuildRequires: dos2unix, libax25-devel, curl-devel, pcre-devel, proj-devel
+BuildRequires: python3-devel, gpsman, gdal-devel, libdb-devel
 BuildRequires: desktop-file-utils, xfontsel, hdf5-devel
-BuildRequires: autoconf, automake, shapelib-devel
 
 %description
 Xastir is a graphical application that interfaces HAM radio
@@ -35,10 +32,10 @@ software.
 
 %prep
 %setup -q -n Xastir-Release-%{version}
-touch -r configure.ac aclocal.m4 Makefile.in config.h.in
+%patch0 -p1
 
 %build
-./bootstrap.sh
+#./bootstrap.sh
 %configure --with-geotiff=/usr/include/libgeotiff
 make %{?_smp_mflags}
 for f in README ChangeLog ; do
@@ -48,6 +45,7 @@ for f in README ChangeLog ; do
     rm -f $f.iso88591
 done
 dos2unix -k scripts/toporama250k.pl
+sed -i -e "s@#!/usr/bin/env python@#!/usr/bin/env python3@" scripts/Xastir_tigerpoly.py
 
 %install
 rm -rf %{buildroot}
@@ -59,11 +57,10 @@ rm -rf %{buildroot}/usr/share/doc
 rm %{buildroot}/usr/share/xastir/scripts/gpx2shape
 #strip exec bit from .pm files
 find %{buildroot} -type f -name '*.pm' -exec chmod -x {} 2>/dev/null ';'
-install -D -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
-install -D -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+mkdir -p %{buildroot}/usr/share/pixmaps/
+cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.metainfo.xml
 
 %files
 %{_bindir}/xastir
@@ -75,63 +72,12 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met
 %{_mandir}/man1/testdbfawk.*
 %{_datadir}/xastir
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/applications/%{name}.desktop
-%{_metainfodir}/org.xastir.Xastir.metainfo.xml
 %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE
-%doc README
+%doc README README.Getting-Started
 %doc README.MAPS UPGRADE
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Apr 17 2026 Orion Poplawski <orion@nwra.com> - 1:2.2.0-10
-- Rebuild for hdf5 2.1
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 1:2.2.0-6
-- Rebuild for hdf5 1.14.5
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1:2.2.0-5
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 24 2023 Sandro Mani <manisandro@gmail.com> - 1:2.2.0-2
-- Rebuild (shapelib)
-
-* Wed Nov 01 2023 Lucian Langa <lucilanga@7pot.org> - 1:2.2.0-1
-- drop pcre
-- re-add shapelib depdency - interal shapelib dropped upstream
-- drop all patches - fixed upstream
-- upgrade to latest upstream
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.4-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 30 2023 Daniel Rusek <mail@asciiwolf.com> - 1:2.1.4-16
-- Added AppStream metadata, better icon
-  Resolves: rhbz#2218927
-
-* Tue Apr 25 2023 DJ Delorie <dj@redhat.com> - 1:2.1.4-15
-- Fix C99 compatibility issue
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.4-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

xastir.svg

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.0"
-   width="128.000000pt"
-   height="128.000000pt"
-   viewBox="0 0 128.000000 128.000000"
-   preserveAspectRatio="xMidYMid meet"
-   id="svg16"
-   sodipodi:docname="xastir.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs20" />
-  <sodipodi:namedview
-     id="namedview18"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="pt"
-     showgrid="false"
-     inkscape:zoom="4.5820313"
-     inkscape:cx="85.333332"
-     inkscape:cy="85.333332"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg16" />
-  <metadata
-     id="metadata2">
-Created by potrace 1.16, written by Peter Selinger 2001-2019
-</metadata>
-  <rect
-     style="fill:#ffffff;stroke-width:0.740582"
-     id="rect178"
-     width="128"
-     height="128"
-     x="-1.110223e-16"
-     y="-4.4408921e-16" />
-  <g
-     transform="translate(0.000000,128.000000) scale(0.100000,-0.100000)"
-     fill="#000000"
-     stroke="none"
-     id="g14">
-    <path
-       d="M730 1230 c0 -11 6 -20 13 -20 8 0 26 -15 42 -34 26 -31 55 -38 55 -14 0 15 -80 88 -96 88 -8 0 -14 -9 -14 -20z"
-       id="path4" />
-    <path
-       d="M1040 1221 c-14 -17 -30 -30 -36 -31 -18 0 -24 -27 -10 -39 9 -8 20 -2 42 22 16 18 37 36 47 40 10 4 17 13 15 20 -8 23 -33 18 -58 -12z"
-       id="path6" />
-    <path
-       d="M890 958 c1 -73 1 -139 1 -146 -1 -10 -22 -13 -87 -11 l-86 2 -74 -71 c-41 -38 -74 -73 -74 -76 0 -3 -16 -22 -36 -42 l-37 -36 -209 1 -210 2 -25 -27 c-24 -26 -25 -32 -21 -112 4 -76 3 -85 -14 -90 -12 -3 -18 -14 -18 -33 0 -24 4 -28 33 -31 30 -3 32 -5 32 -43 0 -35 7 -47 55 -94 51 -51 58 -55 105 -56 48 0 52 2 105 55 37 37 55 63 55 80 l0 25 225 0 225 0 -3 -23 c-3 -17 11 -37 55 -79 54 -53 61 -56 111 -58 28 -1 52 2 52 6 0 11 79 89 90 89 5 0 10 16 10 35 l0 35 65 0 65 0 0 29 c0 20 -6 31 -17 33 -15 3 -16 20 -15 156 2 127 0 154 -13 158 -8 4 -15 19 -15 35 0 15 -6 32 -14 36 -8 4 -16 26 -18 48 l-3 40 -127 3 -128 3 0 144 c0 139 -1 145 -20 145 -20 0 -21 -5 -20 -132z m35 -353 c0 -136 -2 -160 -15 -160 -12 0 -15 17 -15 90 0 50 -4 96 -8 103 -16 25 -27 0 -27 -64 l0 -66 -40 3 c-49 4 -55 -2 -55 -53 l0 -41 -77 -2 c-47 -1 -79 3 -81 9 -5 17 -1 72 7 84 13 21 46 13 56 -14 18 -46 35 -22 37 49 1 58 -1 67 -17 67 -10 0 -20 -9 -23 -20 -7 -26 -34 -25 -63 3 -24 22 -32 47 -14 47 5 0 36 27 69 60 l60 59 83 4 c46 2 92 3 103 3 19 -1 20 -9 20 -161z m223 127 c2 -20 9 -32 18 -32 9 0 14 -12 15 -37 1 -21 2 -56 3 -78 l1 -40 -110 0 -110 0 -3 99 c-1 55 -1 104 1 110 3 7 39 11 93 10 l89 -1 3 -31z"
-       id="path8" />
-    <path
-       d="M766 1019 c-23 -24 -36 -45 -32 -54 8 -22 18 -19 50 20 16 19 35 35 43 35 7 0 13 9 13 20 0 31 -30 22 -74 -21z"
-       id="path10" />
-    <path
-       d="M985 1050 c-6 -10 78 -100 94 -100 22 0 20 50 -2 50 -7 1 -23 14 -37 30 -25 31 -44 38 -55 20z"
-       id="path12" />
-  </g>
-</svg>

xastir_gcc10.patch

@@ -0,0 +1,45 @@
+diff -rupN Xastir-Release-2.1.4/src/main.c Xastir-Release-2.1.4-new/src/main.c
+--- Xastir-Release-2.1.4/src/main.c	2019-07-15 00:30:31.000000000 +0200
++++ Xastir-Release-2.1.4-new/src/main.c	2020-03-03 18:49:45.912293773 +0100
+@@ -266,6 +266,8 @@ uid_t euid;
+ gid_t egid;
+ 
+ 
++char xa_config_dir[1000];
++
+ int   my_argc;
+ char **my_argv;
+ char **my_envp;
+diff -rupN Xastir-Release-2.1.4/src/objects.h Xastir-Release-2.1.4-new/src/objects.h
+--- Xastir-Release-2.1.4/src/objects.h	2019-07-15 00:30:31.000000000 +0200
++++ Xastir-Release-2.1.4-new/src/objects.h	2020-03-03 18:41:57.644094783 +0100
+@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, "
+ //
+ // number_of_predefined_objects holds the actual number of predefined
+ // objects available to display on the Create/Move popup menu.
+-int number_of_predefined_objects;
++extern int number_of_predefined_objects;
+ // File name of ~/.xastir/config file containing definitions for
+ // a predefined object menu.
+ extern char predefined_object_definition_filename[256];
+diff -rupN Xastir-Release-2.1.4/src/xa_config.h Xastir-Release-2.1.4-new/src/xa_config.h
+--- Xastir-Release-2.1.4/src/xa_config.h	2019-07-15 00:30:31.000000000 +0200
++++ Xastir-Release-2.1.4-new/src/xa_config.h	2020-03-03 18:37:18.923499568 +0100
+@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir);
+ void save_data(void);
+ void load_data_or_default(void);
+ 
+-char xa_config_dir[1000];       /* cmdline option user config dir */
++extern char xa_config_dir[1000];       /* cmdline option user config dir */
+diff -rupN Xastir-Release-2.1.4/src/x_spider.h Xastir-Release-2.1.4-new/src/x_spider.h
+--- Xastir-Release-2.1.4/src/x_spider.h	2019-07-15 00:30:31.000000000 +0200
++++ Xastir-Release-2.1.4-new/src/x_spider.h	2020-03-03 18:41:33.166133201 +0100
+@@ -31,7 +31,7 @@
+ #define SERV_UDP_PORT       2023
+ 
+ 
+-char *pname;
++extern char *pname;
+ extern int pipe_xastir_to_tcp_server;
+ extern int pipe_tcp_server_to_xastir;
+ extern int pipe_xastir_to_udp_server;