Compare commits

..

No commits in common. "rawhide" and "f42" have entirely different histories.

5 changed files with 92 additions and 29 deletions

1
.gitignore vendored
View file

@ -2,4 +2,3 @@
/XEphem-0a1b50503bdf202fb6fa7ca62124b0242a004e69.tar.gz
/XEphem-a2da14bfc6727b1255df6f31ac4ce89d4bd881c8.tar.gz
/XEphem-4.2.0.tar.gz
/XEphem-4.3.0.tar.gz

View file

@ -1 +1 @@
SHA512 (XEphem-4.3.0.tar.gz) = c93a946ca457946dba356ac2ef6cada5203b67a29f6788af3cb7b02670ca5fd876c61f4c5daa556036abf129ac50895599fd1e794adb91d07b1b0ca422bc8bb6
SHA512 (XEphem-4.2.0.tar.gz) = 97756bc299821e95cbc06facc3091795feb245db033193fdf587bcfd7a83142a15552a1f8aa53c040c87cb75021424b94bbed5a747fb9783f5a0cac6fb4ddb3e

19
xephem-c99.patch Normal file
View file

@ -0,0 +1,19 @@
Define _GNU_SOURCE, so that <time.h> declares strptime, an X/Open
extension that is not available by default in the glibc headers.
Submitted upstream: <https://github.com/XEphem/XEphem/pull/73>
diff --git a/GUI/xephem/sunmenu.c b/GUI/xephem/sunmenu.c
index 0bedcff3971e1ec4..62540d396e5ece68 100644
--- a/GUI/xephem/sunmenu.c
+++ b/GUI/xephem/sunmenu.c
@@ -1,6 +1,9 @@
/* code to manage the sun display
*/
+/* For the declaration of strptime in <time.h>. */
+#define _GNU_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>

View file

@ -1,4 +1,4 @@
%global gittag 4.3.0
%global gittag 4.2.0
#%%global commit a2da14bfc6727b1255df6f31ac4ce89d4bd881c8
#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
#%%global date 20240205
@ -31,6 +31,11 @@ Patch: xephem_makefile.patch
# Proposed upstream: https://github.com/XEphem/XEphem/pull/60
Patch: xephem_with_cmake.patch
# Define _GNU_SOURCE, so that <time.h> declares strptime, an X/Open
# extension that is not available by default in the glibc headers.
# Submitted upstream: <https://github.com/XEphem/XEphem/pull/73>
Patch: xephem-c99.patch
ExcludeArch: %{ix86}
BuildRequires: desktop-file-utils

View file

