public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gap] f44: Version 4.16.0
Date: Thu, 11 Jun 2026 16:00:08 GMT	[thread overview]
Message-ID: <178119360841.1.15570227497832337072.rpms-gap-fea91ddaf778@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/gap
            Branch : f44
            Commit : fea91ddaf778d60522af05131e943814627554e4
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-06-10T09:51:49-06:00
            Stats  : +48/-124 in 8 file(s)
            URL    : https://src.fedoraproject.org/rpms/gap/c/fea91ddaf778d60522af05131e943814627554e4?branch=f44

            Log:
            Version 4.16.0

- Drop upstreamed intptr-min and left-shift patches
- Use the new GAP logo
- Drop unnecessary BuildRequires
- Use gap(...) symbols in dependencies
- Run pdftex in nonstop mode
- Relicense the metainfo as GPL-2.0-or-later for simplicity

---
diff --git a/.gitignore b/.gitignore
index 9306fc8..961013b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /gap*.tar.gz
 /gap-testdata.tar.xz
 /gapicon.bmp
+/gaplogo*.svg

diff --git a/gap-README.fedora b/gap-README.fedora
index 391ebed..b17c488 100644
--- a/gap-README.fedora
+++ b/gap-README.fedora
@@ -22,16 +22,6 @@ and reload it at the next start up.  To support this, Fedora provides a
 Debian-derived script, update-gap-workspace; see the update-gap-workspace(1)
 manual page.
 
-Colors in the GAP shell
------------------------
-
-If you would like the GAP shell to display the prompt, input, etc. in color,
-you can try colorprompt.g by Frank Lübeck.  Add this line to ~/.gaprc:
-
-ColorPrompt(true);
-
-See /usr/lib/gap/lib/colorprompt.g for more information.
-
 Browsing GAP Documentation
 --------------------------
 

diff --git a/gap-intptr-min.patch b/gap-intptr-min.patch
deleted file mode 100644
index 378a796..0000000
--- a/gap-intptr-min.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fixes these warnings from UBSAN:
-
-src/integer.c:623:29: runtime error: negation of -9223372036854775808 cannot be represented in type '<unknown>'; cast to an unsigned type to negate this value to itself
-src/integer.c:508:7: runtime error: negation of -9223372036854775808 cannot be represented in type 'long int'; cast to an unsigned type to negate this value to itself
-
---- src/integer.c.orig	2025-10-17 17:53:30.000000000 -0600
-+++ src/integer.c	2026-03-13 14:16:07.729149547 -0600
-@@ -505,7 +505,8 @@ Obj ObjInt_Int( Int i )
-   }
-   else if (i < 0 ) {
-     gmp = NewBag( T_INTNEG, sizeof(mp_limb_t) );
--    i = -i;
-+    if (i > INTPTR_MIN)
-+      i = -i;
-   }
-   else {
-     gmp = NewBag( T_INTPOS, sizeof(mp_limb_t) );
-@@ -620,7 +621,7 @@ Int Int_ObjInt(Obj i)
-     if ((!sign && (val > INT32_MAX)) || (sign && (val > (UInt)INT32_MIN)))
- #endif
-         ErrorMayQuit("Conversion error: integer too large", 0, 0);
--    return sign ? -(Int)val : (Int)val;
-+    return (sign && val != (UInt)INTPTR_MIN) ? -(Int)val : (Int)val;
- }
- 
- UInt UInt_ObjInt(Obj i)

