From 3529065dcfcb147db75568be6f3aab3487c2d309 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:46:09 +0000 Subject: [PATCH 01/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 3d031aa..ac55517 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.30 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -103,6 +103,9 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.30-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Mar 12 2020 Jerry James - 4.30-5 - Rebuild for gap 4.11.0 From 58bd43a47cbca6af77d663a2a83c1ddd5bee2924 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2020 21:36:12 -0700 Subject: [PATCH 02/32] Explicitly BR make. --- xgap.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index ac55517..166c508 100644 --- a/xgap.spec +++ b/xgap.spec @@ -21,6 +21,7 @@ Patch2: %{name}-gaparch.patch BuildRequires: desktop-file-utils BuildRequires: gap-devel BuildRequires: gcc +BuildRequires: make BuildRequires: pkgconfig(xaw7) BuildRequires: tex(manfnt.tfm) BuildRequires: tth @@ -53,7 +54,7 @@ sed -i '/prg/d;/ext/d' doc/manual.tex %build export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" %configure --with-gaproot=%{_gap_dir} -make %{?_smp_mflags} +%make_build # Fix a path in the shell wrapper sed -i "s,$PWD,\$GAP_DIR/pkg/%{name}-%{version}," bin/xgap.sh From 6c43e093cd9312666de69c243e54cb71c0fc46ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:05:24 +0000 Subject: [PATCH 03/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 166c508..b0ab4c9 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.30 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -104,6 +104,9 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 4.30-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 4.30-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cefbd332ece12d5ff819a14263cb9d7ea437640b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 3 Jun 2021 16:18:48 -0600 Subject: [PATCH 04/32] Remove unnecessary BR on tex(manfnt.tfm). --- xgap.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xgap.spec b/xgap.spec index b0ab4c9..47ee62d 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.30 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -23,7 +23,6 @@ BuildRequires: gap-devel BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(xaw7) -BuildRequires: tex(manfnt.tfm) BuildRequires: tth Requires: gap%{?_isa} @@ -104,6 +103,9 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Thu Jun 3 2021 Jerry James - 4.30-8 +- Remove unnecessary BR on tex(manfnt.tfm) + * Thu Jan 28 2021 Fedora Release Engineering - 4.30-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 20dfe420629535adc54dfdfc01a9ecac73e4c5a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:37:11 +0000 Subject: [PATCH 05/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 47ee62d..582a362 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.30 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -103,6 +103,9 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.30-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 3 2021 Jerry James - 4.30-8 - Remove unnecessary BR on tex(manfnt.tfm) From 39e4b7825fe1e8b543229142aa6e303a6d836036 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:09:10 +0000 Subject: [PATCH 06/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 582a362..e9ef424 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.30 -Release: 9%{?dist} +Release: 10%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -103,6 +103,9 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.30-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.30-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 182a9d32bef10363160ac7a44acfbd1f0c09cf0b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 21 Feb 2022 09:56:57 -0700 Subject: [PATCH 07/32] Version 4.31. Drop upstreamed -buildman patch. --- sources | 2 +- xgap-buildman.patch | 11 ----------- xgap-warning.patch | 35 ++++++++++++----------------------- xgap.spec | 18 ++++++++++-------- 4 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 xgap-buildman.patch diff --git a/sources b/sources index c15d88f..d291573 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xgap-4.30.tar.gz) = 797f14bb9d94b7902e6ee68664d1c0969605aee29a062bbc76271ca3ac98c58630d982b297bf552c557a56bce8c6194776f2c54ac2c7c2b09705200db0596d3f +SHA512 (xgap-4.31.tar.gz) = be154552243665e3dd9746e83b0ceb371a9d785c45bc266b6e29d33f9df2527a9b7cf55a3ffb1a589103140147b6b2a3585bfda602f5f71997143bae72133db6 diff --git a/xgap-buildman.patch b/xgap-buildman.patch deleted file mode 100644 index bae3a18..0000000 --- a/xgap-buildman.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/buildman.pe.orig 2018-11-10 08:16:08.000000000 -0700 -+++ doc/buildman.pe 2019-01-26 20:35:33.429713783 -0700 -@@ -578,7 +578,7 @@ sub make_tex { - - SCANMSK: while ( $line = ) { - # treat the {{...}} replacements -- while ( $line =~ /{{([^}]*)}}/ ) { -+ while ( $line =~ /\{\{([^}]*)\}\}/ ) { - $key = $1; - if ( $key =~ /date/ ) { - $replace=`date +"%d %B %Y"`; diff --git a/xgap-warning.patch b/xgap-warning.patch index c6eab69..4b342d8 100644 --- a/xgap-warning.patch +++ b/xgap-warning.patch @@ -1,5 +1,5 @@ ---- src.x11/bitmaps/checksym.bm.orig 2019-04-15 16:27:54.000000000 -0600 -+++ src.x11/bitmaps/checksym.bm 2019-04-24 10:37:25.662595279 -0600 +--- src.x11/bitmaps/checksym.bm.orig 2022-02-17 06:50:48.000000000 -0700 ++++ src.x11/bitmaps/checksym.bm 2022-02-21 09:29:39.265821138 -0700 @@ -1,5 +1,5 @@ #define checksym_width 12 #define checksym_height 12 @@ -7,8 +7,8 @@ +static const char checksym_bits[] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x03, 0x80, 0x01, 0xc0, 0x00, 0x62, 0x00, 0x36, 0x00, 0x1c, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}; ---- src.x11/bitmaps/emptymk.bm.orig 2019-04-15 16:27:54.000000000 -0600 -+++ src.x11/bitmaps/emptymk.bm 2019-04-24 10:37:25.674595249 -0600 +--- src.x11/bitmaps/emptymk.bm.orig 2022-02-17 06:50:48.000000000 -0700 ++++ src.x11/bitmaps/emptymk.bm 2022-02-21 09:29:39.265821138 -0700 @@ -1,5 +1,5 @@ #define emptymk_width 12 #define emptymk_height 12 @@ -16,8 +16,8 @@ +static const char emptymk_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; ---- src.x11/bitmaps/exmark.bm.orig 2019-04-15 16:27:54.000000000 -0600 -+++ src.x11/bitmaps/exmark.bm 2019-04-24 10:37:25.675595247 -0600 +--- src.x11/bitmaps/exmark.bm.orig 2022-02-17 06:50:48.000000000 -0700 ++++ src.x11/bitmaps/exmark.bm 2022-02-21 09:29:39.265821138 -0700 @@ -1,6 +1,6 @@ #define exmark_width 32 #define exmark_height 32 @@ -26,8 +26,8 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x60, 0x03, 0x00, 0x00, 0x60, 0x03, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 0x18, 0x0c, 0x00, 0x00, 0x18, 0x0c, 0x00, ---- src.x11/bitmaps/menusym.bm.orig 2019-04-15 16:27:54.000000000 -0600 -+++ src.x11/bitmaps/menusym.bm 2019-04-24 10:37:25.675595247 -0600 +--- src.x11/bitmaps/menusym.bm.orig 2022-02-17 06:50:48.000000000 -0700 ++++ src.x11/bitmaps/menusym.bm 2022-02-21 09:29:39.265821138 -0700 @@ -1,5 +1,5 @@ #define menusym_width 12 #define menusym_height 12 @@ -35,8 +35,8 @@ +static const char menusym_bits[] = { 0xfe, 0x03, 0x02, 0x02, 0x02, 0x06, 0x72, 0x06, 0x02, 0x06, 0x72, 0x06, 0x02, 0x06, 0x72, 0x06, 0x02, 0x06, 0x02, 0x06, 0xfe, 0x07, 0xf8, 0x07}; ---- src.x11/bitmaps/return.bm.orig 2019-04-15 16:27:54.000000000 -0600 -+++ src.x11/bitmaps/return.bm 2019-04-24 10:37:25.675595247 -0600 +--- src.x11/bitmaps/return.bm.orig 2022-02-17 06:50:48.000000000 -0700 ++++ src.x11/bitmaps/return.bm 2022-02-21 09:29:39.266821139 -0700 @@ -1,5 +1,5 @@ #define return_width 9 #define return_height 7 @@ -44,8 +44,8 @@ +static const char return_bits[] = { 0x00, 0x00, 0x44, 0x00, 0x42, 0x00, 0x7d, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00}; ---- src.x11/gapgraph.c.orig 2019-04-15 16:27:54.000000000 -0600 -+++ src.x11/gapgraph.c 2019-04-24 10:37:25.676595245 -0600 +--- src.x11/gapgraph.c.orig 2022-02-17 06:50:48.000000000 -0700 ++++ src.x11/gapgraph.c 2022-02-21 09:29:39.266821139 -0700 @@ -121,6 +121,7 @@ static void GapGraphDestroy ( Widget w ) } @@ -62,14 +62,3 @@ /**************************************************************************** ---- src.x11/pty.c.orig 2019-04-15 16:27:54.000000000 -0600 -+++ src.x11/pty.c 2019-04-24 10:37:25.677595242 -0600 -@@ -1295,7 +1295,7 @@ int StartGapProcess ( name, argv ) - String argv[]; - { - Int j; /* loop variables */ -- char c[8]; /* buffer for communication */ -+ char c[10]; /* buffer for communication */ - int master; /* pipe to GAP */ - int n; /* return value of 'select' */ - int slave; /* pipe from GAP */ diff --git a/xgap.spec b/xgap.spec index e9ef424..6c4209e 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap -Version: 4.30 -Release: 10%{?dist} +Version: 4.31 +Release: 1%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -13,10 +13,8 @@ Source1: %{name}.desktop Source2: XGap # Sent upstream 9 May 2012. This patch quiets some compiler warnings. Patch0: %{name}-warning.patch -# Add missing escapes to buildman.pe -Patch1: %{name}-buildman.patch # Fix computation of GAParch -Patch2: %{name}-gaparch.patch +Patch1: %{name}-gaparch.patch BuildRequires: desktop-file-utils BuildRequires: gap-devel @@ -47,11 +45,11 @@ This package contains documentation for %{name}. # Autoloading this package interferes with SAGE (bz 819705). sed -i "/^Autoload/s/true/false/" PackageInfo.g -# Remove references to obsolete GAP manuals -sed -i '/prg/d;/ext/d' doc/manual.tex +# Remove references to an obsolete GAP manual +sed -i '/prg/d' doc/manual.tex %build -export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" +export CFLAGS="%{build_cflags} -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" %configure --with-gaproot=%{_gap_dir} %make_build @@ -103,6 +101,10 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Mon Feb 21 2022 Jerry James - 4.31-1 +- Version 4.31 +- Drop upstreamed -buildman patch + * Sat Jan 22 2022 Fedora Release Engineering - 4.30-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a873f32f60a36d435f324708744b9d3066b93a1c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 19 Jul 2022 16:08:51 -0600 Subject: [PATCH 08/32] Add README.md. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e798404 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# xgap + +[XGAP](https://gap-packages.github.io/xgap/) is an X Windows GUI for +[GAP](https://www.gap-system.org/). From 4eaa6a7294accec717858b347748910d29dc0186 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:11:00 +0000 Subject: [PATCH 09/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 6c4209e..25a3567 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -101,6 +101,9 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Feb 21 2022 Jerry James - 4.31-1 - Version 4.31 - Drop upstreamed -buildman patch From 4266df6436c2694be06a8fe43003554986bf697a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 25 Jul 2022 09:13:03 -0600 Subject: [PATCH 10/32] Rebuild due to changed binary dir name on s390x. --- xgap.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 25a3567..59216e4 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI for GAP License: GPLv2+ @@ -82,6 +82,13 @@ desktop-file-install --mode=644 --dir=%{buildroot}%{_datadir}/applications \ mkdir -p %{buildroot}%{_datadir}/X11/app-defaults cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults +# This doesn't work, because tst/testall.g invokes a function that is defined +# inside one of the test files. TODO: ask upstream how the tests are supposed +# to be invoked. +# +#%check +#gap -l "%%{buildroot}%%{_gap_dir};%%{_gap_dir}" < tst/testall.g + %files %doc CHANGES README %{_bindir}/%{name} @@ -101,6 +108,9 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{_gap_dir}/pkg/%{name}-%{version}/htm/ %changelog +* Mon Jul 25 2022 Jerry James - 4.31-3 +- Rebuild due to changed binary dir name on s390x + * Sat Jul 23 2022 Fedora Release Engineering - 4.31-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fcc90d87bf94f4612fefc47119c1182afce88554 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 27 Sep 2022 12:29:06 -0600 Subject: [PATCH 11/32] Update for gap 4.12.0. - Convert License tag to SPDX. - Add -ref patch. --- xgap-ref.patch | 23 ++++++++++++++++++ xgap.spec | 66 ++++++++++++++++++++++++++++---------------------- 2 files changed, 60 insertions(+), 29 deletions(-) create mode 100644 xgap-ref.patch diff --git a/xgap-ref.patch b/xgap-ref.patch new file mode 100644 index 0000000..99677ea --- /dev/null +++ b/xgap-ref.patch @@ -0,0 +1,23 @@ +--- doc/manual.tex.orig 2022-02-17 06:50:57.000000000 -0700 ++++ doc/manual.tex 2022-09-07 21:10:27.708197131 -0600 +@@ -18,8 +18,8 @@ + %% + \BeginningOfBook{xgap} + \UseReferences{../../../doc/tut} +-\UseReferences{../../../doc/prg} + \UseReferences{../../../doc/ref} ++\UseReferences{../../smallgrp/doc} + % + % + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +--- doc/sglatsys.tex.orig 2022-02-17 06:50:57.000000000 -0700 ++++ doc/sglatsys.tex 2022-09-07 21:17:12.549273377 -0600 +@@ -640,7 +640,7 @@ reference manual. + \>`Isomorphism'{Isomorphism}@{`Isomorphism'} + + computes and displays the isomorphism type of $u$. This will only work +-if the size of $u$ is small. See "ref:IdGroup" in the {\GAP} ++if the size of $u$ is small. See "smallgrp:IdGroup" in the smallgrp + reference manual for details. + + \bigskip% diff --git a/xgap.spec b/xgap.spec index 59216e4..aeb53cc 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,9 +1,12 @@ Name: xgap Version: 4.31 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI for GAP -License: GPLv2+ +# The project as a whole is GPL-2.0-or-later. +# src.x11/selfile.{c,h} is HPND. +License: GPL-2.0-or-later AND HPND +ExclusiveArch: aarch64 ppc64le s390x x86_64 URL: https://gap-packages.github.io/xgap/ Source0: https://github.com/gap-packages/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz # Created by Jerry James @@ -15,9 +18,13 @@ Source2: XGap Patch0: %{name}-warning.patch # Fix computation of GAParch Patch1: %{name}-gaparch.patch +# Fix documentation references +# See https://github.com/gap-packages/xgap/pull/20 +Patch2: %{name}-ref.patch BuildRequires: desktop-file-utils BuildRequires: gap-devel +BuildRequires: gap-pkg-smallgrp-doc BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(xaw7) @@ -34,7 +41,7 @@ A X Windows GUI for GAP. Summary: XGap documentation BuildArch: noarch Requires: %{name} = %{version}-%{release} -Requires: gap-online-help +Requires: gap-pkg-smallgrp-doc %description doc This package contains documentation for %{name}. @@ -45,33 +52,29 @@ This package contains documentation for %{name}. # Autoloading this package interferes with SAGE (bz 819705). sed -i "/^Autoload/s/true/false/" PackageInfo.g -# Remove references to an obsolete GAP manual -sed -i '/prg/d' doc/manual.tex - %build -export CFLAGS="%{build_cflags} -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" -%configure --with-gaproot=%{_gap_dir} +export CFLAGS="%{build_cflags} -D_GNU_SOURCE" +%configure --with-gaproot=%{gap_dir} %make_build # Fix a path in the shell wrapper sed -i "s,$PWD,\$GAP_DIR/pkg/%{name}-%{version}," bin/xgap.sh # Link to main GAP documentation -ln -s %{_gap_dir}/etc ../../etc -ln -s %{_gap_dir}/doc ../../doc +ln -s %{gap_dir}/etc ../../etc +ln -s %{gap_dir}/doc ../../doc +ln -s %{gap_dir}/pkg/smallgrp .. ln -s %{name}-%{version} ../%{name} make -C doc manual -rm -f ../%{name} ../../{doc,etc} +rm -f ../%{name} ../smallgrp ../../{doc,etc} %install mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_gap_dir}/pkg/%{name}-%{version} -cp -a *.g bin doc examples htm lib %{buildroot}%{_gap_dir}/pkg/%{name}-%{version} -rm -f %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/doc/*.{aux,bbl,blg,brf,idx,ilg,ind,log,out,pnr} -rm -f %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/doc/{buildman.*,Makefile,make_doc} -mv %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/bin/xgap.sh \ - %{buildroot}%{_bindir}/xgap -rm -f %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/bin/*/{Makefile,config*,*.o} +mkdir -p %{buildroot}%{gap_dir}/pkg/%{name}/doc +cp -a *.g bin examples htm lib %{buildroot}%{gap_dir}/pkg/%{name} +mv %{buildroot}%{gap_dir}/pkg/%{name}/bin/xgap.sh %{buildroot}%{_bindir}/xgap +rm %{buildroot}%{gap_dir}/pkg/%{name}/bin/*/{Makefile,config*,*.o} +%gap_copy_docs -n %{name} # Install the desktop file mkdir -p %{buildroot}%{_datadir}/applications @@ -87,27 +90,32 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults # to be invoked. # #%check -#gap -l "%%{buildroot}%%{_gap_dir};%%{_gap_dir}" < tst/testall.g +#gap -l "%%{buildroot}%%{gap_dir};" tst/testall.g %files %doc CHANGES README %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/X11/app-defaults/XGap -%{_gap_dir}/pkg/%{name}-%{version}/ -%exclude %{_gap_dir}/pkg/%{name}-%{version}/doc/ -%exclude %{_gap_dir}/pkg/%{name}-%{version}/examples/ -%exclude %{_gap_dir}/pkg/%{name}-%{version}/htm/ +%{gap_dir}/pkg/%{name}/ +%exclude %{gap_dir}/pkg/%{name}/doc/ +%exclude %{gap_dir}/pkg/%{name}/examples/ +%exclude %{gap_dir}/pkg/%{name}/htm/ %files doc -%docdir %{_gap_dir}/pkg/%{name}-%{version}/doc/ -%docdir %{_gap_dir}/pkg/%{name}-%{version}/examples/ -%docdir %{_gap_dir}/pkg/%{name}-%{version}/htm/ -%{_gap_dir}/pkg/%{name}-%{version}/doc/ -%{_gap_dir}/pkg/%{name}-%{version}/examples/ -%{_gap_dir}/pkg/%{name}-%{version}/htm/ +%docdir %{gap_dir}/pkg/%{name}/doc/ +%docdir %{gap_dir}/pkg/%{name}/examples/ +%docdir %{gap_dir}/pkg/%{name}/htm/ +%{gap_dir}/pkg/%{name}/doc/ +%{gap_dir}/pkg/%{name}/examples/ +%{gap_dir}/pkg/%{name}/htm/ %changelog +* Tue Sep 27 2022 Jerry James - 4.31-4 +- Update for gap 4.12.0 +- Convert License tag to SPDX +- Add -ref patch + * Mon Jul 25 2022 Jerry James - 4.31-3 - Rebuild due to changed binary dir name on s390x From 0791f956cebd049f6e56c479022c2b28c0df4c59 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 10 Nov 2022 11:02:56 -0700 Subject: [PATCH 12/32] Fix and reenable the tests. Clarify license of the doc subpackage. --- xgap.spec | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/xgap.spec b/xgap.spec index aeb53cc..ff4712a 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. @@ -8,7 +8,7 @@ Summary: GUI for GAP License: GPL-2.0-or-later AND HPND ExclusiveArch: aarch64 ppc64le s390x x86_64 URL: https://gap-packages.github.io/xgap/ -Source0: https://github.com/gap-packages/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/gap-packages/xgap/releases/download/v%{version}/%{name}-%{version}.tar.gz # Created by Jerry James Source1: %{name}.desktop # Created by Paulo César Pereira de Andrade @@ -38,6 +38,12 @@ Provides: gap-pkg-xgap = %{version}-%{release} A X Windows GUI for GAP. %package doc +# The content is GPL-2.0-or-later. The remaining licenses cover the various +# fonts embedded in PDFs. +# AMS: OFL-1.1-RFN +# CM: Knuth-CTAN AND LicenseRef-Fedora-Public-Domain +# Nimbus: AGPL-3.0-only +License: GPL-2.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND LicenseRef-Fedora-Public-Domain AND AGPL-3.0-only Summary: XGap documentation BuildArch: noarch Requires: %{name} = %{version}-%{release} @@ -71,7 +77,7 @@ rm -f ../%{name} ../smallgrp ../../{doc,etc} %install mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{gap_dir}/pkg/%{name}/doc -cp -a *.g bin examples htm lib %{buildroot}%{gap_dir}/pkg/%{name} +cp -a *.g bin examples htm lib tst %{buildroot}%{gap_dir}/pkg/%{name} mv %{buildroot}%{gap_dir}/pkg/%{name}/bin/xgap.sh %{buildroot}%{_bindir}/xgap rm %{buildroot}%{gap_dir}/pkg/%{name}/bin/*/{Makefile,config*,*.o} %gap_copy_docs -n %{name} @@ -85,12 +91,13 @@ desktop-file-install --mode=644 --dir=%{buildroot}%{_datadir}/applications \ mkdir -p %{buildroot}%{_datadir}/X11/app-defaults cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults -# This doesn't work, because tst/testall.g invokes a function that is defined -# inside one of the test files. TODO: ask upstream how the tests are supposed -# to be invoked. -# -#%check -#gap -l "%%{buildroot}%%{gap_dir};" tst/testall.g +%check +# Temporarily modify the test runner to add the necessary -l argument +sed -i.orig 's|"-p"|"-l","%{buildroot}%{gap_dir};",&|' \ + %{buildroot}%{gap_dir}/pkg/%{name}/tst/xgap_test.g +gap -l "%{buildroot}%{gap_dir};" tst/testall.g +mv %{buildroot}%{gap_dir}/pkg/%{name}/tst/xgap_test.g.orig \ + %{buildroot}%{gap_dir}/pkg/%{name}/tst/xgap_test.g %files %doc CHANGES README @@ -111,6 +118,10 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %{gap_dir}/pkg/%{name}/htm/ %changelog +* Thu Nov 10 2022 Jerry James - 4.31-5 +- Fix and reenable the tests +- Clarify license of the doc subpackage + * Tue Sep 27 2022 Jerry James - 4.31-4 - Update for gap 4.12.0 - Convert License tag to SPDX From f46b11e5c1c678f57e75fcb2f73c20fec96b8c75 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 12 Jan 2023 15:32:21 -0700 Subject: [PATCH 13/32] Update for split GAP directories. --- xgap.spec | 55 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/xgap.spec b/xgap.spec index ff4712a..218d551 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. @@ -41,9 +41,9 @@ A X Windows GUI for GAP. # The content is GPL-2.0-or-later. The remaining licenses cover the various # fonts embedded in PDFs. # AMS: OFL-1.1-RFN -# CM: Knuth-CTAN AND LicenseRef-Fedora-Public-Domain +# CM: Knuth-CTAN # Nimbus: AGPL-3.0-only -License: GPL-2.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND LicenseRef-Fedora-Public-Domain AND AGPL-3.0-only +License: GPL-2.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND AGPL-3.0-only Summary: XGap documentation BuildArch: noarch Requires: %{name} = %{version}-%{release} @@ -60,26 +60,26 @@ sed -i "/^Autoload/s/true/false/" PackageInfo.g %build export CFLAGS="%{build_cflags} -D_GNU_SOURCE" -%configure --with-gaproot=%{gap_dir} +%configure --with-gaproot=%{gap_archdir} %make_build # Fix a path in the shell wrapper sed -i "s,$PWD,\$GAP_DIR/pkg/%{name}-%{version}," bin/xgap.sh # Link to main GAP documentation -ln -s %{gap_dir}/etc ../../etc -ln -s %{gap_dir}/doc ../../doc -ln -s %{gap_dir}/pkg/smallgrp .. +ln -s %{gap_libdir}/etc ../../etc +ln -s %{gap_libdir}/doc ../../doc +ln -s %{gap_libdir}/pkg/smallgrp .. ln -s %{name}-%{version} ../%{name} make -C doc manual rm -f ../%{name} ../smallgrp ../../{doc,etc} %install mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{gap_dir}/pkg/%{name}/doc -cp -a *.g bin examples htm lib tst %{buildroot}%{gap_dir}/pkg/%{name} -mv %{buildroot}%{gap_dir}/pkg/%{name}/bin/xgap.sh %{buildroot}%{_bindir}/xgap -rm %{buildroot}%{gap_dir}/pkg/%{name}/bin/*/{Makefile,config*,*.o} +mkdir -p %{buildroot}%{gap_archdir}/pkg/%{name}/doc +cp -a *.g bin examples htm lib tst %{buildroot}%{gap_archdir}/pkg/%{name} +mv %{buildroot}%{gap_archdir}/pkg/%{name}/bin/xgap.sh %{buildroot}%{_bindir}/xgap +rm %{buildroot}%{gap_archdir}/pkg/%{name}/bin/*/{Makefile,config*,*.o} %gap_copy_docs -n %{name} # Install the desktop file @@ -93,31 +93,34 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults %check # Temporarily modify the test runner to add the necessary -l argument -sed -i.orig 's|"-p"|"-l","%{buildroot}%{gap_dir};",&|' \ - %{buildroot}%{gap_dir}/pkg/%{name}/tst/xgap_test.g -gap -l "%{buildroot}%{gap_dir};" tst/testall.g -mv %{buildroot}%{gap_dir}/pkg/%{name}/tst/xgap_test.g.orig \ - %{buildroot}%{gap_dir}/pkg/%{name}/tst/xgap_test.g +sed -i.orig 's|"-p"|"-l","%{buildroot}%{gap_archdir};",&|' \ + %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g +gap -l "%{buildroot}%{gap_archdir};" tst/testall.g +mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ + %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g %files %doc CHANGES README %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/X11/app-defaults/XGap -%{gap_dir}/pkg/%{name}/ -%exclude %{gap_dir}/pkg/%{name}/doc/ -%exclude %{gap_dir}/pkg/%{name}/examples/ -%exclude %{gap_dir}/pkg/%{name}/htm/ +%{gap_archdir}/pkg/%{name}/ +%exclude %{gap_archdir}/pkg/%{name}/doc/ +%exclude %{gap_archdir}/pkg/%{name}/examples/ +%exclude %{gap_archdir}/pkg/%{name}/htm/ %files doc -%docdir %{gap_dir}/pkg/%{name}/doc/ -%docdir %{gap_dir}/pkg/%{name}/examples/ -%docdir %{gap_dir}/pkg/%{name}/htm/ -%{gap_dir}/pkg/%{name}/doc/ -%{gap_dir}/pkg/%{name}/examples/ -%{gap_dir}/pkg/%{name}/htm/ +%docdir %{gap_archdir}/pkg/%{name}/doc/ +%docdir %{gap_archdir}/pkg/%{name}/examples/ +%docdir %{gap_archdir}/pkg/%{name}/htm/ +%{gap_archdir}/pkg/%{name}/doc/ +%{gap_archdir}/pkg/%{name}/examples/ +%{gap_archdir}/pkg/%{name}/htm/ %changelog +* Thu Jan 12 2023 Jerry James - 4.31-6 +- Update for split GAP directories + * Thu Nov 10 2022 Jerry James - 4.31-5 - Fix and reenable the tests - Clarify license of the doc subpackage From 24da132180d3020031f78a222bbc6d15a8dd4418 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:31:11 +0000 Subject: [PATCH 14/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 218d551..e3e5582 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. @@ -118,6 +118,9 @@ mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{gap_archdir}/pkg/%{name}/htm/ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.31-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jan 12 2023 Jerry James - 4.31-6 - Update for split GAP directories From e538f6bc549ffca7ba989735fa7022e3adab6379 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 14 Feb 2023 14:26:53 -0700 Subject: [PATCH 15/32] Use the %gap_arches macro. --- xgap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index e3e5582..1f1a7ee 100644 --- a/xgap.spec +++ b/xgap.spec @@ -6,7 +6,7 @@ Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. # src.x11/selfile.{c,h} is HPND. License: GPL-2.0-or-later AND HPND -ExclusiveArch: aarch64 ppc64le s390x x86_64 +ExclusiveArch: %{gap_arches} URL: https://gap-packages.github.io/xgap/ Source0: https://github.com/gap-packages/xgap/releases/download/v%{version}/%{name}-%{version}.tar.gz # Created by Jerry James From 62fe84cc89e18ed4ca5b465f28eadcca564b0864 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:54:18 +0000 Subject: [PATCH 16/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 1f1a7ee..e82ef68 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. @@ -118,6 +118,9 @@ mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{gap_archdir}/pkg/%{name}/htm/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.31-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 4.31-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9aad8b77b2372a1a8b101dda701517c88be25fef Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 30 Nov 2023 12:20:13 -0700 Subject: [PATCH 17/32] Fix incompatible pointer type warning --- xgap-warning.patch | 11 +++++++++++ xgap.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xgap-warning.patch b/xgap-warning.patch index 4b342d8..852010c 100644 --- a/xgap-warning.patch +++ b/xgap-warning.patch @@ -62,3 +62,14 @@ /**************************************************************************** +--- src.x11/xcmds.c.orig 2022-02-17 06:50:48.000000000 -0700 ++++ src.x11/xcmds.c 2023-11-30 11:38:01.637214335 -0700 +@@ -712,7 +712,7 @@ static Boolean FunChangeList ( + text[i] = 0; + + /* change list */ +- XawListChange( arg->sel->list, text, 0, 0, True ); ++ XawListChange( arg->sel->list, (const char **)text, 0, 0, True ); + + /* clear old text */ + for ( i = 0; arg->sel->text[i]; i++ ) diff --git a/xgap.spec b/xgap.spec index e82ef68..1d478bf 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. @@ -14,7 +14,8 @@ Source1: %{name}.desktop # Created by Paulo César Pereira de Andrade # Source2: XGap -# Sent upstream 9 May 2012. This patch quiets some compiler warnings. +# This patch quiets some compiler warnings. +# https://github.com/gap-packages/xgap/pull/29 Patch0: %{name}-warning.patch # Fix computation of GAParch Patch1: %{name}-gaparch.patch @@ -118,6 +119,9 @@ mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{gap_archdir}/pkg/%{name}/htm/ %changelog +* Thu Nov 30 2023 Jerry James - 4.31-9 +- Fix incompatible pointer type warning + * Sat Jul 22 2023 Fedora Release Engineering - 4.31-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9cc5aa92107f8c42da1e6086a52e2225aa435b98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:45:19 +0000 Subject: [PATCH 18/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xgap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xgap.spec b/xgap.spec index 1d478bf..66b3697 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 9%{?dist} +Release: 10%{?dist} Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. @@ -119,6 +119,9 @@ mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{gap_archdir}/pkg/%{name}/htm/ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.31-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 30 2023 Jerry James - 4.31-9 - Fix incompatible pointer type warning From 3e94477b95c5835bc97c81c545ad84a1f2732b15 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 9 Feb 2024 11:42:53 -0700 Subject: [PATCH 19/32] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++ xgap.spec | 164 +----------------------------------------------------- 2 files changed, 163 insertions(+), 162 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8fcd209 --- /dev/null +++ b/changelog @@ -0,0 +1,161 @@ +* Sat Jan 27 2024 Fedora Release Engineering - 4.31-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Nov 30 2023 Jerry James - 4.31-9 +- Fix incompatible pointer type warning + +* Sat Jul 22 2023 Fedora Release Engineering - 4.31-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 4.31-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 12 2023 Jerry James - 4.31-6 +- Update for split GAP directories + +* Thu Nov 10 2022 Jerry James - 4.31-5 +- Fix and reenable the tests +- Clarify license of the doc subpackage + +* Tue Sep 27 2022 Jerry James - 4.31-4 +- Update for gap 4.12.0 +- Convert License tag to SPDX +- Add -ref patch + +* Mon Jul 25 2022 Jerry James - 4.31-3 +- Rebuild due to changed binary dir name on s390x + +* Sat Jul 23 2022 Fedora Release Engineering - 4.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Feb 21 2022 Jerry James - 4.31-1 +- Version 4.31 +- Drop upstreamed -buildman patch + +* Sat Jan 22 2022 Fedora Release Engineering - 4.30-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 4.30-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 3 2021 Jerry James - 4.30-8 +- Remove unnecessary BR on tex(manfnt.tfm) + +* Thu Jan 28 2021 Fedora Release Engineering - 4.30-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 4.30-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Mar 12 2020 Jerry James - 4.30-5 +- Rebuild for gap 4.11.0 + +* Fri Jan 31 2020 Fedora Release Engineering - 4.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 4.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 25 2019 Jerry James - 4.30-2 +- Require gap, not gap-core, so the binary can be invoked and the icon be seen + +* Wed Apr 24 2019 Jerry James - 4.30-1 +- New upstream release + +* Mon Feb 4 2019 Jerry James - 4.29-3 +- Rebuild for gap 4.10.0 +- Add -buildman patch +- Add -doc subpackage + +* Sun Feb 03 2019 Fedora Release Engineering - 4.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Nov 15 2018 Jerry James - 4.29-1 +- New upstream release + +* Mon Sep 24 2018 Jerry James - 4.28-1 +- New upstream release + +* Sat Jul 14 2018 Fedora Release Engineering - 4.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Mar 22 2018 Jerry James - 4.27-1 +- New upstream release + +* Fri Feb 09 2018 Fedora Release Engineering - 4.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 4.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 4.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 4.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Nov 7 2016 Jerry James - 4.26-1 +- New upstream release + +* Sat Jul 30 2016 Jerry James - 4.24-1 +- New upstream release +- New URLs + +* Thu Apr 7 2016 Jerry James - 4.23-13 +- Rebuild for gap 4.8.3 + +* Fri Feb 05 2016 Fedora Release Engineering - 4.23-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Nov 11 2015 Jerry James - 4.23-11 +- Simplify scriptlets; gap-core now uses rpm file triggers +- Rebuild documentation from source + +* Fri Jun 19 2015 Fedora Release Engineering - 4.23-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jan 24 2015 Jerry James - 4.23-9 +- Silence scriptlets when uninstalling +- Mark some content as documentation + +* Mon Aug 18 2014 Fedora Release Engineering - 4.23-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 4.23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 4.23-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed May 22 2013 Jerry James - 4.23-5 +- Build with large file support + +* Fri Feb 15 2013 Fedora Release Engineering - 4.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 17 2012 Jerry James - 4.23-3 +- Rebuild for GAP 4.5 + +* Sun Jul 22 2012 Fedora Release Engineering - 4.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed May 9 2012 Jerry James - 4.23-1 +- New upstream release +- Fix bz 819705 issues: +- Fix xgap shell script +- Install X11 resource file +- Turn off autoloading, as that interferes with SAGE + +* Mon Apr 23 2012 Jerry James - 4.22-1 +- New upstream release +- Add gap-devel BR to get _gap_dir and _gap_arch_dir macros + +* Wed Mar 28 2012 Jerry James - 4.21-3 +- Fix binary permissions + +* Fri Feb 17 2012 Jerry James - 4.21-2 +- Add desktop file +- Fix inconsistent macro use + +* Mon Jan 23 2012 Jerry James - 4.21-1 +- Initial RPM diff --git a/xgap.spec b/xgap.spec index 66b3697..7ca4b1f 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,6 +1,6 @@ Name: xgap Version: 4.31 -Release: 10%{?dist} +Release: %autorelease Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. @@ -119,164 +119,4 @@ mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{gap_archdir}/pkg/%{name}/htm/ %changelog -* Sat Jan 27 2024 Fedora Release Engineering - 4.31-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 30 2023 Jerry James - 4.31-9 -- Fix incompatible pointer type warning - -* Sat Jul 22 2023 Fedora Release Engineering - 4.31-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 4.31-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jan 12 2023 Jerry James - 4.31-6 -- Update for split GAP directories - -* Thu Nov 10 2022 Jerry James - 4.31-5 -- Fix and reenable the tests -- Clarify license of the doc subpackage - -* Tue Sep 27 2022 Jerry James - 4.31-4 -- Update for gap 4.12.0 -- Convert License tag to SPDX -- Add -ref patch - -* Mon Jul 25 2022 Jerry James - 4.31-3 -- Rebuild due to changed binary dir name on s390x - -* Sat Jul 23 2022 Fedora Release Engineering - 4.31-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Feb 21 2022 Jerry James - 4.31-1 -- Version 4.31 -- Drop upstreamed -buildman patch - -* Sat Jan 22 2022 Fedora Release Engineering - 4.30-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.30-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 3 2021 Jerry James - 4.30-8 -- Remove unnecessary BR on tex(manfnt.tfm) - -* Thu Jan 28 2021 Fedora Release Engineering - 4.30-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 4.30-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Mar 12 2020 Jerry James - 4.30-5 -- Rebuild for gap 4.11.0 - -* Fri Jan 31 2020 Fedora Release Engineering - 4.30-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 4.30-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 25 2019 Jerry James - 4.30-2 -- Require gap, not gap-core, so the binary can be invoked and the icon be seen - -* Wed Apr 24 2019 Jerry James - 4.30-1 -- New upstream release - -* Mon Feb 4 2019 Jerry James - 4.29-3 -- Rebuild for gap 4.10.0 -- Add -buildman patch -- Add -doc subpackage - -* Sun Feb 03 2019 Fedora Release Engineering - 4.29-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 15 2018 Jerry James - 4.29-1 -- New upstream release - -* Mon Sep 24 2018 Jerry James - 4.28-1 -- New upstream release - -* Sat Jul 14 2018 Fedora Release Engineering - 4.27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Mar 22 2018 Jerry James - 4.27-1 -- New upstream release - -* Fri Feb 09 2018 Fedora Release Engineering - 4.26-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 4.26-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Nov 7 2016 Jerry James - 4.26-1 -- New upstream release - -* Sat Jul 30 2016 Jerry James - 4.24-1 -- New upstream release -- New URLs - -* Thu Apr 7 2016 Jerry James - 4.23-13 -- Rebuild for gap 4.8.3 - -* Fri Feb 05 2016 Fedora Release Engineering - 4.23-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Nov 11 2015 Jerry James - 4.23-11 -- Simplify scriptlets; gap-core now uses rpm file triggers -- Rebuild documentation from source - -* Fri Jun 19 2015 Fedora Release Engineering - 4.23-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jan 24 2015 Jerry James - 4.23-9 -- Silence scriptlets when uninstalling -- Mark some content as documentation - -* Mon Aug 18 2014 Fedora Release Engineering - 4.23-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 4.23-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 4.23-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed May 22 2013 Jerry James - 4.23-5 -- Build with large file support - -* Fri Feb 15 2013 Fedora Release Engineering - 4.23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Sep 17 2012 Jerry James - 4.23-3 -- Rebuild for GAP 4.5 - -* Sun Jul 22 2012 Fedora Release Engineering - 4.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed May 9 2012 Jerry James - 4.23-1 -- New upstream release -- Fix bz 819705 issues: -- Fix xgap shell script -- Install X11 resource file -- Turn off autoloading, as that interferes with SAGE - -* Mon Apr 23 2012 Jerry James - 4.22-1 -- New upstream release -- Add gap-devel BR to get _gap_dir and _gap_arch_dir macros - -* Wed Mar 28 2012 Jerry James - 4.21-3 -- Fix binary permissions - -* Fri Feb 17 2012 Jerry James - 4.21-2 -- Add desktop file -- Fix inconsistent macro use - -* Mon Jan 23 2012 Jerry James - 4.21-1 -- Initial RPM +%autochangelog From b57c75b874dc634d02db926168433645265cd300 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 15 Mar 2024 16:47:15 -0600 Subject: [PATCH 20/32] Version 4.32 - Drop upstreamed gaparch and ref patches --- sources | 2 +- xgap-gaparch.patch | 11 --------- xgap-ref.patch | 23 ----------------- xgap-warning.patch | 61 ++-------------------------------------------- xgap.spec | 16 +++++------- 5 files changed, 9 insertions(+), 104 deletions(-) delete mode 100644 xgap-gaparch.patch delete mode 100644 xgap-ref.patch diff --git a/sources b/sources index d291573..3595438 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xgap-4.31.tar.gz) = be154552243665e3dd9746e83b0ceb371a9d785c45bc266b6e29d33f9df2527a9b7cf55a3ffb1a589103140147b6b2a3585bfda602f5f71997143bae72133db6 +SHA512 (xgap-4.32.tar.gz) = 91e09f5c8cdd37d73d0ff733a5c0873527185a29ac784eb7fd18de85118ef4a79a634eea88ac16808e54cc0e144b5c1c850c8a1ce0f4bec63ce134ee301eb997 diff --git a/xgap-gaparch.patch b/xgap-gaparch.patch deleted file mode 100644 index ae1a32e..0000000 --- a/xgap-gaparch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2019-04-15 16:27:54.000000000 -0600 -+++ Makefile.in 2019-04-24 10:38:45.822396860 -0600 -@@ -29,7 +29,7 @@ - SHELL=/bin/sh - CC=@CC@ - @SET_MAKE@ --GAParch=@target@-@CC@ -+GAParch=@GAPARCH@ - - default: config compile - diff --git a/xgap-ref.patch b/xgap-ref.patch deleted file mode 100644 index 99677ea..0000000 --- a/xgap-ref.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- doc/manual.tex.orig 2022-02-17 06:50:57.000000000 -0700 -+++ doc/manual.tex 2022-09-07 21:10:27.708197131 -0600 -@@ -18,8 +18,8 @@ - %% - \BeginningOfBook{xgap} - \UseReferences{../../../doc/tut} --\UseReferences{../../../doc/prg} - \UseReferences{../../../doc/ref} -+\UseReferences{../../smallgrp/doc} - % - % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ---- doc/sglatsys.tex.orig 2022-02-17 06:50:57.000000000 -0700 -+++ doc/sglatsys.tex 2022-09-07 21:17:12.549273377 -0600 -@@ -640,7 +640,7 @@ reference manual. - \>`Isomorphism'{Isomorphism}@{`Isomorphism'} - - computes and displays the isomorphism type of $u$. This will only work --if the size of $u$ is small. See "ref:IdGroup" in the {\GAP} -+if the size of $u$ is small. See "smallgrp:IdGroup" in the smallgrp - reference manual for details. - - \bigskip% diff --git a/xgap-warning.patch b/xgap-warning.patch index 852010c..9499404 100644 --- a/xgap-warning.patch +++ b/xgap-warning.patch @@ -1,51 +1,5 @@ ---- src.x11/bitmaps/checksym.bm.orig 2022-02-17 06:50:48.000000000 -0700 -+++ src.x11/bitmaps/checksym.bm 2022-02-21 09:29:39.265821138 -0700 -@@ -1,5 +1,5 @@ - #define checksym_width 12 - #define checksym_height 12 --static char checksym_bits[] = { -+static const char checksym_bits[] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x03, 0x80, 0x01, 0xc0, 0x00, - 0x62, 0x00, 0x36, 0x00, 0x1c, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}; ---- src.x11/bitmaps/emptymk.bm.orig 2022-02-17 06:50:48.000000000 -0700 -+++ src.x11/bitmaps/emptymk.bm 2022-02-21 09:29:39.265821138 -0700 -@@ -1,5 +1,5 @@ - #define emptymk_width 12 - #define emptymk_height 12 --static char emptymk_bits[] = { -+static const char emptymk_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; ---- src.x11/bitmaps/exmark.bm.orig 2022-02-17 06:50:48.000000000 -0700 -+++ src.x11/bitmaps/exmark.bm 2022-02-21 09:29:39.265821138 -0700 -@@ -1,6 +1,6 @@ - #define exmark_width 32 - #define exmark_height 32 --static char exmark_bits[] = { -+static const char exmark_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, - 0x00, 0x60, 0x03, 0x00, 0x00, 0x60, 0x03, 0x00, 0x00, 0x30, 0x06, 0x00, - 0x00, 0x30, 0x06, 0x00, 0x00, 0x18, 0x0c, 0x00, 0x00, 0x18, 0x0c, 0x00, ---- src.x11/bitmaps/menusym.bm.orig 2022-02-17 06:50:48.000000000 -0700 -+++ src.x11/bitmaps/menusym.bm 2022-02-21 09:29:39.265821138 -0700 -@@ -1,5 +1,5 @@ - #define menusym_width 12 - #define menusym_height 12 --static char menusym_bits[] = { -+static const char menusym_bits[] = { - 0xfe, 0x03, 0x02, 0x02, 0x02, 0x06, 0x72, 0x06, 0x02, 0x06, 0x72, 0x06, - 0x02, 0x06, 0x72, 0x06, 0x02, 0x06, 0x02, 0x06, 0xfe, 0x07, 0xf8, 0x07}; ---- src.x11/bitmaps/return.bm.orig 2022-02-17 06:50:48.000000000 -0700 -+++ src.x11/bitmaps/return.bm 2022-02-21 09:29:39.266821139 -0700 -@@ -1,5 +1,5 @@ - #define return_width 9 - #define return_height 7 --static char return_bits[] = { -+static const char return_bits[] = { - 0x00, 0x00, 0x44, 0x00, 0x42, 0x00, 0x7d, 0x00, 0x02, 0x00, 0x04, 0x00, - 0x00, 0x00}; ---- src.x11/gapgraph.c.orig 2022-02-17 06:50:48.000000000 -0700 -+++ src.x11/gapgraph.c 2022-02-21 09:29:39.266821139 -0700 +--- src.x11/gapgraph.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/gapgraph.c 2024-02-09 11:45:26.889608587 -0700 @@ -121,6 +121,7 @@ static void GapGraphDestroy ( Widget w ) } @@ -62,14 +16,3 @@ /**************************************************************************** ---- src.x11/xcmds.c.orig 2022-02-17 06:50:48.000000000 -0700 -+++ src.x11/xcmds.c 2023-11-30 11:38:01.637214335 -0700 -@@ -712,7 +712,7 @@ static Boolean FunChangeList ( - text[i] = 0; - - /* change list */ -- XawListChange( arg->sel->list, text, 0, 0, True ); -+ XawListChange( arg->sel->list, (const char **)text, 0, 0, True ); - - /* clear old text */ - for ( i = 0; arg->sel->text[i]; i++ ) diff --git a/xgap.spec b/xgap.spec index 7ca4b1f..afa0899 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,27 +1,23 @@ Name: xgap -Version: 4.31 +Version: 4.32 Release: %autorelease Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. # src.x11/selfile.{c,h} is HPND. License: GPL-2.0-or-later AND HPND -ExclusiveArch: %{gap_arches} +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} URL: https://gap-packages.github.io/xgap/ -Source0: https://github.com/gap-packages/xgap/releases/download/v%{version}/%{name}-%{version}.tar.gz +VCS: https://github.com/gap-packages/xgap +Source0: %{vcs}/releases/download/v%{version}/%{name}-%{version}.tar.gz # Created by Jerry James Source1: %{name}.desktop # Created by Paulo César Pereira de Andrade # Source2: XGap -# This patch quiets some compiler warnings. -# https://github.com/gap-packages/xgap/pull/29 +# This patch quiets a compiler warning. Patch0: %{name}-warning.patch -# Fix computation of GAParch -Patch1: %{name}-gaparch.patch -# Fix documentation references -# See https://github.com/gap-packages/xgap/pull/20 -Patch2: %{name}-ref.patch BuildRequires: desktop-file-utils BuildRequires: gap-devel From d6901e527e6f44f42b34e3ca25b18a7aefc94c13 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 15 Mar 2024 17:13:36 -0600 Subject: [PATCH 21/32] Add incompatible-pointer patch to fix FTBFS --- xgap-incompatible-pointer.patch | 25 +++++++++++++++++++++++++ xgap.spec | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 xgap-incompatible-pointer.patch diff --git a/xgap-incompatible-pointer.patch b/xgap-incompatible-pointer.patch new file mode 100644 index 0000000..4c15fb4 --- /dev/null +++ b/xgap-incompatible-pointer.patch @@ -0,0 +1,25 @@ +Fixes this error: + +../../src.x11/xcmds.c: In function ‘FunChangeList’: +../../src.x11/xcmds.c:715:36: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types] + 715 | XawListChange( arg->sel->list, (const char **)text, 0, 0, True ); + | ^~~~~~~~~~~~~~~~~~~ + | | + | const char ** +In file included from ../../src.x11/utils.h:120, + from ../../src.x11/xcmds.c:9: +/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’ + 170 | String *list, + | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ + +--- src.x11/xcmds.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/xcmds.c 2024-03-15 16:59:24.433308375 -0600 +@@ -712,7 +712,7 @@ static Boolean FunChangeList ( + text[i] = 0; + + /* change list */ +- XawListChange( arg->sel->list, (const char **)text, 0, 0, True ); ++ XawListChange( arg->sel->list, (char **)text, 0, 0, True ); + + /* clear old text */ + for ( i = 0; arg->sel->text[i]; i++ ) diff --git a/xgap.spec b/xgap.spec index afa0899..35473ce 100644 --- a/xgap.spec +++ b/xgap.spec @@ -18,6 +18,8 @@ Source1: %{name}.desktop Source2: XGap # This patch quiets a compiler warning. Patch0: %{name}-warning.patch +# Fix FTBFS due to an incompatible pointer type +Patch1: %{name}-incompatible-pointer.patch BuildRequires: desktop-file-utils BuildRequires: gap-devel From 31efc49c792c2b94ecced1abd0a9f6cbdc2dedf8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 18 Mar 2024 16:00:57 -0600 Subject: [PATCH 22/32] Bump release and rebuild From 845f1b1e954278ac76051e26da287f7dd87b05a2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 16:20:08 -0600 Subject: [PATCH 23/32] Fix the VCS field --- xgap.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xgap.spec b/xgap.spec index 35473ce..af452fc 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,3 +1,5 @@ +%global giturl https://github.com/gap-packages/xgap + Name: xgap Version: 4.32 Release: %autorelease @@ -9,17 +11,17 @@ License: GPL-2.0-or-later AND HPND # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} URL: https://gap-packages.github.io/xgap/ -VCS: https://github.com/gap-packages/xgap -Source0: %{vcs}/releases/download/v%{version}/%{name}-%{version}.tar.gz +VCS : git:%{giturl}.git +Source0: %{giturl}/releases/download/v%{version}/%{name}-%{version}.tar.gz # Created by Jerry James Source1: %{name}.desktop # Created by Paulo César Pereira de Andrade # Source2: XGap # This patch quiets a compiler warning. -Patch0: %{name}-warning.patch +Patch: %{name}-warning.patch # Fix FTBFS due to an incompatible pointer type -Patch1: %{name}-incompatible-pointer.patch +Patch: %{name}-incompatible-pointer.patch BuildRequires: desktop-file-utils BuildRequires: gap-devel From af059e6c6a0d5a6eb3d47eec2c29b6037658eeaa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:06:45 +0000 Subject: [PATCH 24/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2eed9f22eeb78c30513ef520335a83034575b763 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 15 Jan 2025 15:10:28 -0700 Subject: [PATCH 25/32] Minor spec file cleanups --- xgap.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xgap.spec b/xgap.spec index af452fc..30ed879 100644 --- a/xgap.spec +++ b/xgap.spec @@ -56,11 +56,8 @@ This package contains documentation for %{name}. %prep %autosetup -p0 -# Autoloading this package interferes with SAGE (bz 819705). -sed -i "/^Autoload/s/true/false/" PackageInfo.g - %build -export CFLAGS="%{build_cflags} -D_GNU_SOURCE" +export CFLAGS='%{build_cflags} -D_GNU_SOURCE' %configure --with-gaproot=%{gap_archdir} %make_build @@ -96,7 +93,7 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults # Temporarily modify the test runner to add the necessary -l argument sed -i.orig 's|"-p"|"-l","%{buildroot}%{gap_archdir};",&|' \ %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g -gap -l "%{buildroot}%{gap_archdir};" tst/testall.g +gap -l '%{buildroot}%{gap_archdir};' tst/testall.g mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g @@ -105,10 +102,11 @@ mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/X11/app-defaults/XGap -%{gap_archdir}/pkg/%{name}/ -%exclude %{gap_archdir}/pkg/%{name}/doc/ -%exclude %{gap_archdir}/pkg/%{name}/examples/ -%exclude %{gap_archdir}/pkg/%{name}/htm/ +%dir %{gap_archdir}/pkg/%{name}/ +%{gap_archdir}/pkg/%{name}/*.g +%{gap_archdir}/pkg/%{name}/bin/ +%{gap_archdir}/pkg/%{name}/lib/ +%{gap_archdir}/pkg/%{name}/tst/ %files doc %docdir %{gap_archdir}/pkg/%{name}/doc/ From 3e9e48eeb4a48bc10a4d02b14523581e6945e3c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:53:03 +0000 Subject: [PATCH 26/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9a27a4b784242ecf7530b6c8b925ea4f0d09e01a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 19 Jan 2025 21:53:46 -0700 Subject: [PATCH 27/32] Add patch for C23 compatibility --- xgap-c23.patch | 770 +++++++++++++++++++++++++++++++++++++++++++++++++ xgap.spec | 2 + 2 files changed, 772 insertions(+) create mode 100644 xgap-c23.patch diff --git a/xgap-c23.patch b/xgap-c23.patch new file mode 100644 index 0000000..87e4c5c --- /dev/null +++ b/xgap-c23.patch @@ -0,0 +1,770 @@ +--- src.x11/gaptext.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/gaptext.c 2025-01-19 20:55:42.267107554 -0700 +@@ -14,11 +14,11 @@ + #include "utils.h" + #include "gaptext.h" + +-extern void _XawTextPrepareToUpdate(); +-extern int _XawTextReplace(); +-extern void _XawTextSetScrollBars(); +-extern void _XawTextCheckResize(); +-extern void _XawTextExecuteUpdate(); ++extern void _XawTextPrepareToUpdate(TextWidget); ++extern int _XawTextReplace(TextWidget, XawTextPosition, XawTextPosition, XawTextBlock *); ++extern void _XawTextSetScrollBars(TextWidget); ++extern void _XawTextCheckResize(TextWidget); ++extern void _XawTextExecuteUpdate(TextWidget); + + + /**************************************************************************** +@@ -666,7 +666,7 @@ static XawTextPosition GapSrcReadText ( + Widget w, + XawTextPosition pos, + XawTextBlock * text, +- unsigned long length ) ++ Int length ) + { + GapSrcObject src = (GapSrcObject) w; + +@@ -913,9 +913,9 @@ GapSrcClassRec gapSrcClassRec = + /* extension */ NULL + }, + { /* textSrc_class fields */ +- /* Read */ (XawTextPosition (*)())GapSrcReadText, +- /* Replace */ (int (*)()) GapSrcReplaceText, +- /* Scan */ (XawTextPosition (*)()) GapSrcScan, ++ /* Read */ GapSrcReadText, ++ /* Replace */ GapSrcReplaceText, ++ /* Scan */ GapSrcScan, + /* Search */ XtInheritSearch, + /* SetSelection */ XtInheritSetSelection, + /* ConvertSelection */ XtInheritConvertSelection +@@ -1006,7 +1006,7 @@ void GTDelete ( Widget w, XawTextScanDir + Int from; + + /* prepare text for update */ +- _XawTextPrepareToUpdate(gap); ++ _XawTextPrepareToUpdate((TextWidget)gap); + gap->text.time = CurrentTime; + + /* find and */ +@@ -1025,19 +1025,19 @@ void GTDelete ( Widget w, XawTextScanDir + /* remove text */ + text.length = 0; + text.firstPos = 0; +- if ( _XawTextReplace( gap, from, to, &text ) ) ++ if ( _XawTextReplace( (TextWidget)gap, from, to, &text ) ) + { + XBell(XtDisplay(gap), 50); + goto error; + } + gap->text.insertPos = from; + gap->text.showposition = TRUE; +- _XawTextSetScrollBars(gap); ++ _XawTextSetScrollBars((TextWidget)gap); + + /* do update */ + error: +- _XawTextCheckResize(gap); +- _XawTextExecuteUpdate(gap); ++ _XawTextCheckResize((TextWidget)gap); ++ _XawTextExecuteUpdate((TextWidget)gap); + gap->text.mult = 1; + } + +--- src.x11/gaptext.h.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/gaptext.h 2025-01-19 20:26:04.761116990 -0700 +@@ -96,10 +96,10 @@ extern GapTextClassRec gapTextClassRec; + typedef struct + { + /* function to call when receiving input */ +- void (*input_callback)(); ++ void (*input_callback)(String, Int); + + /* function to position caret */ +- Int (*check_caret_pos)(); ++ Int (*check_caret_pos)(Int, Int); + + /* input buffer for unprocessed input */ + String buffer; +--- src.x11/popdial.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/popdial.c 2025-01-19 20:27:23.072111848 -0700 +@@ -71,10 +71,10 @@ static struct { String name; Int flag; + { "overwrite", PD_OVERWRITE } + }; + +-static void ButtonSelected ( w, cld, cd ) +- Widget w; +- XtPointer cld; +- XtPointer cd; ++static void ButtonSelected ( ++ Widget w, ++ XtPointer cld, ++ XtPointer cd) + { + Int i; + Int * res = (int*) cld; +@@ -96,13 +96,13 @@ static void ButtonSelected ( w, cld, cd + + static Boolean BrokenWM = False; + +-TypePopupDialog CreatePopupDialog ( app, top, name, bt, def, pix ) +- XtAppContext app; +- Widget top; +- String name; +- Int bt; +- Int def; +- Pixmap pix; ++TypePopupDialog CreatePopupDialog ( ++ XtAppContext app, ++ Widget top, ++ String name, ++ Int bt, ++ Int def, ++ Pixmap pix) + { + Display * dp; + TypePopupDialog dialog; +@@ -198,11 +198,11 @@ void PopupDialogBrokenWM ( ) + */ + static Cursor BlobCursor = 0; + +-Int PopupDialog ( dialog, message, deflt, result ) +- TypePopupDialog dialog; +- String message; +- String deflt; +- String * result; ++Int PopupDialog ( ++ TypePopupDialog dialog, ++ String message, ++ String deflt, ++ String * result) + { + Display * display; + Position x1, y1, tmp; +--- src.x11/pty.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/pty.c 2025-01-19 20:31:00.389267989 -0700 +@@ -117,11 +117,11 @@ Boolean ExecRunning = False; + */ + #ifdef DEBUG_ON + +-Int READ_GAP ( file, where, line, len ) +- String file; +- Int where; +- String line; +- Int len; ++Int READ_GAP ( ++ String file, ++ Int where, ++ String line, ++ Int len) + { + Int n; + Int old; +@@ -171,9 +171,9 @@ Int READ_GAP ( file, where, line, len ) + + #else + +-Int ReadGap ( line, len ) +- String line; +- Int len; ++Int ReadGap ( ++ String line, ++ Int len) + { + Int n; + Int old; +@@ -201,15 +201,15 @@ Int ReadGap ( line, len ) + ** + *F WriteGap( , ) . . . . . . . . . . . . . . . . write gap input + */ +-extern int errno; ++#include + + #ifdef DEBUG_ON + +-void WRITE_GAP ( file, where, line, len ) +- String file; +- Int where; +- String line; +- Int len; ++void WRITE_GAP ( ++ String file, ++ Int where, ++ String line, ++ Int len) + { + Int res; + +@@ -238,9 +238,9 @@ void WRITE_GAP ( file, where, line, len + + #else + +-void WriteGap ( line, len ) +- String line; +- Int len; ++void WriteGap ( ++ String line, ++ Int len) + { + Int res; + +@@ -337,8 +337,8 @@ static Int LastLine; + + *F WaitInput( ) . . . . . . . . . . . . . . . wait for one character + */ +-void WaitInput ( buf ) +- struct _in_buf * buf; ++void WaitInput ( ++ struct _in_buf * buf) + { + Int len; + +@@ -356,8 +356,8 @@ void WaitInput ( buf ) + ** + *F WaitInput2( ) . . . . . . . . . . . . . . . wait for two characters + */ +-void WaitInput2 ( buf ) +- struct _in_buf * buf; ++void WaitInput2 ( ++ struct _in_buf * buf) + { + Int len; + +@@ -385,8 +385,8 @@ void WaitInput2 ( buf ) + ** + *F ReadLine( ) . . . . . . . . . . . . . . . . . . . . . . read a line + */ +-void ReadLine ( buf ) +- struct _in_buf * buf; ++void ReadLine ( ++ struct _in_buf * buf) + { + String ptr = GapBuffer; + +@@ -435,9 +435,9 @@ static struct _storage + } + Storage = { 0, 0, 0 }; + +-void StoreInput ( str, len ) +- String str; +- Int len; ++void StoreInput ( ++ String str, ++ Int len) + { + if ( Storage.buffer == 0 ) + { +@@ -460,8 +460,8 @@ void StoreInput ( str, len ) + */ + static Char InputCookie = 'A'; + +-void ProcessStoredInput ( state ) +- Int state; ++void ProcessStoredInput ( ++ Int state) + { + String ptr; + String free; +@@ -558,8 +558,8 @@ again: + ** + *F SimulateInput( ) . . . . . . . . . . enter a line as command line + */ +-void SimulateInput ( str ) +- String str; ++void SimulateInput ( ++ String str) + { + Int pos; + +@@ -585,8 +585,8 @@ void SimulateInput ( str ) + Boolean PlayingBack = False; + FILE * Playback = 0; + +-int PlaybackFile ( str ) +- String str; ++int PlaybackFile ( ++ String str) + { + if ( Playback != 0 ) { + fclose(Playback); +@@ -609,9 +609,9 @@ int ResumePlayback ( void ) + return True; + } + +-void KeyboardInput ( str, len ) +- String str; +- Int len; ++void KeyboardInput ( ++ String str, ++ Int len) + { + char buf[1025]; + +@@ -750,9 +750,9 @@ void KeyboardInput ( str, len ) + ** + *F CheckCaretPos( , ) . . . . . . . . . . . check caret movement + */ +-Int CheckCaretPos ( new, old ) +- Int new; +- Int old; ++Int CheckCaretPos ( ++ Int new, ++ Int old) + { + /* if is -1, then gap is running, ignore move */ + if ( LastLine < 0 ) +@@ -824,10 +824,10 @@ static Boolean ParseInt ( + + static char TBuf[SIZE_BUFFER]; + +-void GapOutput ( cld, fid, id ) +- XtPointer cld; +- int * fid; +- XtInputId id; ++void GapOutput ( ++ XtPointer cld, ++ int * fid, ++ XtInputId id) + { + char ch; + Int special; +@@ -1272,7 +1272,7 @@ static UInt OpenPty(int * master, int * + ** + *F StartGapProcess( , ) . . . start a gap subprocess using ptys + */ +-static void GapStatusHasChanged () ++static void GapStatusHasChanged ([[maybe_unused]] int signo) + { + int w; + +@@ -1286,9 +1286,9 @@ static void GapStatusHasChanged () + exit(1); + } + +-int StartGapProcess ( name, argv ) +- String name; +- String argv[]; ++int StartGapProcess ( ++ String name, ++ String argv[]) + { + Int j; /* loop variables */ + char c[10]; /* buffer for communication */ +--- src.x11/selfile.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/selfile.c 2025-01-19 21:20:59.023791159 -0700 +@@ -110,33 +110,30 @@ typedef struct { + time_t mtime; + } SFDir; + +-static void +- SFenterList(), +- SFleaveList(), +- SFmotionList(), +- SFbuttonPressList(), +- SFbuttonReleaseList(); ++static void SFenterList(Widget, long, XEnterWindowEvent *); ++static void SFleaveList(Widget, int, XEvent *); ++static void SFmotionList(Widget, int, XMotionEvent *); ++static void SFbuttonPressList(Widget, int, XButtonPressedEvent *); ++static void SFbuttonReleaseList(Widget, int, XButtonReleasedEvent *); + +-static void +- SFvSliderMovedCallback(), +- SFvFloatSliderMovedCallback(), +- SFhSliderMovedCallback(), +- SFpathSliderMovedCallback(), +- SFvAreaSelectedCallback(), +- SFhAreaSelectedCallback(), +- SFpathAreaSelectedCallback(); ++static void SFvSliderMovedCallback(Widget, long, int); ++static void SFvFloatSliderMovedCallback(Widget, int, float *); ++static void SFhSliderMovedCallback(Widget, int, float *); ++static void SFpathSliderMovedCallback(Widget, XtPointer, float *); ++static void SFvAreaSelectedCallback(Widget, int, int); ++static void SFhAreaSelectedCallback(Widget, int, int); ++static void SFpathAreaSelectedCallback(Widget, XtPointer, int); + +-static Boolean SFworkProc(); ++static Boolean SFworkProc(XtPointer); + +-static int SFcompareEntries(); ++static int SFcompareEntries(const void *, const void *); + +-static void SFdirModTimer(); ++static void SFdirModTimer(XtPointer, XtIntervalId *); + +-static char SFstatChar(); ++static char SFstatChar(struct stat *); + + +-/* BSD 4.3 errno.h does not declare errno */ +-extern int errno; ++#include + /* extern int sys_nerr; */ + + #if !defined(S_ISDIR) && defined(S_IFDIR) +@@ -1157,7 +1154,7 @@ SFpathAreaSelectedCallback(Widget w, XtP + } + + static Boolean +-SFworkProc() ++SFworkProc([[maybe_unused]] XtPointer closure) + { + register SFDir *dir; + register SFEntry *entry; +@@ -1250,7 +1247,8 @@ SFreplaceText(SFDir *dir, char *str) + if (str[len - 1] == '/') { + (void) strcat(SFcurrentPath, str); + } else { +- (void) strncat(SFcurrentPath, str, len - 1); ++ len = strlen(SFcurrentPath); ++ (void) strncat(SFcurrentPath, str, MAXPATHLEN - len - 1); + } + if (strncmp(SFcurrentPath, SFstartDir, strlen(SFstartDir))) { + SFsetText(SFcurrentPath); +--- src.x11/utils.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/utils.c 2025-01-19 20:34:59.138143676 -0700 +@@ -62,13 +62,13 @@ Int Debug = 0; + *F List( ) . . . . . . . . . . . . . . . . . . . create a new list + */ + #ifdef DEBUG_ON +-TypeList LIST ( file, line, len ) +- String file; +- Int line; +- UInt len; ++TypeList LIST ( ++ String file, ++ Int line, ++ UInt len) + #else +-TypeList List ( len ) +- UInt len; ++TypeList List ( ++ UInt len) + #endif + { + TypeList list; +@@ -95,15 +95,15 @@ TypeList List ( len ) + *F AddList( , ) . . . . . . . . add list element to + */ + #ifdef DEBUG_ON +-void ADD_LIST ( file, line, lst, elm ) +- String file; +- Int line; +- TypeList lst; +- Pointer elm; ++void ADD_LIST ( ++ String file, ++ Int line, ++ TypeList lst, ++ Pointer elm) + #else +-void AddList ( lst, elm ) +- TypeList lst; +- Pointer elm; ++void AddList ( ++ TypeList lst, ++ Pointer elm) + #endif + { + /* give some debug information */ +--- src.x11/xcmds.c.orig 2024-03-15 16:59:24.433308375 -0600 ++++ src.x11/xcmds.c 2025-01-19 20:36:44.344766920 -0700 +@@ -2056,8 +2056,8 @@ void InitXCMDS () + ** + *F UpdateXCMDS( ) . . . . . . . . . . gap is/isn't accepting input + */ +-void UpdateXCMDS ( state ) +- Boolean state; ++void UpdateXCMDS ( ++ Boolean state) + { + TypeGapWindow * win; + Int i; +--- src.x11/xcmds.h.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/xcmds.h 2025-01-19 21:04:34.260330623 -0700 +@@ -129,7 +129,7 @@ TypePaneData; + */ + extern void InitXCMDS( void ); + extern void ExitXMCDS( void ); +-extern void UpdateXCMDS( Int ); ++extern void UpdateXCMDS( Boolean ); + extern Boolean GapWindowCmd( String, Int ); + + #endif +--- src.x11/xgap.c.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/xgap.c 2025-01-19 21:15:10.292231384 -0700 +@@ -255,8 +255,15 @@ static char *FallbackResources[] = + *V GapMenu . . . . . . . . . . . . . . . . . . . . . . . . xgap's "GAP" menu + ** + */ +-static void MenuQuitGap () { KeyboardInput( "@C@A@Kquit;\nquit;\n", 18 ); } +-static void MenuKillGap () { KillGap(); } ++static void MenuQuitGap ([[maybe_unused]] TypeMenuItem *item) ++{ ++ KeyboardInput( "@C@A@Kquit;\nquit;\n", 18 ); ++} ++ ++static void MenuKillGap ([[maybe_unused]] TypeMenuItem *item) ++{ ++ KillGap(); ++} + + #ifdef DEBUG_ON + static void MenuResyncGap () +@@ -269,8 +276,8 @@ static void MenuResyncGap () + } + #endif + +-static void MenuPastePrompt ( item ) +- TypeMenuItem * item; ++static void MenuPastePrompt ( ++ TypeMenuItem * item) + { + static Boolean paste = False; + +@@ -284,8 +291,8 @@ static void MenuPastePrompt ( item ) + (String)NULL ); + } + +-static void MenuQuitGapCTRD ( item ) +- TypeMenuItem * item; ++static void MenuQuitGapCTRD ( ++ TypeMenuItem * item) + { + QuitGapCtrlD = !QuitGapCtrlD; + if ( QuitGapCtrlD ) +@@ -297,8 +304,8 @@ static void MenuQuitGapCTRD ( item ) + } + + #ifndef NO_FILE_SELECTOR +-void MenuReadFile ( item ) +- TypeMenuItem * item; ++void MenuReadFile ( ++ TypeMenuItem * item) + { + Int res; + String str; +@@ -341,14 +348,14 @@ static TypeMenuItem GapMenu[] = + *V HelpMenu . . . . . . . . . . . . . . . . . . . . . . xgap's "Help" menu + ** + */ +-static void MenuChapters () { SimulateInput( "?Chapters\n" ); } +-static void MenuSections () { SimulateInput( "?Sections\n" ); } +-static void MenuCopyright () { SimulateInput( "?Copyright\n" );} +-static void MenuHelp () { SimulateInput( "?Help\n" ); } +-static void MenuNextHelp () { SimulateInput( "?>\n" ); } +-static void MenuNextChapter () { SimulateInput( "?>>\n" ); } +-static void MenuPrevChapter () { SimulateInput( "?<<\n" ); } +-static void MenuPrevHelp () { SimulateInput( "?<\n" ); } ++static void MenuChapters ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Chapters\n" ); } ++static void MenuSections ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Sections\n" ); } ++static void MenuCopyright ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Copyright\n" );} ++static void MenuHelp ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Help\n" ); } ++static void MenuNextHelp ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?>\n" ); } ++static void MenuNextChapter ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?>>\n" ); } ++static void MenuPrevChapter ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?<<\n" ); } ++static void MenuPrevHelp ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?<\n" ); } + + + static TypeMenuItem HelpMenu[] = +@@ -372,11 +379,11 @@ static TypeMenuItem HelpMenu[] = + *V RunMenu . . . . . . . . . . . . . . . . . . . . . . . . xgap's "Run" menu + ** + */ +-static void MenuInterrupt () { InterruptGap(); } +-static void MenuQuitBreak () { SimulateInput( "quit;\n" ); } +-static void MenuContBreak () { SimulateInput( "return;\n" ); } +-static void MenuGarbColl () { SimulateInput( "GASMAN(\"collect\");\n" ); } +-static void MenuGarbMesg () { SimulateInput( "GASMAN(\"message\");\n" ); } ++static void MenuInterrupt ([[maybe_unused]] TypeMenuItem *item) { InterruptGap(); } ++static void MenuQuitBreak ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "quit;\n" ); } ++static void MenuContBreak ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "return;\n" ); } ++static void MenuGarbColl ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "GASMAN(\"collect\");\n" ); } ++static void MenuGarbMesg ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "GASMAN(\"message\");\n" ); } + + static TypeMenuItem RunMenu[] = + { +@@ -497,8 +504,8 @@ static void MenuSelected ( + ** + *F UpdateMenus( ) . . . . . . update menus in case of state change + */ +-void UpdateMenus ( state ) +- Int state; ++void UpdateMenus ( ++ Int state) + { + TypeList l; + Int i; +@@ -581,9 +588,9 @@ static Widget LabelLiveObjects; + static Widget LabelLiveKB; + static Widget LabelTotalKBytes; + +-void UpdateMemoryInfo ( type, val ) +- Int type; +- Int val; ++void UpdateMemoryInfo ( ++ Int type, ++ Int val) + { + char tmp[30]; + +@@ -806,11 +813,11 @@ static void CreateGapWindow ( void ) + + *F MyErrorHandler() . . . . . . . . . . . . kill gap in case of X error + */ +-static int (*OldErrorHandler)(); ++static int (*OldErrorHandler)(Display *, XErrorEvent *); + +-static int MyErrorHandler ( dis, evt ) +- Display * dis; +- XErrorEvent evt; ++static int MyErrorHandler ( ++ Display * dis, ++ XErrorEvent * evt) + { + # ifdef DEBUG_ON + fputs( "killing gap because of X error\n", stderr ); +@@ -824,10 +831,10 @@ static int MyErrorHandler ( dis, evt ) + ** + *F MyIOErrorHandler() . . . . . . . . . . . kill gap in case of X error + */ +-static int (*OldIOErrorHandler)(); ++static int (*OldIOErrorHandler)(Display *); + +-static int MyIOErrorHandler ( dis ) +- Display * dis; ++static int MyIOErrorHandler ( ++ Display * dis) + { + # ifdef DEBUG_ON + fputs( "killing gap because of X IO error\n", stderr ); +@@ -843,68 +850,68 @@ static int MyIOErrorHandler ( dis ) + */ + #ifdef DEBUG_ON + +-static void (*OldSignalHandlerHUP)(); +-static void (*OldSignalHandlerINT)(); +-static void (*OldSignalHandlerQUIT)(); +-static void (*OldSignalHandlerILL)(); +-static void (*OldSignalHandlerIOT)(); +-static void (*OldSignalHandlerBUS)(); +-static void (*OldSignalHandlerSEGV)(); ++static void (*OldSignalHandlerHUP)(int); ++static void (*OldSignalHandlerINT)(int); ++static void (*OldSignalHandlerQUIT)(int); ++static void (*OldSignalHandlerILL)(int); ++static void (*OldSignalHandlerIOT)(int); ++static void (*OldSignalHandlerBUS)(int); ++static void (*OldSignalHandlerSEGV)(int); + +-static void MySignalHandlerHUP () ++static void MySignalHandlerHUP (int signo) + { + fputs( "killing gap because of signal HUP\n", stderr ); + KillGap(); +- OldSignalHandlerHUP(); ++ OldSignalHandlerHUP(signo); + exit(1); + } +-static void MySignalHandlerINT () ++static void MySignalHandlerINT (int signo) + { + fputs( "killing gap because of signal INT\n", stderr ); + KillGap(); +- OldSignalHandlerINT(); ++ OldSignalHandlerINT(signo); + exit(1); + } +-static void MySignalHandlerQUIT () ++static void MySignalHandlerQUIT (int signo) + { + fputs( "killing gap because of signal QUIT\n", stderr ); + KillGap(); +- OldSignalHandlerQUIT(); ++ OldSignalHandlerQUIT(signo); + exit(1); + } +-static void MySignalHandlerILL () ++static void MySignalHandlerILL (int signo) + { + fputs( "killing gap because of signal ILL\n", stderr ); + KillGap(); +- OldSignalHandlerILL(); ++ OldSignalHandlerILL(signo); + exit(1); + } +-static void MySignalHandlerIOT () ++static void MySignalHandlerIOT (int signo) + { + fputs( "killing gap because of signal IOT\n", stderr ); + KillGap(); +- OldSignalHandlerIOT(); ++ OldSignalHandlerIOT(signo); + exit(1); + } +-static void MySignalHandlerBUS () ++static void MySignalHandlerBUS (int signo) + { + fputs( "killing gap because of signal BUS\n", stderr ); + KillGap(); +- OldSignalHandlerBUS(); ++ OldSignalHandlerBUS(signo); + exit(1); + } + +-static void MySignalHandlerSEGV () ++static void MySignalHandlerSEGV (int signo) + { + fputs( "killing gap because of signal SEGV\n", stderr ); + KillGap(); +- OldSignalHandlerSEGV(); ++ OldSignalHandlerSEGV(signo); + exit(1); + } + + #else + +-static void MySignalHandler () ++static void MySignalHandler ([[maybe_unused]] int signo) + { + KillGap(); + exit(1); +@@ -927,9 +934,9 @@ static void MySignalHandler () + */ + static char * nargv[1024]; + +-static void ParseArgs ( argc, argv ) +- Int argc; +- char ** argv; ++static void ParseArgs ( ++ Int argc, ++ char ** argv) + { + Int nargc; + Int i, j; +@@ -1072,9 +1079,9 @@ fullusage: + #include "bitmaps/exmark.bm" + #include "bitmaps/menusym.bm" + +-int main ( argc, argv ) +- int argc; +- char ** argv; ++int main ( ++ int argc, ++ char ** argv) + { + String color; + String colors; +--- src.x11/xgap.h.orig 2024-02-07 16:26:14.000000000 -0700 ++++ src.x11/xgap.h 2025-01-19 20:52:26.269604813 -0700 +@@ -25,7 +25,7 @@ + typedef struct _menu_item + { + char * label; +- void (*click)(); ++ void (*click)(struct _menu_item *); + int sensitive; + Widget entry; + } diff --git a/xgap.spec b/xgap.spec index 30ed879..3182569 100644 --- a/xgap.spec +++ b/xgap.spec @@ -22,6 +22,8 @@ Source2: XGap Patch: %{name}-warning.patch # Fix FTBFS due to an incompatible pointer type Patch: %{name}-incompatible-pointer.patch +# Adapt to changes in C23 +Patch: %{name}-c23.patch BuildRequires: desktop-file-utils BuildRequires: gap-devel From 2d05773fbde3ce1666b20dbd0227374d410f7c6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:51:55 +0000 Subject: [PATCH 28/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5d3e2ff32d291c5fbdccd598db6cda48adfdaec3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 25 Sep 2025 10:24:01 -0600 Subject: [PATCH 29/32] Version 4.33 - Drop upstreamed C23 patch - Add patch to fix gap binary location in the tests - Use the GAP declarative buildsystem --- sources | 2 +- xgap-c23.patch | 770 -------------------------------- xgap-gap-path.patch | 11 + xgap-incompatible-pointer.patch | 2 +- xgap.spec | 39 +- 5 files changed, 35 insertions(+), 789 deletions(-) delete mode 100644 xgap-c23.patch create mode 100644 xgap-gap-path.patch diff --git a/sources b/sources index 3595438..8450403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xgap-4.32.tar.gz) = 91e09f5c8cdd37d73d0ff733a5c0873527185a29ac784eb7fd18de85118ef4a79a634eea88ac16808e54cc0e144b5c1c850c8a1ce0f4bec63ce134ee301eb997 +SHA512 (xgap-4.33.tar.gz) = 70055f3f8e81060024f1359831bbfff8a1e0f98f075a560187e9de95fb74ba728ec306a2eef74eea53dcee09b93823e950e82cddfab64160b8f8b98914eaecca diff --git a/xgap-c23.patch b/xgap-c23.patch deleted file mode 100644 index 87e4c5c..0000000 --- a/xgap-c23.patch +++ /dev/null @@ -1,770 +0,0 @@ ---- src.x11/gaptext.c.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/gaptext.c 2025-01-19 20:55:42.267107554 -0700 -@@ -14,11 +14,11 @@ - #include "utils.h" - #include "gaptext.h" - --extern void _XawTextPrepareToUpdate(); --extern int _XawTextReplace(); --extern void _XawTextSetScrollBars(); --extern void _XawTextCheckResize(); --extern void _XawTextExecuteUpdate(); -+extern void _XawTextPrepareToUpdate(TextWidget); -+extern int _XawTextReplace(TextWidget, XawTextPosition, XawTextPosition, XawTextBlock *); -+extern void _XawTextSetScrollBars(TextWidget); -+extern void _XawTextCheckResize(TextWidget); -+extern void _XawTextExecuteUpdate(TextWidget); - - - /**************************************************************************** -@@ -666,7 +666,7 @@ static XawTextPosition GapSrcReadText ( - Widget w, - XawTextPosition pos, - XawTextBlock * text, -- unsigned long length ) -+ Int length ) - { - GapSrcObject src = (GapSrcObject) w; - -@@ -913,9 +913,9 @@ GapSrcClassRec gapSrcClassRec = - /* extension */ NULL - }, - { /* textSrc_class fields */ -- /* Read */ (XawTextPosition (*)())GapSrcReadText, -- /* Replace */ (int (*)()) GapSrcReplaceText, -- /* Scan */ (XawTextPosition (*)()) GapSrcScan, -+ /* Read */ GapSrcReadText, -+ /* Replace */ GapSrcReplaceText, -+ /* Scan */ GapSrcScan, - /* Search */ XtInheritSearch, - /* SetSelection */ XtInheritSetSelection, - /* ConvertSelection */ XtInheritConvertSelection -@@ -1006,7 +1006,7 @@ void GTDelete ( Widget w, XawTextScanDir - Int from; - - /* prepare text for update */ -- _XawTextPrepareToUpdate(gap); -+ _XawTextPrepareToUpdate((TextWidget)gap); - gap->text.time = CurrentTime; - - /* find and */ -@@ -1025,19 +1025,19 @@ void GTDelete ( Widget w, XawTextScanDir - /* remove text */ - text.length = 0; - text.firstPos = 0; -- if ( _XawTextReplace( gap, from, to, &text ) ) -+ if ( _XawTextReplace( (TextWidget)gap, from, to, &text ) ) - { - XBell(XtDisplay(gap), 50); - goto error; - } - gap->text.insertPos = from; - gap->text.showposition = TRUE; -- _XawTextSetScrollBars(gap); -+ _XawTextSetScrollBars((TextWidget)gap); - - /* do update */ - error: -- _XawTextCheckResize(gap); -- _XawTextExecuteUpdate(gap); -+ _XawTextCheckResize((TextWidget)gap); -+ _XawTextExecuteUpdate((TextWidget)gap); - gap->text.mult = 1; - } - ---- src.x11/gaptext.h.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/gaptext.h 2025-01-19 20:26:04.761116990 -0700 -@@ -96,10 +96,10 @@ extern GapTextClassRec gapTextClassRec; - typedef struct - { - /* function to call when receiving input */ -- void (*input_callback)(); -+ void (*input_callback)(String, Int); - - /* function to position caret */ -- Int (*check_caret_pos)(); -+ Int (*check_caret_pos)(Int, Int); - - /* input buffer for unprocessed input */ - String buffer; ---- src.x11/popdial.c.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/popdial.c 2025-01-19 20:27:23.072111848 -0700 -@@ -71,10 +71,10 @@ static struct { String name; Int flag; - { "overwrite", PD_OVERWRITE } - }; - --static void ButtonSelected ( w, cld, cd ) -- Widget w; -- XtPointer cld; -- XtPointer cd; -+static void ButtonSelected ( -+ Widget w, -+ XtPointer cld, -+ XtPointer cd) - { - Int i; - Int * res = (int*) cld; -@@ -96,13 +96,13 @@ static void ButtonSelected ( w, cld, cd - - static Boolean BrokenWM = False; - --TypePopupDialog CreatePopupDialog ( app, top, name, bt, def, pix ) -- XtAppContext app; -- Widget top; -- String name; -- Int bt; -- Int def; -- Pixmap pix; -+TypePopupDialog CreatePopupDialog ( -+ XtAppContext app, -+ Widget top, -+ String name, -+ Int bt, -+ Int def, -+ Pixmap pix) - { - Display * dp; - TypePopupDialog dialog; -@@ -198,11 +198,11 @@ void PopupDialogBrokenWM ( ) - */ - static Cursor BlobCursor = 0; - --Int PopupDialog ( dialog, message, deflt, result ) -- TypePopupDialog dialog; -- String message; -- String deflt; -- String * result; -+Int PopupDialog ( -+ TypePopupDialog dialog, -+ String message, -+ String deflt, -+ String * result) - { - Display * display; - Position x1, y1, tmp; ---- src.x11/pty.c.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/pty.c 2025-01-19 20:31:00.389267989 -0700 -@@ -117,11 +117,11 @@ Boolean ExecRunning = False; - */ - #ifdef DEBUG_ON - --Int READ_GAP ( file, where, line, len ) -- String file; -- Int where; -- String line; -- Int len; -+Int READ_GAP ( -+ String file, -+ Int where, -+ String line, -+ Int len) - { - Int n; - Int old; -@@ -171,9 +171,9 @@ Int READ_GAP ( file, where, line, len ) - - #else - --Int ReadGap ( line, len ) -- String line; -- Int len; -+Int ReadGap ( -+ String line, -+ Int len) - { - Int n; - Int old; -@@ -201,15 +201,15 @@ Int ReadGap ( line, len ) - ** - *F WriteGap( , ) . . . . . . . . . . . . . . . . write gap input - */ --extern int errno; -+#include - - #ifdef DEBUG_ON - --void WRITE_GAP ( file, where, line, len ) -- String file; -- Int where; -- String line; -- Int len; -+void WRITE_GAP ( -+ String file, -+ Int where, -+ String line, -+ Int len) - { - Int res; - -@@ -238,9 +238,9 @@ void WRITE_GAP ( file, where, line, len - - #else - --void WriteGap ( line, len ) -- String line; -- Int len; -+void WriteGap ( -+ String line, -+ Int len) - { - Int res; - -@@ -337,8 +337,8 @@ static Int LastLine; - - *F WaitInput( ) . . . . . . . . . . . . . . . wait for one character - */ --void WaitInput ( buf ) -- struct _in_buf * buf; -+void WaitInput ( -+ struct _in_buf * buf) - { - Int len; - -@@ -356,8 +356,8 @@ void WaitInput ( buf ) - ** - *F WaitInput2( ) . . . . . . . . . . . . . . . wait for two characters - */ --void WaitInput2 ( buf ) -- struct _in_buf * buf; -+void WaitInput2 ( -+ struct _in_buf * buf) - { - Int len; - -@@ -385,8 +385,8 @@ void WaitInput2 ( buf ) - ** - *F ReadLine( ) . . . . . . . . . . . . . . . . . . . . . . read a line - */ --void ReadLine ( buf ) -- struct _in_buf * buf; -+void ReadLine ( -+ struct _in_buf * buf) - { - String ptr = GapBuffer; - -@@ -435,9 +435,9 @@ static struct _storage - } - Storage = { 0, 0, 0 }; - --void StoreInput ( str, len ) -- String str; -- Int len; -+void StoreInput ( -+ String str, -+ Int len) - { - if ( Storage.buffer == 0 ) - { -@@ -460,8 +460,8 @@ void StoreInput ( str, len ) - */ - static Char InputCookie = 'A'; - --void ProcessStoredInput ( state ) -- Int state; -+void ProcessStoredInput ( -+ Int state) - { - String ptr; - String free; -@@ -558,8 +558,8 @@ again: - ** - *F SimulateInput( ) . . . . . . . . . . enter a line as command line - */ --void SimulateInput ( str ) -- String str; -+void SimulateInput ( -+ String str) - { - Int pos; - -@@ -585,8 +585,8 @@ void SimulateInput ( str ) - Boolean PlayingBack = False; - FILE * Playback = 0; - --int PlaybackFile ( str ) -- String str; -+int PlaybackFile ( -+ String str) - { - if ( Playback != 0 ) { - fclose(Playback); -@@ -609,9 +609,9 @@ int ResumePlayback ( void ) - return True; - } - --void KeyboardInput ( str, len ) -- String str; -- Int len; -+void KeyboardInput ( -+ String str, -+ Int len) - { - char buf[1025]; - -@@ -750,9 +750,9 @@ void KeyboardInput ( str, len ) - ** - *F CheckCaretPos( , ) . . . . . . . . . . . check caret movement - */ --Int CheckCaretPos ( new, old ) -- Int new; -- Int old; -+Int CheckCaretPos ( -+ Int new, -+ Int old) - { - /* if is -1, then gap is running, ignore move */ - if ( LastLine < 0 ) -@@ -824,10 +824,10 @@ static Boolean ParseInt ( - - static char TBuf[SIZE_BUFFER]; - --void GapOutput ( cld, fid, id ) -- XtPointer cld; -- int * fid; -- XtInputId id; -+void GapOutput ( -+ XtPointer cld, -+ int * fid, -+ XtInputId id) - { - char ch; - Int special; -@@ -1272,7 +1272,7 @@ static UInt OpenPty(int * master, int * - ** - *F StartGapProcess( , ) . . . start a gap subprocess using ptys - */ --static void GapStatusHasChanged () -+static void GapStatusHasChanged ([[maybe_unused]] int signo) - { - int w; - -@@ -1286,9 +1286,9 @@ static void GapStatusHasChanged () - exit(1); - } - --int StartGapProcess ( name, argv ) -- String name; -- String argv[]; -+int StartGapProcess ( -+ String name, -+ String argv[]) - { - Int j; /* loop variables */ - char c[10]; /* buffer for communication */ ---- src.x11/selfile.c.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/selfile.c 2025-01-19 21:20:59.023791159 -0700 -@@ -110,33 +110,30 @@ typedef struct { - time_t mtime; - } SFDir; - --static void -- SFenterList(), -- SFleaveList(), -- SFmotionList(), -- SFbuttonPressList(), -- SFbuttonReleaseList(); -+static void SFenterList(Widget, long, XEnterWindowEvent *); -+static void SFleaveList(Widget, int, XEvent *); -+static void SFmotionList(Widget, int, XMotionEvent *); -+static void SFbuttonPressList(Widget, int, XButtonPressedEvent *); -+static void SFbuttonReleaseList(Widget, int, XButtonReleasedEvent *); - --static void -- SFvSliderMovedCallback(), -- SFvFloatSliderMovedCallback(), -- SFhSliderMovedCallback(), -- SFpathSliderMovedCallback(), -- SFvAreaSelectedCallback(), -- SFhAreaSelectedCallback(), -- SFpathAreaSelectedCallback(); -+static void SFvSliderMovedCallback(Widget, long, int); -+static void SFvFloatSliderMovedCallback(Widget, int, float *); -+static void SFhSliderMovedCallback(Widget, int, float *); -+static void SFpathSliderMovedCallback(Widget, XtPointer, float *); -+static void SFvAreaSelectedCallback(Widget, int, int); -+static void SFhAreaSelectedCallback(Widget, int, int); -+static void SFpathAreaSelectedCallback(Widget, XtPointer, int); - --static Boolean SFworkProc(); -+static Boolean SFworkProc(XtPointer); - --static int SFcompareEntries(); -+static int SFcompareEntries(const void *, const void *); - --static void SFdirModTimer(); -+static void SFdirModTimer(XtPointer, XtIntervalId *); - --static char SFstatChar(); -+static char SFstatChar(struct stat *); - - --/* BSD 4.3 errno.h does not declare errno */ --extern int errno; -+#include - /* extern int sys_nerr; */ - - #if !defined(S_ISDIR) && defined(S_IFDIR) -@@ -1157,7 +1154,7 @@ SFpathAreaSelectedCallback(Widget w, XtP - } - - static Boolean --SFworkProc() -+SFworkProc([[maybe_unused]] XtPointer closure) - { - register SFDir *dir; - register SFEntry *entry; -@@ -1250,7 +1247,8 @@ SFreplaceText(SFDir *dir, char *str) - if (str[len - 1] == '/') { - (void) strcat(SFcurrentPath, str); - } else { -- (void) strncat(SFcurrentPath, str, len - 1); -+ len = strlen(SFcurrentPath); -+ (void) strncat(SFcurrentPath, str, MAXPATHLEN - len - 1); - } - if (strncmp(SFcurrentPath, SFstartDir, strlen(SFstartDir))) { - SFsetText(SFcurrentPath); ---- src.x11/utils.c.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/utils.c 2025-01-19 20:34:59.138143676 -0700 -@@ -62,13 +62,13 @@ Int Debug = 0; - *F List( ) . . . . . . . . . . . . . . . . . . . create a new list - */ - #ifdef DEBUG_ON --TypeList LIST ( file, line, len ) -- String file; -- Int line; -- UInt len; -+TypeList LIST ( -+ String file, -+ Int line, -+ UInt len) - #else --TypeList List ( len ) -- UInt len; -+TypeList List ( -+ UInt len) - #endif - { - TypeList list; -@@ -95,15 +95,15 @@ TypeList List ( len ) - *F AddList( , ) . . . . . . . . add list element to - */ - #ifdef DEBUG_ON --void ADD_LIST ( file, line, lst, elm ) -- String file; -- Int line; -- TypeList lst; -- Pointer elm; -+void ADD_LIST ( -+ String file, -+ Int line, -+ TypeList lst, -+ Pointer elm) - #else --void AddList ( lst, elm ) -- TypeList lst; -- Pointer elm; -+void AddList ( -+ TypeList lst, -+ Pointer elm) - #endif - { - /* give some debug information */ ---- src.x11/xcmds.c.orig 2024-03-15 16:59:24.433308375 -0600 -+++ src.x11/xcmds.c 2025-01-19 20:36:44.344766920 -0700 -@@ -2056,8 +2056,8 @@ void InitXCMDS () - ** - *F UpdateXCMDS( ) . . . . . . . . . . gap is/isn't accepting input - */ --void UpdateXCMDS ( state ) -- Boolean state; -+void UpdateXCMDS ( -+ Boolean state) - { - TypeGapWindow * win; - Int i; ---- src.x11/xcmds.h.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/xcmds.h 2025-01-19 21:04:34.260330623 -0700 -@@ -129,7 +129,7 @@ TypePaneData; - */ - extern void InitXCMDS( void ); - extern void ExitXMCDS( void ); --extern void UpdateXCMDS( Int ); -+extern void UpdateXCMDS( Boolean ); - extern Boolean GapWindowCmd( String, Int ); - - #endif ---- src.x11/xgap.c.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/xgap.c 2025-01-19 21:15:10.292231384 -0700 -@@ -255,8 +255,15 @@ static char *FallbackResources[] = - *V GapMenu . . . . . . . . . . . . . . . . . . . . . . . . xgap's "GAP" menu - ** - */ --static void MenuQuitGap () { KeyboardInput( "@C@A@Kquit;\nquit;\n", 18 ); } --static void MenuKillGap () { KillGap(); } -+static void MenuQuitGap ([[maybe_unused]] TypeMenuItem *item) -+{ -+ KeyboardInput( "@C@A@Kquit;\nquit;\n", 18 ); -+} -+ -+static void MenuKillGap ([[maybe_unused]] TypeMenuItem *item) -+{ -+ KillGap(); -+} - - #ifdef DEBUG_ON - static void MenuResyncGap () -@@ -269,8 +276,8 @@ static void MenuResyncGap () - } - #endif - --static void MenuPastePrompt ( item ) -- TypeMenuItem * item; -+static void MenuPastePrompt ( -+ TypeMenuItem * item) - { - static Boolean paste = False; - -@@ -284,8 +291,8 @@ static void MenuPastePrompt ( item ) - (String)NULL ); - } - --static void MenuQuitGapCTRD ( item ) -- TypeMenuItem * item; -+static void MenuQuitGapCTRD ( -+ TypeMenuItem * item) - { - QuitGapCtrlD = !QuitGapCtrlD; - if ( QuitGapCtrlD ) -@@ -297,8 +304,8 @@ static void MenuQuitGapCTRD ( item ) - } - - #ifndef NO_FILE_SELECTOR --void MenuReadFile ( item ) -- TypeMenuItem * item; -+void MenuReadFile ( -+ TypeMenuItem * item) - { - Int res; - String str; -@@ -341,14 +348,14 @@ static TypeMenuItem GapMenu[] = - *V HelpMenu . . . . . . . . . . . . . . . . . . . . . . xgap's "Help" menu - ** - */ --static void MenuChapters () { SimulateInput( "?Chapters\n" ); } --static void MenuSections () { SimulateInput( "?Sections\n" ); } --static void MenuCopyright () { SimulateInput( "?Copyright\n" );} --static void MenuHelp () { SimulateInput( "?Help\n" ); } --static void MenuNextHelp () { SimulateInput( "?>\n" ); } --static void MenuNextChapter () { SimulateInput( "?>>\n" ); } --static void MenuPrevChapter () { SimulateInput( "?<<\n" ); } --static void MenuPrevHelp () { SimulateInput( "?<\n" ); } -+static void MenuChapters ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Chapters\n" ); } -+static void MenuSections ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Sections\n" ); } -+static void MenuCopyright ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Copyright\n" );} -+static void MenuHelp ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?Help\n" ); } -+static void MenuNextHelp ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?>\n" ); } -+static void MenuNextChapter ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?>>\n" ); } -+static void MenuPrevChapter ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?<<\n" ); } -+static void MenuPrevHelp ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "?<\n" ); } - - - static TypeMenuItem HelpMenu[] = -@@ -372,11 +379,11 @@ static TypeMenuItem HelpMenu[] = - *V RunMenu . . . . . . . . . . . . . . . . . . . . . . . . xgap's "Run" menu - ** - */ --static void MenuInterrupt () { InterruptGap(); } --static void MenuQuitBreak () { SimulateInput( "quit;\n" ); } --static void MenuContBreak () { SimulateInput( "return;\n" ); } --static void MenuGarbColl () { SimulateInput( "GASMAN(\"collect\");\n" ); } --static void MenuGarbMesg () { SimulateInput( "GASMAN(\"message\");\n" ); } -+static void MenuInterrupt ([[maybe_unused]] TypeMenuItem *item) { InterruptGap(); } -+static void MenuQuitBreak ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "quit;\n" ); } -+static void MenuContBreak ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "return;\n" ); } -+static void MenuGarbColl ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "GASMAN(\"collect\");\n" ); } -+static void MenuGarbMesg ([[maybe_unused]] TypeMenuItem *item) { SimulateInput( "GASMAN(\"message\");\n" ); } - - static TypeMenuItem RunMenu[] = - { -@@ -497,8 +504,8 @@ static void MenuSelected ( - ** - *F UpdateMenus( ) . . . . . . update menus in case of state change - */ --void UpdateMenus ( state ) -- Int state; -+void UpdateMenus ( -+ Int state) - { - TypeList l; - Int i; -@@ -581,9 +588,9 @@ static Widget LabelLiveObjects; - static Widget LabelLiveKB; - static Widget LabelTotalKBytes; - --void UpdateMemoryInfo ( type, val ) -- Int type; -- Int val; -+void UpdateMemoryInfo ( -+ Int type, -+ Int val) - { - char tmp[30]; - -@@ -806,11 +813,11 @@ static void CreateGapWindow ( void ) - - *F MyErrorHandler() . . . . . . . . . . . . kill gap in case of X error - */ --static int (*OldErrorHandler)(); -+static int (*OldErrorHandler)(Display *, XErrorEvent *); - --static int MyErrorHandler ( dis, evt ) -- Display * dis; -- XErrorEvent evt; -+static int MyErrorHandler ( -+ Display * dis, -+ XErrorEvent * evt) - { - # ifdef DEBUG_ON - fputs( "killing gap because of X error\n", stderr ); -@@ -824,10 +831,10 @@ static int MyErrorHandler ( dis, evt ) - ** - *F MyIOErrorHandler() . . . . . . . . . . . kill gap in case of X error - */ --static int (*OldIOErrorHandler)(); -+static int (*OldIOErrorHandler)(Display *); - --static int MyIOErrorHandler ( dis ) -- Display * dis; -+static int MyIOErrorHandler ( -+ Display * dis) - { - # ifdef DEBUG_ON - fputs( "killing gap because of X IO error\n", stderr ); -@@ -843,68 +850,68 @@ static int MyIOErrorHandler ( dis ) - */ - #ifdef DEBUG_ON - --static void (*OldSignalHandlerHUP)(); --static void (*OldSignalHandlerINT)(); --static void (*OldSignalHandlerQUIT)(); --static void (*OldSignalHandlerILL)(); --static void (*OldSignalHandlerIOT)(); --static void (*OldSignalHandlerBUS)(); --static void (*OldSignalHandlerSEGV)(); -+static void (*OldSignalHandlerHUP)(int); -+static void (*OldSignalHandlerINT)(int); -+static void (*OldSignalHandlerQUIT)(int); -+static void (*OldSignalHandlerILL)(int); -+static void (*OldSignalHandlerIOT)(int); -+static void (*OldSignalHandlerBUS)(int); -+static void (*OldSignalHandlerSEGV)(int); - --static void MySignalHandlerHUP () -+static void MySignalHandlerHUP (int signo) - { - fputs( "killing gap because of signal HUP\n", stderr ); - KillGap(); -- OldSignalHandlerHUP(); -+ OldSignalHandlerHUP(signo); - exit(1); - } --static void MySignalHandlerINT () -+static void MySignalHandlerINT (int signo) - { - fputs( "killing gap because of signal INT\n", stderr ); - KillGap(); -- OldSignalHandlerINT(); -+ OldSignalHandlerINT(signo); - exit(1); - } --static void MySignalHandlerQUIT () -+static void MySignalHandlerQUIT (int signo) - { - fputs( "killing gap because of signal QUIT\n", stderr ); - KillGap(); -- OldSignalHandlerQUIT(); -+ OldSignalHandlerQUIT(signo); - exit(1); - } --static void MySignalHandlerILL () -+static void MySignalHandlerILL (int signo) - { - fputs( "killing gap because of signal ILL\n", stderr ); - KillGap(); -- OldSignalHandlerILL(); -+ OldSignalHandlerILL(signo); - exit(1); - } --static void MySignalHandlerIOT () -+static void MySignalHandlerIOT (int signo) - { - fputs( "killing gap because of signal IOT\n", stderr ); - KillGap(); -- OldSignalHandlerIOT(); -+ OldSignalHandlerIOT(signo); - exit(1); - } --static void MySignalHandlerBUS () -+static void MySignalHandlerBUS (int signo) - { - fputs( "killing gap because of signal BUS\n", stderr ); - KillGap(); -- OldSignalHandlerBUS(); -+ OldSignalHandlerBUS(signo); - exit(1); - } - --static void MySignalHandlerSEGV () -+static void MySignalHandlerSEGV (int signo) - { - fputs( "killing gap because of signal SEGV\n", stderr ); - KillGap(); -- OldSignalHandlerSEGV(); -+ OldSignalHandlerSEGV(signo); - exit(1); - } - - #else - --static void MySignalHandler () -+static void MySignalHandler ([[maybe_unused]] int signo) - { - KillGap(); - exit(1); -@@ -927,9 +934,9 @@ static void MySignalHandler () - */ - static char * nargv[1024]; - --static void ParseArgs ( argc, argv ) -- Int argc; -- char ** argv; -+static void ParseArgs ( -+ Int argc, -+ char ** argv) - { - Int nargc; - Int i, j; -@@ -1072,9 +1079,9 @@ fullusage: - #include "bitmaps/exmark.bm" - #include "bitmaps/menusym.bm" - --int main ( argc, argv ) -- int argc; -- char ** argv; -+int main ( -+ int argc, -+ char ** argv) - { - String color; - String colors; ---- src.x11/xgap.h.orig 2024-02-07 16:26:14.000000000 -0700 -+++ src.x11/xgap.h 2025-01-19 20:52:26.269604813 -0700 -@@ -25,7 +25,7 @@ - typedef struct _menu_item - { - char * label; -- void (*click)(); -+ void (*click)(struct _menu_item *); - int sensitive; - Widget entry; - } diff --git a/xgap-gap-path.patch b/xgap-gap-path.patch new file mode 100644 index 0000000..edd181b --- /dev/null +++ b/xgap-gap-path.patch @@ -0,0 +1,11 @@ +--- tst/xgap_test.g.orig 2024-02-07 16:26:14.000000000 -0700 ++++ tst/xgap_test.g 2025-09-06 14:19:22.424822565 -0600 +@@ -142,7 +142,7 @@ end; + XGT_Test:=function(cmd) + local GAP_cmd, GAP_dir, stream, mycmd; + +- GAP_cmd := Filename(DirectoriesLibrary(""), "gap"); ++ GAP_cmd := "/usr/bin/gap"; + GAP_dir := DirectoryCurrent(); + + XGT_buf:=""; diff --git a/xgap-incompatible-pointer.patch b/xgap-incompatible-pointer.patch index 4c15fb4..46b24ca 100644 --- a/xgap-incompatible-pointer.patch +++ b/xgap-incompatible-pointer.patch @@ -19,7 +19,7 @@ In file included from ../../src.x11/utils.h:120, /* change list */ - XawListChange( arg->sel->list, (const char **)text, 0, 0, True ); -+ XawListChange( arg->sel->list, (char **)text, 0, 0, True ); ++ XawListChange( arg->sel->list, text, 0, 0, True ); /* clear old text */ for ( i = 0; arg->sel->text[i]; i++ ) diff --git a/xgap.spec b/xgap.spec index 3182569..2698111 100644 --- a/xgap.spec +++ b/xgap.spec @@ -1,15 +1,14 @@ -%global giturl https://github.com/gap-packages/xgap +%global gap_pkgname xgap +%global giturl https://github.com/gap-packages/xgap -Name: xgap -Version: 4.32 +Name: %{gap_pkgname} +Version: 4.33 Release: %autorelease Summary: GUI for GAP # The project as a whole is GPL-2.0-or-later. # src.x11/selfile.{c,h} is HPND. License: GPL-2.0-or-later AND HPND -# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} URL: https://gap-packages.github.io/xgap/ VCS : git:%{giturl}.git Source0: %{giturl}/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -22,8 +21,14 @@ Source2: XGap Patch: %{name}-warning.patch # Fix FTBFS due to an incompatible pointer type Patch: %{name}-incompatible-pointer.patch -# Adapt to changes in C23 -Patch: %{name}-c23.patch +# Adapt to a change in the gap binary location in gap 4.15.0 +Patch: %{name}-gap-path.patch + +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} +BuildSystem: gap +BuildOption(install): bin examples htm lib tst +BuildOption(check): tst/testall.g BuildRequires: desktop-file-utils BuildRequires: gap-devel @@ -35,10 +40,10 @@ BuildRequires: tth Requires: gap%{?_isa} -Provides: gap-pkg-xgap = %{version}-%{release} +Provides: gap-pkg-%{gap_pkgname} = %{version}-%{release} %description -A X Windows GUI for GAP. +An X Windows GUI for GAP. %package doc # The content is GPL-2.0-or-later. The remaining licenses cover the various @@ -53,7 +58,7 @@ Requires: %{name} = %{version}-%{release} Requires: gap-pkg-smallgrp-doc %description doc -This package contains documentation for %{name}. +This package contains documentation for %{gap_pkgname}. %prep %autosetup -p0 @@ -71,16 +76,15 @@ ln -s %{gap_libdir}/etc ../../etc ln -s %{gap_libdir}/doc ../../doc ln -s %{gap_libdir}/pkg/smallgrp .. ln -s %{name}-%{version} ../%{name} -make -C doc manual +cd doc +./make_doc +cd - rm -f ../%{name} ../smallgrp ../../{doc,etc} -%install +%install -a mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{gap_archdir}/pkg/%{name}/doc -cp -a *.g bin examples htm lib tst %{buildroot}%{gap_archdir}/pkg/%{name} mv %{buildroot}%{gap_archdir}/pkg/%{name}/bin/xgap.sh %{buildroot}%{_bindir}/xgap rm %{buildroot}%{gap_archdir}/pkg/%{name}/bin/*/{Makefile,config*,*.o} -%gap_copy_docs -n %{name} # Install the desktop file mkdir -p %{buildroot}%{_datadir}/applications @@ -91,11 +95,12 @@ desktop-file-install --mode=644 --dir=%{buildroot}%{_datadir}/applications \ mkdir -p %{buildroot}%{_datadir}/X11/app-defaults cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults -%check +%check -p # Temporarily modify the test runner to add the necessary -l argument sed -i.orig 's|"-p"|"-l","%{buildroot}%{gap_archdir};",&|' \ %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g -gap -l '%{buildroot}%{gap_archdir};' tst/testall.g + +%check -a mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \ %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g From bd7bdf18aab6e263c8401d6d83ccda70eb2e657d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:41:52 +0000 Subject: [PATCH 30/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 0e69a449b3b6773f4bcef501266ea5467c40af42 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 10 Jun 2026 16:11:29 -0600 Subject: [PATCH 31/32] Rebuild for gap 4.16.0 - Use gap(...) symbols in dependencies --- xgap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xgap.spec b/xgap.spec index 2698111..f09c8f0 100644 --- a/xgap.spec +++ b/xgap.spec @@ -31,17 +31,20 @@ BuildOption(install): bin examples htm lib tst BuildOption(check): tst/testall.g BuildRequires: desktop-file-utils -BuildRequires: gap-devel +BuildRequires: gap-devel >= 4.7 BuildRequires: gap-pkg-smallgrp-doc BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(xaw7) BuildRequires: tth -Requires: gap%{?_isa} +Requires: gap%{?_isa} >= 4.7 Provides: gap-pkg-%{gap_pkgname} = %{version}-%{release} +Provides: gap(XGAP) = %{version}-%{release} +Provides: gap(xgap) = %{version}-%{release} + %description An X Windows GUI for GAP. From e531806b854d6297f8b18ef2697f1459f99e14e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:14:53 +0000 Subject: [PATCH 32/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild