Merge 68cdbcc18c into b6529a3ce3

Closes issue #80.

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - fix-ci
 
   pull_request:
     branches:
@@ -31,6 +32,8 @@ jobs:
       run: brew install openssl && brew info openssl
     - name: Install XQuartz
       run: brew install xquartz --cask && brew info xquartz
+    - name: Install groff
+      run: brew install groff && brew info groff
     - name: Compile
       run: make -C GUI/xephem
     - name: Test

GUI/xephem/Makefile

@@ -1,4 +1,4 @@
-# Sample Makefile for xephem v3.7
+# Sample Makefile for xephem v4.1.0
 
 # Sample compile and link flags for a few systems. Find your system or similar
 # and uncomment as required. The default is for linux or Mac OS X systems.
@@ -48,6 +48,13 @@ LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) $(PLATL)
 XLIBS = -lXm -lXt -lXext -lXmu -lX11
 LIBS = $(XLIBS) $(LIBLIB) -lm -lssl
 
+# Variables installation for Linux
+prefix := /usr/local
+bindir = $(prefix)/bin
+datadir = $(prefix)/share
+mandir = $(datadir)/man
+export datadir
+
 # static linking on Apple using X11 libs from ports
 # CC = gcc
 # OLI = /opt/local/include
@@ -197,24 +204,43 @@ OBJS =			\
 	xephem.o	\
 	xmisc.o
 
-all: libs xephem xephem.1
+all: xephem xephem.1
 
-xephem: $(INCS) $(OBJS)
+xephem: libs $(INCS) $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 xephem.1: xephem.man
-	nroff -man $? > $@
+	cp $? $@
 
 libs:
