diff --git a/.gitignore b/.gitignore index 8573b93..05704c8 100644 --- a/.gitignore +++ b/.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 diff --git a/sources b/sources index 0eb8d81..3f2aac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Release-2.2.0.tar.gz) = d420118e9118ff837d72f17e78563c7e9d39cfcaf05fe12cbf51b50ed36b9307e4b33b0e8a0d056c504a280683c6eb97637e9c4fec3bf1f0d920cb46f6e2cc0b +SHA512 (Release-2.1.4.tar.gz) = e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 diff --git a/xastir-fedora-c99-1.patch b/xastir-fedora-c99-1.patch new file mode 100644 index 0000000..1d78ba5 --- /dev/null +++ b/xastir-fedora-c99-1.patch @@ -0,0 +1,39 @@ +From 54447a68547fe3ea78668bbf290c5e19e2bc282f Mon Sep 17 00:00:00 2001 +From: Tom Russo +Date: Mon, 1 Feb 2021 10:23:00 -0700 +Subject: Fix autoconf probe for motif library + +The code for probing Motif tried to link a small test program that +uses XmGetDestination. This was done with no prologue including any +Motif headers, nor with all the correct arguments for +XmGetDestination. + +If a user is compiling Xastir using any CFLAG that includes "-Werror", +or if the compiler is excessively strict, this fails. + +This commit adds the prologue needed to get the correct prototype for +XmGetDestination, then calls it with the correct prototype in the test +program. + +This eliminates the warning on my system and should eliminate the +failure on systems where -Werror has somehow been forced into the +CFLAGS or otherwise enabled. It seems to be that way for at least one +Mac user after a recent upgrade. + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8f026710..18b2530c 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -845,7 +845,11 @@ AC_PREPROC_IFELSE( + # Don't add to $LIBS permanently. + ac_save_LIBS="$LIBS" + LIBS="-l$xm_direct_test_library $LIBS" +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[${xm_direct_test_function}()]])], ++AC_LINK_IFELSE([AC_LANG_PROGRAM([ ++ [#include <$xm_direct_test_include> ++ #include ++ ]], ++ [[Display *foobar; ${xm_direct_test_function}(foobar)]])], + [ + LIBS="$ac_save_LIBS" + # We can link Motif programs with no special library path. diff --git a/xastir-fedora-c99-2.patch b/xastir-fedora-c99-2.patch new file mode 100644 index 0000000..146b5f8 --- /dev/null +++ b/xastir-fedora-c99-2.patch @@ -0,0 +1,39 @@ +diff -rup a/configure.ac b/configure.ac +--- a/configure.ac 2019-07-14 18:30:31.000000000 -0400 ++++ b/configure.ac 2023-04-25 16:42:30.079301542 -0400 +@@ -647,7 +647,7 @@ save_LDFLAGS="$LDFLAGS" + LDFLAGS="-Wl,--no-keep-memory $LDFLAGS" + AC_TRY_LINK([#include ], + [/* Stupid useless test for linker flags */ +- exit(0);], ++ return(0);], + xa_cv_no_keep_memory=yes, + xa_cv_no_keep_memory=no) + if test "${xa_cv_no_keep_memory}" = "no"; then +diff -rup a/configure b/configure +--- a/configure 2019-07-14 18:30:31.000000000 -0400 ++++ b/configure 2023-04-26 00:06:26.217336733 -0400 +@@ -8762,11 +8762,12 @@ $as_echo_n "checking for Motif libraries + LIBS="-l$xm_direct_test_library $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include <$xm_direct_test_include> ++#include + int + main () + { +-${xm_direct_test_function}() ++Display *foobar; ${xm_direct_test_function}(foobar) + ; + return 0; + } +@@ -12818,7 +12819,7 @@ int + main () + { + /* Stupid useless test for linker flags */ +- exit(0); ++ return(0); + ; + return 0; + } diff --git a/xastir.spec b/xastir.spec index f7c9c6d..e022a34 100644 --- a/xastir.spec +++ b/xastir.spec @@ -1,15 +1,18 @@ 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: 17%{?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 +Patch1: xastir-fedora-c99-1.patch +Patch2: xastir-fedora-c99-2.patch URL: http://www.xastir.org Requires: wget Requires: hicolor-icon-theme @@ -21,10 +24,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 +37,13 @@ software. %prep %setup -q -n Xastir-Release-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 touch -r configure.ac aclocal.m4 Makefile.in config.h.in %build -./bootstrap.sh +#./bootstrap.sh %configure --with-geotiff=/usr/include/libgeotiff make %{?_smp_mflags} for f in README ChangeLog ; do @@ -48,6 +53,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} @@ -79,46 +85,10 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %{_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 - 1:2.2.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Fri Apr 17 2026 Orion Poplawski - 1:2.2.0-10 -- Rebuild for hdf5 2.1 - -* Sat Jan 17 2026 Fedora Release Engineering - 1:2.2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1:2.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1:2.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Oct 25 2024 Orion Poplawski - 1:2.2.0-6 -- Rebuild for hdf5 1.14.5 - -* Fri Jul 26 2024 Miroslav Suchý - 1:2.2.0-5 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1:2.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1:2.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Dec 24 2023 Sandro Mani - 1:2.2.0-2 -- Rebuild (shapelib) - -* Wed Nov 01 2023 Lucian Langa - 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 - 1:2.1.4-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/xastir_gcc10.patch b/xastir_gcc10.patch new file mode 100644 index 0000000..aa40b6f --- /dev/null +++ b/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;