From 91a4a3fb15e7eab0374d1bb7c859d386818b48ee Mon Sep 17 00:00:00 2001 From: AsciiWolf Date: Tue, 9 Jul 2024 16:06:28 +0200 Subject: [PATCH] Desktop fixes - Add svg icon installed into a standard icons dir instead of the non-standard dimensions png in pixmaps - Rename the desktop icon to just "gpredict" to match desktop file name - Add AppStream metainfo file - Fix Makefile formatting --- Makefile.am | 2 +- configure.ac | 2 + data/Makefile.am | 2 +- data/desktop/gpredict.desktop.in | 2 +- data/metainfo/Makefile.am | 5 + data/metainfo/dk.oz9aec.Gpredict.metainfo.xml | 31 ++++++ data/satdata/Makefile.am | 2 - icons/.gitignore | 2 + icons/Makefile.am | 4 + icons/gpredict.svg | 98 +++++++++++++++++++ pixmaps/icons/Makefile.am | 10 +- pixmaps/logos/Makefile.am | 6 +- pixmaps/maps/Makefile.am | 8 +- 13 files changed, 154 insertions(+), 20 deletions(-) create mode 100644 data/metainfo/Makefile.am create mode 100644 data/metainfo/dk.oz9aec.Gpredict.metainfo.xml create mode 100644 icons/.gitignore create mode 100644 icons/Makefile.am create mode 100644 icons/gpredict.svg diff --git a/Makefile.am b/Makefile.am index 3890b266..ffb2642c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src doc pixmaps data po +SUBDIRS = src doc icons pixmaps data po BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 57c57eff..6dcba436 100644 --- a/configure.ac +++ b/configure.ac @@ -126,12 +126,14 @@ doc/man/Makefile src/Makefile src/sgpsdp/Makefile src/sgpsdp/TR/Makefile +icons/Makefile pixmaps/Makefile pixmaps/maps/Makefile pixmaps/logos/Makefile pixmaps/icons/Makefile data/Makefile data/desktop/Makefile +data/metainfo/Makefile data/satdata/Makefile po/Makefile.in ]) diff --git a/data/Makefile.am b/data/Makefile.am index 8b817baa..df0980e6 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = satdata desktop +SUBDIRS = satdata desktop metainfo gpredict_datdir = $(pkgdatadir)/data diff --git a/data/desktop/gpredict.desktop.in b/data/desktop/gpredict.desktop.in index 4883bf9c..b4b4d817 100644 --- a/data/desktop/gpredict.desktop.in +++ b/data/desktop/gpredict.desktop.in @@ -2,7 +2,7 @@ Name=Gpredict Comment=Satellite tracker Exec=gpredict -Icon=gpredict-icon +Icon=gpredict Terminal=false Type=Application Categories=HamRadio;Science;Astronomy;Education;Network; diff --git a/data/metainfo/Makefile.am b/data/metainfo/Makefile.am new file mode 100644 index 00000000..4eb52050 --- /dev/null +++ b/data/metainfo/Makefile.am @@ -0,0 +1,5 @@ +gpredict_metainfodir = $(datadir)/metainfo + +gpredict_metainfo_DATA = dk.oz9aec.Gpredict.metainfo.xml + +EXTRA_DIST = $(gpredict_metainfo_DATA) diff --git a/data/metainfo/dk.oz9aec.Gpredict.metainfo.xml b/data/metainfo/dk.oz9aec.Gpredict.metainfo.xml new file mode 100644 index 00000000..acf70d8d --- /dev/null +++ b/data/metainfo/dk.oz9aec.Gpredict.metainfo.xml @@ -0,0 +1,31 @@ + + + dk.oz9aec.Gpredict + Gpredict + Alexandru Csete + Real-time satellite tracking and orbit prediction program + +

Gpredict is a real time satellite tracking and orbit prediction program written using the Gtk+ widgets.

+

Gpredict is targeted mainly towards ham radio operators but others interested in satellite tracking may find it useful as well.