@ -1,6 +1,33 @@
diff -U 3 -dHrN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/CMakeLists.txt 2026-03-14 11:05:34.680886726 +0100
From 59983adbba71b7f0a3b2ce4503e64e3ba7cb2854 Mon Sep 17 00:00:00 2001
From: Mattia Verga <mattia.verga@tiscali.it>
Date: Sun, 8 Jan 2023 16:08:24 +0100
Subject: [PATCH] Add cmake directives
Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
---
CMakeLists.txt | 76 +++++++++++++++++++++++++++++++
GUI/xephem/CMakeLists.txt | 95 +++++++++++++++++++++++++++++++++++++++
libastro/CMakeLists.txt | 69 ++++++++++++++++++++++++++++
libip/CMakeLists.txt | 26 +++++++++++
libjpegd/CMakeLists.txt | 40 +++++++++++++++++
liblilxml/CMakeLists.txt | 16 +++++++
libpng/CMakeLists.txt | 30 +++++++++++++
libz/CMakeLists.txt | 25 +++++++++++
8 files changed, 377 insertions(+)
create mode 100644 CMakeLists.txt
create mode 100644 GUI/xephem/CMakeLists.txt
create mode 100644 libastro/CMakeLists.txt
create mode 100644 libip/CMakeLists.txt
create mode 100644 libjpegd/CMakeLists.txt
create mode 100644 liblilxml/CMakeLists.txt
create mode 100644 libpng/CMakeLists.txt
create mode 100644 libz/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..b618a69
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,76 @@
+cmake_minimum_required(VERSION 3.10)
+
@ -78,9 +105,11 @@ diff -U 3 -dHrN a/CMakeLists.txt b/CMakeLists.txt
+ DESTINATION ${XEPHEM_DATADIR})
+install(DIRECTORY GUI/xephem/lo
+ DESTINATION ${XEPHEM_DATADIR})
diff -U 3 -dHrN a/GUI/xephem/CMakeLists.txt b/GUI/xephem/CMakeLists.txt
--- a/GUI/xephem/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/GUI/xephem/CMakeLists.txt 2026-03-14 11:05:34.681033815 +0100
diff --git a/GUI/xephem/CMakeLists.txt b/GUI/xephem/CMakeLists.txt
new file mode 100644
index 0000000..5f86fb8
--- /dev/null
+++ b/GUI/xephem/CMakeLists.txt
@@ -0,0 +1,95 @@
+cmake_minimum_required(VERSION 3.10)
+
@ -177,10 +206,12 @@ diff -U 3 -dHrN a/GUI/xephem/CMakeLists.txt b/GUI/xephem/CMakeLists.txt
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMENT "Building manpage"
+ VERBATIM)
diff -U 3 -dHrN a/libastro/CMakeLists.txt b/libastro/CMakeLists.txt
--- a/libastro/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/libastro/CMakeLists.txt 2026-03-14 11:06:44.260765464 +0100
@@ -0,0 +1,70 @@
diff --git a/libastro/CMakeLists.txt b/libastro/CMakeLists.txt
new file mode 100644
index 0000000..aaa7631
--- /dev/null
+++ b/libastro/CMakeLists.txt
@@ -0,0 +1,69 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(libastro C)
@ -207,7 +238,6 @@ diff -U 3 -dHrN a/libastro/CMakeLists.txt b/libastro/CMakeLists.txt
+ dbfmt.c
+ deep.c
+ deltat.c
+ eclipses.c
+ earthsat.c
+ eq_ecl.c
+ eq_gal.c
@ -251,9 +281,11 @@ diff -U 3 -dHrN a/libastro/CMakeLists.txt b/libastro/CMakeLists.txt
+target_include_directories(astro PUBLIC
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}")
diff -U 3 -dHrN a/libip/CMakeLists.txt b/libip/CMakeLists.txt
--- a/libip/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/libip/CMakeLists.txt 2026-03-14 11:05:34.681189843 +0100
diff --git a/libip/CMakeLists.txt b/libip/CMakeLists.txt
new file mode 100644
index 0000000..3d7ac78
--- /dev/null
+++ b/libip/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.10)
+
@ -281,9 +313,11 @@ diff -U 3 -dHrN a/libip/CMakeLists.txt b/libip/CMakeLists.txt
+target_include_directories(ip PUBLIC
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}")
diff -U 3 -dHrN a/libjpegd/CMakeLists.txt b/libjpegd/CMakeLists.txt
--- a/libjpegd/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/libjpegd/CMakeLists.txt 2026-03-14 11:05:34.681320833 +0100
diff --git a/libjpegd/CMakeLists.txt b/libjpegd/CMakeLists.txt
new file mode 100644
index 0000000..7e4ced4
--- /dev/null
+++ b/libjpegd/CMakeLists.txt
@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.10)
+
@ -325,9 +359,11 @@ diff -U 3 -dHrN a/libjpegd/CMakeLists.txt b/libjpegd/CMakeLists.txt
+target_include_directories(jpegd PUBLIC
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}")
diff -U 3 -dHrN a/liblilxml/CMakeLists.txt b/liblilxml/CMakeLists.txt
--- a/liblilxml/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/liblilxml/CMakeLists.txt 2026-03-14 11:05:34.681428772 +0100
diff --git a/liblilxml/CMakeLists.txt b/liblilxml/CMakeLists.txt
new file mode 100644
index 0000000..6abc3cb
--- /dev/null
+++ b/liblilxml/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.10)
+
@ -345,9 +381,11 @@ diff -U 3 -dHrN a/liblilxml/CMakeLists.txt b/liblilxml/CMakeLists.txt
+target_include_directories(lilxml PUBLIC
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}")
diff -U 3 -dHrN a/libpng/CMakeLists.txt b/libpng/CMakeLists.txt
--- a/libpng/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/libpng/CMakeLists.txt 2026-03-14 11:05:34.681501601 +0100
diff --git a/libpng/CMakeLists.txt b/libpng/CMakeLists.txt
new file mode 100644
index 0000000..abacd7b
--- /dev/null
+++ b/libpng/CMakeLists.txt
@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.10)
+
@ -379,9 +417,11 @@ diff -U 3 -dHrN a/libpng/CMakeLists.txt b/libpng/CMakeLists.txt
+target_include_directories(png PUBLIC
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}")
diff -U 3 -dHrN a/libz/CMakeLists.txt b/libz/CMakeLists.txt
--- a/libz/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/libz/CMakeLists.txt 2026-03-14 11:05:34.681573741 +0100
diff --git a/libz/CMakeLists.txt b/libz/CMakeLists.txt
new file mode 100644
index 0000000..1294b70
--- /dev/null
+++ b/libz/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.10)
+