From 4ebe5794a247a31395b36c99a95031f821ed8fa72bb6b6739c226b84decc705f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 21 Aug 2024 22:59:16 +0200 Subject: [PATCH] Add gcc14.patch --- gap-xgap.changes | 5 +++++ gap-xgap.spec | 3 ++- gcc14.patch | 30 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gcc14.patch diff --git a/gap-xgap.changes b/gap-xgap.changes index e1dd438..e60824d 100644 --- a/gap-xgap.changes +++ b/gap-xgap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 20:58:38 UTC 2024 - Jan Engelhardt + +- Add gcc14.patch + ------------------------------------------------------------------- Sat Mar 23 22:09:27 UTC 2024 - Jan Engelhardt diff --git a/gap-xgap.spec b/gap-xgap.spec index 84d2f78..b3032fa 100644 --- a/gap-xgap.spec +++ b/gap-xgap.spec @@ -25,6 +25,7 @@ Group: Productivity/Scientific/Math URL: https://gap-packages.github.io/xgap/ #Git-Clone: https://github.com/gap-packages/xgap Source: https://github.com/gap-packages/xgap/releases/download/v%version/xgap-%version.tar.gz +Patch1: gcc14.patch BuildRequires: c_compiler BuildRequires: fdupes BuildRequires: gap-devel @@ -38,7 +39,7 @@ Requires: gap-core >= 4.7 The XGAP package allows to use graphics in GAP. %prep -%autosetup -n xgap-%version +%autosetup -n xgap-%version -p1 %build ./configure --with-gaproot="%gapdir" diff --git a/gcc14.patch b/gcc14.patch new file mode 100644 index 0000000..5dce26c --- /dev/null +++ b/gcc14.patch @@ -0,0 +1,30 @@ +From 0c83898a23ad4c7b5b68a9fcf5899a68fa272e58 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Wed, 21 Aug 2024 22:49:31 +0200 +Subject: [PATCH] build: resolve compile error under gcc-14 +References: https://github.com/gap-packages/xgap/pull/33 + +xcmds.c: In function "FunChangeList": +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 ); +--- + src.x11/xcmds.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src.x11/xcmds.c b/src.x11/xcmds.c +index 644996b..a0242c2 100644 +--- a/src.x11/xcmds.c ++++ b/src.x11/xcmds.c +@@ -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, (String *)text, 0, 0, True ); + + /* clear old text */ + for ( i = 0; arg->sel->text[i]; i++ ) +-- +2.46.0 +