+ + + Astronomy + Education + HamRadio + Network + Science + + CC-BY-SA-3.0 + GPL-2.0+ + + gpredict.desktop + + https://oz9aec.dk/gpredict/ + + + https://live.staticflickr.com/8089/28902144392_8cd36d57fe_b.jpg + + + gpredict.desktop + + diff --git a/data/satdata/Makefile.am b/data/satdata/Makefile.am index 0cb5713c..24162a36 100644 --- a/data/satdata/Makefile.am +++ b/data/satdata/Makefile.am @@ -1,7 +1,5 @@ - gpredict_satdir = $(pkgdatadir)/data/satdata gpredict_sat_DATA = satellites.dat *.cat EXTRA_DIST = $(gpredict_sat_DATA) - diff --git a/icons/.gitignore b/icons/.gitignore new file mode 100644 index 00000000..282522db --- /dev/null +++ b/icons/.gitignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/icons/Makefile.am b/icons/Makefile.am new file mode 100644 index 00000000..06439e4d --- /dev/null +++ b/icons/Makefile.am @@ -0,0 +1,4 @@ +gpredict_iconsdir = $(datadir)/icons/hicolor/scalable/apps +gpredict_icons_DATA = gpredict.svg + +EXTRA_DIST = $(gpredict_icons_DATA) diff --git a/icons/gpredict.svg b/icons/gpredict.svg new file mode 100644 index 00000000..9ad78a19 --- /dev/null +++ b/icons/gpredict.svg @@ -0,0 +1,98 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/icons/Makefile.am b/pixmaps/icons/Makefile.am index 0a91aabc..66d7c16b 100644 --- a/pixmaps/icons/Makefile.am +++ b/pixmaps/icons/Makefile.am @@ -1,9 +1,6 @@ -gpredict_iconsdir = $(datadir)/pixmaps/gpredict/icons +gpredict_pixmaps_iconsdir = $(datadir)/pixmaps/gpredict/icons -gpredict_icons2dir = $(datadir)/pixmaps/ -gpredict_icons2_DATA = gpredict-icon.png - -gpredict_icons_DATA = \ +gpredict_pixmaps_icons_DATA = \ gpredict-antenna.png \ gpredict-antenna-small.png \ gpredict-azel-small.png \ @@ -39,5 +36,4 @@ gpredict_icons_DATA = \ gpredict-shuttle.png \ gpredict-shuttle-small.png -EXTRA_DIST = $(gpredict_icons_DATA) $(gpredict_icons2_DATA) - +EXTRA_DIST = $(gpredict_pixmaps_icons_DATA) diff --git a/pixmaps/logos/Makefile.am b/pixmaps/logos/Makefile.am index 99d41ab4..c974c1db 100644 --- a/pixmaps/logos/Makefile.am +++ b/pixmaps/logos/Makefile.am @@ -1,6 +1,6 @@ -gpredict_logosdir = $(datadir)/pixmaps/gpredict/logos +gpredict_pixmaps_logosdir = $(datadir)/pixmaps/gpredict/logos -gpredict_logos_DATA = \ +gpredict_pixmaps_logos_DATA = \ gpredict_horizontal_color.png \ gpredict_horizontal_color.svg \ gpredict_horizontal_white.png \ @@ -14,4 +14,4 @@ gpredict_logos_DATA = \ gpredict_vertical_white.png \ gpredict_vertical_white.svg -EXTRA_DIST = $(gpredict_logos_DATA) +EXTRA_DIST = $(gpredict_pixmaps_logos_DATA) diff --git a/pixmaps/maps/Makefile.am b/pixmaps/maps/Makefile.am index 1c0ffa12..fc0b2479 100644 --- a/pixmaps/maps/Makefile.am +++ b/pixmaps/maps/Makefile.am @@ -1,7 +1,6 @@ +gpredict_pixmaps_mapsdir = $(datadir)/pixmaps/gpredict/maps -gpredict_mapsdir = $(datadir)/pixmaps/gpredict/maps - -gpredict_maps_DATA = \ +gpredict_pixmaps_maps_DATA = \ earth_800.png \ nasa-bmng-01_1024.jpg \ nasa-bmng-03_1024.jpg \ @@ -18,5 +17,4 @@ gpredict_maps_DATA = \ nasa-topo_1600.jpg \ nasa-topo_2048.jpg -EXTRA_DIST = $(gpredict_maps_DATA) - +EXTRA_DIST = $(gpredict_pixmaps_maps_DATA)