Architecture specific change in rpms/icon.git - Arch-excludes - Fedora mailing-lists

23 May 2025

The package rpms/icon.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/icon.git/commit/?id=2850bd6c8475de52....
Change:
-%ifarch armv7hl
Thanks.
Full change:
============
commit 2850bd6c8475de5266a0d21152dead942c3defb8
Author: Artur Frenszek-Iwicki fedora@svgames.pl
Date:   Fri May 23 23:01:57 2025 +0200
Update to v9.5.24b

diff --git a/.gitignore b/.gitignore
index 308c749..81c9754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /icon-v9.5.20i.tar.gz
+/icon-v9.5.24b.tar.gz
diff --git a/icon-nostrip.patch b/icon-nostrip.patch
index d24a103..54ea20a 100644
--- a/icon-nostrip.patch
+++ b/icon-nostrip.patch
@@ -1,24 +1,26 @@
-diff -up icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/icont/Makefile.nostrip icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/icont/Makefile
---- icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/icont/Makefile.nostrip	2020-07-13 14:56:05.000000000 -0600
-+++ icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/icont/Makefile	2020-07-29 23:27:22.044308455 -0600
-@@ -21,7 +21,7 @@ COBJS =		../common/long.o ../common/geto
+diff -r -U4 icon-9.5.24b--orig/src/icont/Makefile icon-9.5.24b--patched/src/icont/Makefile
+--- icon-9.5.24b--orig/src/icont/Makefile	2024-11-19 22:01:39.000000000 +0100
++++ icon-9.5.24b--patched/src/icont/Makefile	2025-05-23 18:28:34.769905430 +0200
+@@ -21,9 +21,8 @@
  icont:		$(OBJS) $(COBJS)
    	$(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS)
+ 		rm -f ../../bin/icont$(EXE)
    	cp icont ../../bin
 -		strip ../../bin/icont$(EXE)
-+#		strip ../../bin/icont$(EXE)
    	(cd ../../bin; rm -f icon icon.exe; ln -s icont icon)
