From 1aed766188e30492acf92745e6d9594ff37b7c6fccd41ff71f5a6d992306cd85 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 21 Aug 2024 20:53:21 +0000 Subject: [PATCH 1/2] [info=8001760e9ce78974336fd27b612f7dde2813f031dbf346901ce9701229701572] OBS-URL: https://build.opensuse.org/package/show/science/gap-xgap?expand=0&rev=5 --- .gitattributes | 23 +++++++++++++++++ .gitignore | 1 + _scmsync.obsinfo | 4 +++ build.specials.obscpio | 3 +++ gap-xgap.changes | 12 +++++++++ gap-xgap.spec | 56 ++++++++++++++++++++++++++++++++++++++++++ xgap-4.32.tar.gz | 3 +++ 7 files changed, 102 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 gap-xgap.changes create mode 100644 gap-xgap.spec create mode 100644 xgap-4.32.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..28f42be --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1711397383 +commit: 8001760e9ce78974336fd27b612f7dde2813f031dbf346901ce9701229701572 +url: https://src.opensuse.org/jengelh/gap-xgap +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..ad3835b --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74ca67959625b2cfb379c47920c734c825bc6e39b2ffa413c7339a1935f52566 +size 256 diff --git a/gap-xgap.changes b/gap-xgap.changes new file mode 100644 index 0000000..e1dd438 --- /dev/null +++ b/gap-xgap.changes @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Sat Mar 23 22:09:27 UTC 2024 - Jan Engelhardt + +- Update to release 4.32 + * When resizing a GAP poset sheet via the Magnify command or + similar, the level labels were not getting moved correctly. + They should stay by the right side of the window. + +------------------------------------------------------------------- +Sun Feb 12 20:59:04 UTC 2023 - Jan Engelhardt + +- Initial package (version 4.31) for build.opensuse.org diff --git a/gap-xgap.spec b/gap-xgap.spec new file mode 100644 index 0000000..84d2f78 --- /dev/null +++ b/gap-xgap.spec @@ -0,0 +1,56 @@ +# +# spec file for package gap-xgap +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: gap-xgap +Version: 4.32 +Release: 0 +Summary: GAP: Graphical user interface for GAP +License: GPL-2.0-or-later +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 +BuildRequires: c_compiler +BuildRequires: fdupes +BuildRequires: gap-devel +BuildRequires: gap-rpm-devel +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xt) +Requires: gap-core >= 4.7 + +%description +The XGAP package allows to use graphics in GAP. + +%prep +%autosetup -n xgap-%version + +%build +./configure --with-gaproot="%gapdir" +%make_build + +%install +%gappkg_simple_install +pushd "%buildroot/$moddir" +rm -Rfv configure config.* bin/*/config.* bin/*/configure cnf src.x11 +popd +%fdupes %buildroot/%_prefix + +%files -f %name.files + +%changelog diff --git a/xgap-4.32.tar.gz b/xgap-4.32.tar.gz new file mode 100644 index 0000000..190a7dc --- /dev/null +++ b/xgap-4.32.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87d9a0d10f602f7a58a2b1d162b2c18ee2f648421bf0d7cfd60d4239944a336c +size 886165 From 2fc1a5c660061824ed8bc9e3933b4b53db114b2f13a02926cad448372e3e099a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 21 Aug 2024 20:54:49 +0000 Subject: [PATCH 2/2] [info=4ebe5794a247a31395b36c99a95031f821ed8fa72bb6b6739c226b84decc705f] OBS-URL: https://build.opensuse.org/package/show/science/gap-xgap?expand=0&rev=6 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- gap-xgap.changes | 5 +++++ gap-xgap.spec | 3 ++- gcc14.patch | 30 ++++++++++++++++++++++++++++++ 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 gcc14.patch diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 28f42be..623e65a 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1711397383 -commit: 8001760e9ce78974336fd27b612f7dde2813f031dbf346901ce9701229701572 +mtime: 1724273956 +commit: 4ebe5794a247a31395b36c99a95031f821ed8fa72bb6b6739c226b84decc705f url: https://src.opensuse.org/jengelh/gap-xgap revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index ad3835b..b37f6ff 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74ca67959625b2cfb379c47920c734c825bc6e39b2ffa413c7339a1935f52566 +oid sha256:5adbdf43a770ee8063334d4ab3584b034c87b11a3c93c3367de53482a005b043 size 256 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 +