-	cd ../../libastro; make
+	$(MAKE) -C ../../libastro
-	cd ../../libip; make
+	$(MAKE) -C ../../libip
-	cd ../../libjpegd; make
+	$(MAKE) -C ../../libjpegd
-	cd ../../liblilxml; make
+	$(MAKE) -C ../../liblilxml
-	cd ../../libpng; make
+	$(MAKE) -C ../../libpng
-	cd ../../libz; make
+	$(MAKE) -C ../../libz
 
 clean:
 	rm -fr *.o ../../lib*/*.[ao]
 
 clobber: clean
 	rm -fr xephem xephem.1
+
+# Installation
+install: install-binary install-man install-data install-desktopfiles
+
+install-binary:
+	install -Dm 755 xephem -t $(DESTDIR)$(bindir)
+
+install-man:
+	install -Dm 644 xephem.1 -t $(DESTDIR)$(mandir)/man1
+
+install-data:
+	install -dm 755 $(DESTDIR)$(datadir)/xephem
+	@for d in auxil catalogs fifos fits gallery help lo; do \
+	  echo "cp -R $$d $(DESTDIR)$(datadir)/xephem"; \
+	  cp -R $$d $(DESTDIR)$(datadir)/xephem; \
+	done
+
+install-desktopfiles:
+	$(MAKE) -C ../../desktopfiles DESTDIR=$(DESTDIR) install

GUI/xephem/auxil/mpcorb2edb.pl

@@ -119,7 +119,7 @@ print "Creating $brtfn and $dimfn..\n";
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime;
 $year += 1900;
 $mon += 1;
-$from = "# Data is from ftp://cfa-ftp.harvard.edu/pub/MPCORB/MPCORB.DAT\n";
+$from = "# Data is from $MPCSITE/$MPCFTPDIR/$MPCFILE\n";
 $what = "# Generated by mpcorb2edb.pl $ver, (c) 2000 Elwood Downey\n";
 $when = "# Processed $year-$mon-$mday $hour:$min:$sec UTC\n";
 

GUI/xephem/fallbacks.c

@@ -744,11 +744,11 @@ String fallbacks[] = {
     "XEphem*WCS.y: 10",
     "XEphem*WebDB*Pattern.value: ",
     "XEphem*WebDB*Search.set: False",
-    "XEphem*WebDB*URL0.value: http://celestrak.org/NORAD/elements/stations.txt",
+    "XEphem*WebDB*URL0.value: https://celestrak.org/NORAD/elements/stations.txt",
-    "XEphem*WebDB*URL1.value: http://celestrak.org/NORAD/elements/science.txt",
+    "XEphem*WebDB*URL1.value: https://celestrak.org/NORAD/elements/science.txt",
-    "XEphem*WebDB*URL2.value: http://celestrak.org/NORAD/elements/tle-new.txt",
+    "XEphem*WebDB*URL2.value: https://celestrak.org/NORAD/elements/tle-new.txt",
-    "XEphem*WebDB*URL3.value: http://celestrak.org/NORAD/elements/amateur.txt",
+    "XEphem*WebDB*URL3.value: https://celestrak.org/NORAD/elements/amateur.txt",
-    "XEphem*WebDB*URL4.value: http://celestrak.org/NORAD/elements/visual.txt",
+    "XEphem*WebDB*URL4.value: https://celestrak.org/NORAD/elements/visual.txt",
     "XEphem*WebDB*URL5.value: https://www.minorplanetcenter.net/iau/Ephemerides/Comets/Soft03Cmt.txt",
     "XEphem*WebDB*URL6.value: https://www.minorplanetcenter.net/iau/Ephemerides/CritList/Soft03CritList.txt",
     "XEphem*WebDB*URL7.value: https://www.minorplanetcenter.net/iau/Ephemerides/Distant/Soft03Distant.txt",

GUI/xephem/help/xephem.html

@@ -7991,7 +7991,7 @@ format if it is not already.<br>
 <br>
 Several particularly useful sites as of this build are already entered.
 The first five are from Dr. TS Kelso's Earth satellite lists at <a
- href="https://www.celestrak.org">celestrak.org</a>. The other four are
+ href="https://celestrak.org">celestrak.org</a>. The other four are
 the Minor Planet Center's lists of hot comets and unusual asteroids
 specially formatted for <a
  href="https://www.minorplanetcenter.net/iau/Ephemerides/Soft03.html">XEphem</a>.
@@ -7999,12 +7999,9 @@ Click <span style="font-weight: bold;">Get</span> beside the desired
 catalog to download the file to the Private directory and
 simultaneously load into XEphem memory.<br>
 <br>
-Special files created by
+Special files created by the <a
-<!-- could not found the correct linke
+ href="https://www.minorplanetcenter.net/data/">Minor Planet Center</a>
-<a href="http://cfa-www.harvard.edu/cfa/ps/mpc.html">Minor Planet Center</a>
+and <a href="https://asteroid.lowell.edu/astorb/">Lowell
-and
--->
-the <a href="https://asteroid.lowell.edu/">Lowell
 Observatory</a> may also be downloaded.
 Each organization maintains
 extensive lists of all known asteroids and produces on a regular basis

GUI/xephem/patchlevel.c

@@ -5,5 +5,5 @@
 #include "xephem.h"
 
 char PATCHLEVEL[] = "4.2.0";
-char PATCHDATE[] = "2021 September 13";
+char PATCHDATE[] = "2024 February 13";
 char COPYRIGHT[] = "Copyright (c) 1990-2021 by Elwood Charles Downey";

GUI/xephem/webdbmenu.c

@@ -158,7 +158,7 @@ wdb_create()
 	    XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
 	    tf_w = XmCreateTextField (f_w, buf, args, n);
 	    defaultTextFN (tf_w, 1, "", NULL);
-	    wtip (tf_w, "URL of file to download (must use HTTP)");
+	    wtip (tf_w, "URL of file to download (must use HTTP or HTTPS)");
 	    XtManageChild (tf_w);
 	    sprintf (buf, "XEphem*WebDB*URL%d.value", i);
 	    sr_reg (tf_w, buf, wdbcategory, 1);

GUI/xephem/xephem.man

@@ -1,9 +1,9 @@
-.TH XEphem 1X
+.TH XEPHEM 1 "Feb 2024"
-.SH Name
+.SH NAME
 XEphem \- an interactive astronomical ephemeris for X11
-.SH Syntax
+.SH SYNOPSIS
-\fBxephem [-prfb] [-install {yes|no|guess}] [-resfile <resourcefile>] [-[no]splash]\fP
+\fBxephem [\-prfb] [\-install {yes|no|guess}] [\-resfile <resourcefile>] [\-[no]splash]\fP
-.SH Description
+.SH DESCRIPTION
 .na
 .nh
 .PP
@@ -144,14 +144,14 @@ multi-user installations. XEphem looks here for support files. Unless
 defined otherwise, the Shared directory is ".", that is, the current 
 directory.
 
-.SH Author
+.SH AUTHOR
 .PP
 Elwood C. Downey, email ecdowney@ClearSkyInstitute.com.
 
-.SH References
+.SH SEE ALSO
 .PP
 The Web homepage, including the FAQ, is maintained at
-.I http://www.clearskyinstitute.com/xephem
+.I https://xephem.github.io/XEphem/Site/xephem.html
 .PP
 The online Help entry
 .I on Credits

desktopfiles/Makefile

@@ -0,0 +1,38 @@
+# Makefile for manage desktop files
+# Requires utility 'convert' of the package ImageMagick.
+
+CONVERT = convert
+
+SRCPNGICON = ../GUI/xephem/XEphem.png
+PNGICONS = \
+	32x32/apps/xephem.png \
+	48x48/apps/xephem.png \
+	64x64/apps/xephem.png \
+	128x128/apps/xephem.png
+DESKTOPFILE = xephem.desktop
+METAINFOFILE = xephem.metainfo.xml
+
+iconsdir = $(DESTDIR)$(datadir)/icons/hicolor
+applicationsdir = $(DESTDIR)$(datadir)/applications
+metainfodir = $(DESTDIR)$(datadir)/metainfo
+
+
+all:
+
+install: install-icons install-desktopfile install-metainfo
+
+install-icons: $(PNGICONS)
+
+$(PNGICONS): $(SRCPNGICON)
+	@d=$(iconsdir)/$(shell dirname $@); \
+	s=$(shell echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'); \
+	echo "install -m 755 -d $$d"; \
+	install -m 755 -d $$d; \
+	echo "convert -geometry $${s}x$${s} -depth 8 -background none $< $(iconsdir)/$@"; \
+	$(CONVERT) -geometry $${s}x$${s} -depth 8 -background none $< $(iconsdir)/$@
+
+install-desktopfile:
+	install -Dm 644 $(DESKTOPFILE) -t $(applicationsdir)
+
+install-metainfo:
+	install -Dm 644 $(METAINFOFILE) -t $(metainfodir)

desktopfiles/xephem.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=XEphem
+GenericName=X Window Ephemeris
+GenericName[es]=Ventana X de Efemérides
+Comment=Interactive astronomical ephemeris software
+Comment[es]=Software Interactivo de efemérides astrónomicas
+Exec=xephem
+Icon=xephem
+Terminal=false
+Categories=Science;Astronomy;Motif;
+Keywords=Astronomy;

desktopfiles/xephem.metainfo.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2023 Miguel Molina <mmolina.unphysics@gmail.com> -->
+<component type="desktop-application">
+  <id>xephem.desktop</id>
+  <name>XEphem</name>
+  <name xml:lang="es">XEphem</name>
+  <summary>Interactive astronomical ephemeris software</summary>
+  <summary xml:lang="es">Software interactivo de efemérides astronómicas</summary>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <description>
+    <p>
+      <ul>
+	<li><em>XEphem</em> is an interactive astronomy program for all UNIX platforms, written and maintained by _Elwood Downey_ over more than thirty years 1990–2021 and now generously released under the MIT License.</li>
+	<li><em>XEphem</em> can compute information on demand or time can be set to increment automatically. In this way a series of computations and movies can be generated.</li>
+      </ul>
+    </p>
+    <p xml:lang="es">
+      <ul>
+	<li><em>XEphem</em> es un programa de astronomía interactivo para todas las plataformas UNIX, escrito y mantenido por _Elwood Downey_ durante más de treinta años entre 1990 y 2021 y ahora publicado generosamente bajo la licencia MIT.</li>
+	<li><em>XEphem</em> puede calcular información bajo demanda o se puede configurar automáticamente en el tiempo. De esta forma se pueden generar una serie de cálculos y animaciones.</li>
+      </ul>	
+    </p>
+  </description>
+  <launchable type="desktop-id">xephem.desktop</launchable>
+  <url type="homepage">https://xephem.github.io/XEphem/Site/xephem.html</url>
+  <url type="help">https://xephem.github.io/XEphem/Site/help/xephem.html</url>
+  <update_contact>xephem@ClearSkyInstitute.com</update_contact>
+  <developer_name>Elwood Charles Downey</developer_name>
+  <releases>
+    <release date="2021-09-13" version="4.1.0"/>
+  </releases>
+  <provides>
+    <binary>xephem</binary>
+  </provides>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/XEphem/XEphem/main/GUI/xephem/help/png/sky-view.png</image>
+      <caption>Highly configurable interactive Sky View.</caption>
+      <caption xml:lang="es">Vista del cielo interactivo altamente configurable.</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/XEphem/XEphem/main/GUI/xephem/help/png/solsys.png</image>
+      <caption>3D projection and true stereo views of the solar system, perfect for visualizing comet paths.</caption>
+      <caption xml:lang="es">Proyecciones 3D y vistas estereográficas reales del sistema solar, perfectas para visualizar trayectorias de cometas.</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/XEphem/XEphem/main/GUI/xephem/help/png/sun-view.png</image>
+      <caption>Near real-time Solar images from the SOHO spacecraft.</caption>
+      <caption xml:lang="es">Imágenes solares en tiempo real desed la nave espacial SOHO.</caption>
+    </screenshot>
+  </screenshots>
+</component>