$(OBJS):	$(HFILES) tproto.h
-diff -up icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/runtime/Makefile.nostrip icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/runtime/Makefile
---- icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/runtime/Makefile.nostrip	2020-07-13 14:56:05.000000000 -0600
-+++ icon-1ca7e2d524def413ebcc25afc2b16b63957ac415/src/runtime/Makefile	2020-07-29 23:26:31.711109971 -0600
-@@ -32,7 +32,7 @@ iconx: $(COBJS) $(XOBJS)
+ 
+diff -r -U4 icon-9.5.24b--orig/src/runtime/Makefile icon-9.5.24b--patched/src/runtime/Makefile
+--- icon-9.5.24b--orig/src/runtime/Makefile	2024-11-19 22:01:39.000000000 +0100
++++ icon-9.5.24b--patched/src/runtime/Makefile	2025-05-23 18:28:49.325970391 +0200
+@@ -32,9 +32,8 @@
    cd ../common; $(MAKE)
    $(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
+ 	rm -f ../../bin/iconx$(EXE)
    cp iconx ../../bin
 -	strip $(SFLAGS) ../../bin/iconx$(EXE)
-+#	strip $(SFLAGS) ../../bin/iconx$(EXE)
$(COBJS):
    cd ../common; $(MAKE)
+ 
diff --git a/icon-system-xpm.patch b/icon-system-xpm.patch
deleted file mode 100644
index 37a6604..0000000
--- a/icon-system-xpm.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -up icon-9.5.20h/src/common/Makefile.system-xpm icon-9.5.20h/src/common/Makefile
---- icon-9.5.20h/src/common/Makefile.system-xpm	2020-08-02 08:34:38.000000000 -0600
-+++ icon-9.5.20h/src/common/Makefile	2020-09-12 17:32:36.230803215 -0600
-@@ -5,22 +5,11 @@ OBJS =	long.o getopt.o time.o filepart.o
- 	munix.o literals.o rswitch.o alloc.o long.o getopt.o time.o\
- 	xwindow.o ipp.o
- 
--common:		$(OBJS) gpxmaybe
-+common:		$(OBJS)
- 
- patchstr:	patchstr.c
- 		$(CC) $(CFLAGS) -o patchstr patchstr.c
- 
--gpxmaybe:
--		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi
--
--xpm:
--		cd ../xpm; $(MAKE) libXpm.a
--		cp -p ../xpm/libXpm.a ../../bin/libIgpx.a
--
--wincap:		
--		cd ../wincap; $(MAKE) libWincap.a
--		cp -u ../wincap/libWincap.a ../../bin/libIgpx.a
--
- $(OBJS): ../h/define.h ../h/arch.h ../h/config.h ../h/cstructs.h \
- 	  ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h
- 
-diff -up icon-9.5.20h/src/h/sys.h.system-xpm icon-9.5.20h/src/h/sys.h
---- icon-9.5.20h/src/h/sys.h.system-xpm	2020-08-02 08:34:38.000000000 -0600
-+++ icon-9.5.20h/src/h/sys.h	2020-09-12 17:32:36.230803215 -0600
-@@ -58,7 +58,7 @@
-  */
- #ifdef XWindows
-    #ifdef HaveXpmFormat
--      #include "../xpm/xpm.h"
-+      #include <X11/xpm.h>
-    #else				/* HaveXpmFormat */
-       #include <X11/Xlib.h>
-    #endif				/* HaveXpmFormat */
-diff -up icon-9.5.20h/src/Makefile.system-xpm icon-9.5.20h/src/Makefile
---- icon-9.5.20h/src/Makefile.system-xpm	2020-08-02 08:34:38.000000000 -0600
-+++ icon-9.5.20h/src/Makefile	2020-09-12 17:32:36.230803215 -0600
-@@ -11,7 +11,6 @@ Clean Pure:
- 	cd runtime;	rm -f *.o *.exe *.c rt.db rt.a rtt*.lst iconx
- 	cd icont;	rm -f *.o *.exe icont hdr.h ixhdr.hdr newhdr
- 	cd wincap;	rm -f *.o *.exe *.a
--	cd xpm;		rm -f *.o *.exe *.a
- # force full runtime system rebuild
- 	touch -c h/define.h
- 	rm -f h/arch.h
diff --git a/icon.spec b/icon.spec
index b49eb74..de917a6 100644
--- a/icon.spec
+++ b/icon.spec
@@ -1,8 +1,8 @@
 %global git_user0 gtownsend
Name:           icon
-Version:        9.5.20i
-Release:        10%{?dist}
+Version:        9.5.24b
+Release:        1%{?dist}
 Summary:        Icon programming language
 License:        Public Domain
 URL:            https://www2.cs.arizona.edu/icon/
@@ -11,15 +11,11 @@ Source0:        https://github.com/%%7Bgit_user0%7D/%%7Bname%7D/archive/v%%7Bversion%7D/%%7B...
 # Fedora-specific patch to avoid stripping executables
 Patch0:         icon-nostrip.patch
-# Fedora-specific patch to use Fedora XPM library (also requires a sed command
-# in the prep section)
-Patch1:         icon-system-xpm.patch
-
 BuildRequires:  gcc
+BuildRequires:  make
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xpm)
-BuildRequires: make
%global _description %{expand:
@@ -37,24 +33,12 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
%prep
-%setup -q -n %{name}-%{version}
-rm -rf src/xpm
-%patch -P 0 -p1 -b .nostrip
-%patch -P 1 -p1 -b .system-xpm
-
+%autosetup -p1 -n %{name}-%{version}
%build
 make X-Configure name=linux
 sed -i -e 's|CFLAGS = -O|CFLAGS = %{optflags}|' Makedefs
 sed -i -e 's|Igpx|Xpm|' Makedefs
-%ifarch armv7hl
-# Icon doesn't work correctly on armv7hl build with -O2, due to complicated
-# type casting issues, probably involving C undefined behavior. As of
-# 2020-08-01, Greg Townsend, an Icon maintainer, recommends using only
-#-O rather than -O2.
-#   https://list.arizona.edu/sympa/arc/icon-language/2020-08/msg00000.html
-sed -i -e 's|-O2|-O|' Makedefs
-%endif
# NOTE: make fails if smp_mflags is used
 make -j1 All
@@ -110,6 +94,9 @@ install -p -m0755 bin/xgamma %{buildroot}%{_bindir}/icon-xgamma
%changelog
+* Fri May 23 2025 Artur Frenszek-Iwicki fedora@svgames.pl - 9.5.24b-1
+- Update to v9.5.24b
+
 * Thu Jul 18 2024 Fedora Release Engineering releng@fedoraproject.org - 9.5.20i-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources
index d5c577b..baf9182 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (icon-v9.5.20i.tar.gz) = 31f43f0ff672e81b459c8364960b780733820000c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394
+SHA512 (icon-v9.5.24b.tar.gz) = 0c92dd6f86dc2555accf8f28a485a7f3a38e4f39f41e8edcf936233303608b4eda7bfb608b33a4dde4bd38c22f084385a597f61cf1445b069478654435436584

    