diff --git a/gap-signed-left-shift.patch b/gap-signed-left-shift.patch
deleted file mode 100644
index 10c2a32..0000000
--- a/gap-signed-left-shift.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes this UBSAN warning:
-
-src/sha256.c:98:30: runtime error: left shift of 128 by 24 places cannot be represented in type 'int'
-
---- src/sha256.c.orig	2025-10-17 17:53:30.000000000 -0600
-+++ src/sha256.c	2026-03-13 14:34:10.101176213 -0600
-@@ -95,8 +95,8 @@ static void be32decode(UInt4 * dst, cons
- {
-     UInt i;
-     for (i = 0; i < (len >> 2); i++) {
--        dst[i] = (src[i * 4] << 24) | (src[i * 4 + 1] << 16) |
--                 (src[i * 4 + 2] << 8) | (src[i * 4 + 3]);
-+        dst[i] = (((UInt4)src[i * 4]) << 24) | (((UInt4)src[i * 4 + 1]) << 16) |
-+                 (((UInt4)src[i * 4 + 2]) << 8) | ((UInt4)src[i * 4 + 3]);
-     }
- }
- 

diff --git a/gap.spec b/gap.spec
index 1b0c62c..af40cbf 100644
--- a/gap.spec
+++ b/gap.spec
@@ -1,6 +1,6 @@
 %global gaparchdir %{_libdir}/gap
 %global gaplibdir %{_datadir}/gap
-%global icondir %{_datadir}/icons/hicolor
+%global icondir %{_datadir}/icons/hicolor/scalable/apps
 %global giturl  https://github.com/gap-system/gap
 #global prerel beta3
 
@@ -15,14 +15,13 @@
 # 3. Build gap-pkg-autodoc in bootstrap mode.
 # 4. Build gap-pkg-io
 # 5. Build GAPDoc in non-bootstrap mode.
-# 6. Build gap-pkg-autodoc in non-bootstrap mode.
+# 6. Build gap-pkg-autodoc in non-bootstrap mode and gap-pkg-transgrp.
 # 7. Build gap-pkg-primgrp and gap-pkg-smallgrp.
-# 8. Build gap-pkg-transgrp.
-# 9. Build this package in non-bootstrap mode.
+# 8. Build this package in non-bootstrap mode.
 %bcond bootstrap 0
 
 Name:           gap
-Version:        4.15.1%{?prerel:~%{prerel}}
+Version:        4.16.0%{?prerel:~%{prerel}}
 Release:        %autorelease
 Summary:        Computational discrete algebra
 
@@ -42,41 +41,28 @@ Source6:        gap.1.in
 Source7:        gac.1.in
 Source8:        update-gap-workspace.1
 Source9:        gap.vim
-Source10:       gapicon.bmp
+Source10:       https://www.gap-system.org/assets/logo/light/gaplogo.svg
+Source11:       https://www.gap-system.org/assets/logo/dark/gaplogo.svg#/gaplogo-symbolic.svg
 # Support viewing help files with xdg-open.  Patch courtesy of Debian.
 Patch:          %{name}-help.patch
 # Avoid the popcount instruction on systems that do not support it
 Patch:          %{name}-popcount.patch
 # Use zlib-ng directly instead of via the compatibility layer
 Patch:          %{name}-zlib-ng.patch
-# Fix undefined behavior from taking the negative of INTPTR_MIN
-Patch:          %{name}-intptr-min.patch
-# Fix undefined behavior from a signed left shift
-Patch:          %{name}-signed-left-shift.patch
 
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
 BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
-BuildRequires:  ghostscript
 BuildRequires:  gmp-devel
 BuildRequires:  libappstream-glib
-BuildRequires:  libtool
 BuildRequires:  make
-BuildRequires:  netpbm-progs
-BuildRequires:  parallel
-BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  pkgconfig(readline)
 BuildRequires:  pkgconfig(zlib-ng)
 BuildRequires:  tex(color.sty)
-BuildRequires:  tex(english.ldf)
-BuildRequires:  tex(enumitem.sty)
-BuildRequires:  tex(fancyvrb.sty)
-BuildRequires:  tex(geometry.sty)
-BuildRequires:  tex(pslatex.sty)
 BuildRequires:  tex(tex)
 BuildRequires:  texlive-cm-super
 BuildRequires:  texlive-ec
@@ -88,6 +74,12 @@ BuildRequires:  texlive-symbol
 BuildRequires:  texlive-times
 BuildRequires:  vim-filesystem
 
+%if %{without bootstrap}
+BuildRequires:  tex(enumitem.sty)
+BuildRequires:  tex(fancyvrb.sty)
+BuildRequires:  tex(geometry.sty)
+%endif
+
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
 Requires:       %{name}-online-help = %{version}-%{release}
 Requires:       hicolor-icon-theme
@@ -113,14 +105,13 @@ This package contains the essential GAP libraries: lib and grp.
 Summary:        GAP core components
 Requires:       %{name}-libs = %{version}-%{release}
 %if %{without bootstrap}
-Requires:       GAPDoc
-Requires:       gap-pkg-primgrp
-Requires:       gap-pkg-smallgrp
-Requires:       gap-pkg-transgrp
+# Minimum version numbers appear in lib/system.g
+Requires:       gap(gapdoc) >= 1.2
+Requires:       gap(primgrp) >= 3.1.0
+Requires:       gap(smallgrp) >= 1.0
+Requires:       gap(transgrp) >= 1.0
 %endif
 
-Suggests:       catdoc
-
 %description core
 This package contains the core GAP system.
 
@@ -177,24 +168,23 @@ syntax highlighting and indentation are supported.
 %package -n libgap
 Summary:        Library containing core GAP logic
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
-# The code executes gunzip
-Requires:       gzip
 
 # The packages that GAP itself considers default
-Recommends:     gap-pkg-autpgrp
-Recommends:     gap-pkg-alnuth
-Recommends:     gap-pkg-crisp
-Recommends:     gap-pkg-ctbllib
-Recommends:     gap-pkg-factint
-Recommends:     gap-pkg-fga
-Recommends:     gap-pkg-irredsol
-Recommends:     gap-pkg-laguna
-Recommends:     gap-pkg-packagemanager
-Recommends:     gap-pkg-polenta
-Recommends:     gap-pkg-polycyclic
-Recommends:     gap-pkg-resclasses
-Recommends:     gap-pkg-sophus
-Recommends:     gap-pkg-tomlib
+# See PackagesToLoad in lib/package.gi
+Recommends:     gap(alnuth)
+Recommends:     gap(autpgrp)
+Recommends:     gap(crisp)
+Recommends:     gap(ctbllib)
+Recommends:     gap(factint)
+Recommends:     gap(fga)
+Recommends:     gap(irredsol)
+Recommends:     gap(laguna)
+Recommends:     gap(packagemanager)
+Recommends:     gap(polenta)
+Recommends:     gap(polycyclic)
+Recommends:     gap(resclasses)
+Recommends:     gap(sophus)
+Recommends:     gap(tomlib)
 
 %description -n libgap
 Library containing core GAP logic
@@ -224,8 +214,8 @@ make doc
 
 # Build gapmacrodoc.pdf
 cd doc
-pdftex gapmacrodoc.tex
-pdftex gapmacrodoc.tex
+pdftex -interaction=nonstopmode gapmacrodoc.tex
+pdftex -interaction=nonstopmode gapmacrodoc.tex
 cd -
 
 # Remove build paths
@@ -310,13 +300,9 @@ cp -p %{SOURCE9} %{buildroot}%{vimfiles_root}/ftdetect
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 touch %{buildroot}%{_localstatedir}/lib/%{name}/workspace.gz
 
-# Install the icon; the original is 1024x1024
-bmptopnm %{SOURCE10} > gapicon.pnm
-for size in 16 22 24 32 36 48 64 72 96 128 192 256 512; do
-  mkdir -p %{buildroot}%{icondir}/${size}x${size}/apps
-  pamscale -xsize=$size -ysize=$size gapicon.pnm | pnmtopng -compression=9 \
-    > %{buildroot}%{icondir}/${size}x${size}/apps/%{name}.png
-done
+# Install the icons
+mkdir -p %{buildroot}%{icondir}
+cp -p %{SOURCE10} %{SOURCE11} %{buildroot}%{icondir}
 
 # Install the MIME type
 mkdir -p %{buildroot}%{_datadir}/mime/packages
@@ -360,25 +346,14 @@ make check
 %endif
 
 %files
-%doc README.md README.fedora
+%doc CHANGES.md README.md README.fedora
 %{_bindir}/gap
 %{_mandir}/man1/gap.1*
 %{_metainfodir}/org.gap-system.gap.metainfo.xml
 %{_datadir}/applications/org.gap-system.gap.desktop
 %{_datadir}/mime/packages/gap.xml
-%{icondir}/16x16/apps/gap.png
-%{icondir}/22x22/apps/gap.png
-%{icondir}/24x24/apps/gap.png
-%{icondir}/32x32/apps/gap.png
-%{icondir}/36x36/apps/gap.png
-%{icondir}/48x48/apps/gap.png
-%{icondir}/64x64/apps/gap.png
-%{icondir}/72x72/apps/gap.png
-%{icondir}/96x96/apps/gap.png
-%{icondir}/128x128/apps/gap.png
-%{icondir}/192x192/apps/gap.png
-%{icondir}/256x256/apps/gap.png
-%{icondir}/512x512/apps/gap.png
+%{icondir}/gaplogo.svg
+%{icondir}/gaplogo-symbolic.svg
 
 %files libs
 %license COPYRIGHT LICENSE
@@ -415,7 +390,7 @@ make check
 %{vimfiles_root}/syntax/gap.vim
 
 %files -n libgap
-%{_libdir}/libgap.so.10
+%{_libdir}/libgap.so.11
 %{_libdir}/libgap.so
 %{_libdir}/pkgconfig/libgap.pc
 

diff --git a/org.gap-system.gap.desktop b/org.gap-system.gap.desktop
index b4cbf85..dedf6ef 100644
--- a/org.gap-system.gap.desktop
+++ b/org.gap-system.gap.desktop
@@ -5,7 +5,7 @@ GenericName=Computational discrete algebra
 Comment=Groups, Algorithms, Programming
 Exec=gap %U
 TryExec=gap
-Icon=gap
+Icon=gaplogo
 Terminal=true
 Type=Application
 Categories=Education;Science;Math;

diff --git a/org.gap-system.gap.metainfo.xml b/org.gap-system.gap.metainfo.xml
index f2fb4e1..0e82216 100644
--- a/org.gap-system.gap.metainfo.xml
+++ b/org.gap-system.gap.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
   <id>org.gap-system.gap</id>
-  <metadata_license>CC0-1.0</metadata_license>
+  <metadata_license>GPL-2.0-or-later</metadata_license>
   <project_license>GPL-2.0-or-later</project_license>
   <name>gap</name>
   <summary>Computational discrete algebra</summary>

diff --git a/sources b/sources
index 797ffad..7d0685a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (gap-4.15.1.tar.gz) = a79a0b07bd6c038010dcd53fa16444eb762828af05bc303fb2e1889fa205ff89cd075d8d275f43f1f438933fa92c0850c4cc668cfe1d9728c148352bac5e94fc
-SHA512 (gapicon.bmp) = 170760ba7c945d91e9e2685da83d53c43fa2cd343bf803ed2efef714cf0db65c91821bf2b7558b163d223e4908b145178e46beb1cc261cbb39466bd2b8d532ea
+SHA512 (gap-4.16.0.tar.gz) = 2eca58b531f8e1a565fd27beedd6eda4fa3203c2a437cf5af8c3d97c06d29856ea9ab407f377219c2e0f4f5e258f10925326cf839afccd3141af8e8d4c84a97d
+SHA512 (gaplogo.svg) = fa5721b78e7a8daf658c0c6895f4ebacf6f2b3517dd65391946880d5733f010ef6da540a9392f708845bc312035e393ef30d0cbeba9d290aa90fccbcec74f5f8
+SHA512 (gaplogo-symbolic.svg) = 7ac0a231343ae715af4bd8a74f1684da104a44f40e58798f44f5a3468bd6e4712839c83b30d39560f0fe030f2f2eaa006a9072279676aecb32d302d28fa2890c

                 reply	other threads:[~2026-06-11 16:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178119360841.1.15570227497832337072.rpms-gap-fea91ddaf778@fedoraproject.org \
    --to=loganjerry@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox