From 9e8fda5da78e336d8e221f56b396379a2f94e1c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:47:55 +0000 Subject: [PATCH 1/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c7cacc4ff6936d1023913fda9dfad4321daa2582 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 2 Aug 2024 18:49:24 +0200 Subject: [PATCH 2/6] Fix F41 FTB (Fedora#2301274) --- skychart.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/skychart.spec b/skychart.spec index 0626edb..e813c32 100644 --- a/skychart.spec +++ b/skychart.spec @@ -63,14 +63,10 @@ ExcludeArch: %{ix86} BuildRequires: make BuildRequires: fpc -%if 0%{?fedora} >= 39 BuildRequires: fpc-src BuildRequires: lazarus-lcl-nogui BuildRequires: lazarus-lcl-qt5 BuildRequires: lazarus-tools -%else -BuildRequires: lazarus >= 1.6.2 -%endif BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: gtk2-devel @@ -147,14 +143,14 @@ Provides: catgen = %{version}-%{release} Custom catalog builder for Skychart. %prep -%setup0 -q -n %{name}-%{maj_ver}-%{svnversion}-src +%setup -q -n %{name}-%{maj_ver}-%{svnversion}-src %autopatch -p1 # Fix executable bit set on sources find skychart -type f -print0 | xargs -0 chmod -x -# Put additional catalogs files where where required for installation +# Put additional catalogs files where are required for installation cp -p %SOURCE2 ./BaseData cp -p %SOURCE3 ./BaseData From 7e0d8b2261ef9ecd77b6ea4558c0136e385be430 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:55:20 +0000 Subject: [PATCH 3/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 83f39af43bd6ee91b606515b0918efca521c0cdf Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 9 Mar 2025 15:53:05 +0100 Subject: [PATCH 4/6] Update to svn4974 --- .gitignore | 1 + skychart.spec | 7 +++---- sources | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3f2f12f..307e9be 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /skychart-4.3-4630-src-nopatents.tar.xz /skychart-4.3-4639-src-nopatents.tar.xz /skychart-4.3-4719-src-nopatents.tar.xz +/skychart-4.3-4974-src-nopatents.tar.xz diff --git a/skychart.spec b/skychart.spec index e813c32..2af587f 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,5 +1,5 @@ -%global svnversion 4719 -%global date 20240205 +%global svnversion 4974 +%global date 20250303 %global maj_ver 4.3 Name: skychart @@ -18,7 +18,7 @@ URL: http://www.ap-i.net/skychart/ # Download upstream tarball from # https://sourceforge.net/projects/skychart/files/0-beta/ # in the same directory of the script and run: -# ./generate-tarball.sh 4.3-4719 +# ./generate-tarball.sh 4.3-4974 Source0: %{name}-%{maj_ver}-%{svnversion}-src-nopatents.tar.xz Source1: generate-tarball.sh # Base source data @@ -226,7 +226,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/skychart/cat/milkyway %{_datadir}/skychart/cat/openngc %{_datadir}/skychart/cat/RealSky -%{_datadir}/skychart/cat/sac %{_datadir}/skychart/cat/xhip %dir %{_datadir}/skychart/doc %{_datadir}/skychart/doc/html_doc diff --git a/sources b/sources index 1ce5e58..c87be5e 100644 --- a/sources +++ b/sources @@ -11,4 +11,4 @@ SHA512 (catalog_tycho2.tgz) = 722b542f09752353eab621fdd6559a9e28a9558500f550e63e SHA512 (catalog_wds.tgz) = 0aa8a17450c499643a23abcfb2397bbf1b0199c39462538439c02d99c031b483f4a10c6f80de436f59cd8804d0079b4b2020cc8e6fd1dacd3823f72dc25d498c SHA512 (catalog_vdb.tgz) = d3df026a2b5a1de6c41c7ec4202da48784d12a9a0adc6e6069a1b5f50b3beb6c80a66fd1be26fdf60fbbccbf32d392bffd0c020a867fe5d276231ecceaaa8528 SHA512 (data_spicesun.tgz) = 6656d6dd089025cb4cbbb1a76e2a5ae219b1be4ee87d8ceb8ce6abff9d59ed813939928baed2bd8eb4a1a48ec374c76527a5e70e53584bc3612aa12002604706 -SHA512 (skychart-4.3-4719-src-nopatents.tar.xz) = 8b08e337a6f5ffb97b3f09c212fa1a26c1761ddd24296fc4a8214e949cba3161034bd29417796c0754b6c4e09d5ef179480d2b63a729935f8e3716111232eec3 +SHA512 (skychart-4.3-4974-src-nopatents.tar.xz) = 89e5c5c4294b5472b7640d094c498c5be1845616a8b9fd40a5e70b7defe268ddd86cf86e2454bb85dd00b3173fc162eceeddfba54c2cb4f9f0f6f83083b4d13b From e349e4daf303d6946f7b3e0ef27ee626af3d3efe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:23:58 +0000 Subject: [PATCH 5/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a1f9b40e251e612d47cca1b29341533084433513 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 15 Aug 2025 10:35:00 +0200 Subject: [PATCH 6/6] Fix build with FPC 3.2.4 --- skychart-4.3-fpc-3.2.4.patch | 15 +++++++++++++++ skychart.spec | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 skychart-4.3-fpc-3.2.4.patch diff --git a/skychart-4.3-fpc-3.2.4.patch b/skychart-4.3-fpc-3.2.4.patch new file mode 100644 index 0000000..f4b928c --- /dev/null +++ b/skychart-4.3-fpc-3.2.4.patch @@ -0,0 +1,15 @@ +diff -rU4 skychart-4.3-4974-src--orig/skychart/cu_tz.pas skychart-4.3-4974-src--patched/skychart/cu_tz.pas +--- skychart-4.3-4974-src--orig/skychart/cu_tz.pas 2025-03-03 03:30:14.000000000 +0100 ++++ skychart-4.3-4974-src--patched/skychart/cu_tz.pas 2025-08-15 10:32:52.001369952 +0200 +@@ -41,8 +41,11 @@ + Windows, + {$endif} + {$ifdef unix} + unixutil, ++ {$IF FPC_FULLVERSION > 30202} // FPC 3.2.4 moves TzSeconds from UnixUtil to Unix ++ unix, ++ {$ENDIF} + {$endif} + Classes, SysUtils, Math; + + type diff --git a/skychart.spec b/skychart.spec index 2af587f..25ef4a9 100644 --- a/skychart.spec +++ b/skychart.spec @@ -56,6 +56,8 @@ Patch: skychart-4.3-satmessage.patch # This feature was asked upstream specifically for Fedora Patch: skychart-4.3-noupdatemenu.patch +# Fix build with FPC 3.2.4 +Patch: skychart-4.3-fpc-3.2.4.patch ExclusiveArch: %{fpc_arches} ExcludeArch: %{ix86}