[packages/mj] Up to 1.17.2

[arekm]

commit 542f7b2c7edebbcbf0518665f4e179ecfef4fd56
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri May 8 20:50:15 2026 +0200

    Up to 1.17.2

 mj-c23-bool.patch | 14 ++++++++++++++
 mj-man.patch      | 46 +++++++++++++++++++++++-----------------------
 mj.spec           | 11 +++++++----
 3 files changed, 44 insertions(+), 27 deletions(-)
---
diff --git a/mj.spec b/mj.spec
index 924c4ef..637c355 100644
--- a/mj.spec
+++ b/mj.spec
@@ -1,13 +1,14 @@
 Summary:	The original Mah-Jong game
 Name:		mj
-Version:	1.11
+Version:	1.17.2
 Release:	1
 License:	GPL
 Group:		Applications
 Source0:	http://mahjong.julianbradfield.org/Source/%{name}-%{version}-src.tar.gz
-# Source0-md5:	c0cd19620eb3fcef3e0a83eaed6c3780
+# Source0-md5:	fec3dc03dc9496b0ed6e0bbb82af395e
 Source1:	%{name}.desktop
 Patch0:		%{name}-man.patch
+Patch1:		%{name}-c23-bool.patch
 URL:		http://mahjong.julianbradfield.org/
 BuildRequires:	gtk+2-devel
 BuildRequires:	pkgconfig
@@ -24,7 +25,8 @@ tiles.)
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch -P0 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
 %{__sed} -i 's@/usr/lib@%{_libdir}@' Makefile
 
 %build
@@ -38,7 +40,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir}/mah-jong,%{_desktopdir}}
 
 %{__make} install install.man \
-	DESTDIR=$RPM_BUILD_ROOT%{_prefix}/
+	DESTDIR=$RPM_BUILD_ROOT%{_prefix}/ \
+	INSTPGMFLAGS=""
 
 cp -a fallbacktiles tiles-numbered tiles-small tiles-v1 \
 	$RPM_BUILD_ROOT%{_datadir}/mah-jong
diff --git a/mj-c23-bool.patch b/mj-c23-bool.patch
new file mode 100644
index 0000000..aa4cccb
--- /dev/null
+++ b/mj-c23-bool.patch
@@ -0,0 +1,14 @@
+Guard the bool typedef in protocol.h against C23 where bool is a built-in keyword.
+
+--- mj-1.17.2-src.orig/protocol.h	2025-09-07 17:50:26.000000000 +0200
++++ mj-1.17.2-src/protocol.h	2026-05-08 00:00:00.000000000 +0200
+@@ -26,7 +26,9 @@
+ #define MAX_WALL_SIZE 144
+
+ /* a bool is an integer constrained to be 0 or 1 */
++#if __STDC_VERSION__ < 202311L
+ typedef int bool;
++#endif
+
+ /* a word16 is a word of at most 15 (to allow for final null) characters,
+    without white space */
diff --git a/mj-man.patch b/mj-man.patch
index ce11eae..dacb482 100644
--- a/mj-man.patch
+++ b/mj-man.patch
@@ -1,5 +1,5 @@
---- mah-jong-1.10.orig/xmj.man
-+++ mah-jong-1.10/xmj.man
+--- mj-1.17.2-src.orig/xmj.man	2025-09-07 17:50:26.000000000 +0200
++++ mj-1.17.2-src/xmj.man	2026-05-08 00:00:00.000000000 +0200
 @@ -10,7 +10,7 @@
  .TP
  \fB\\$1\fP (\fB\\$2\fP) \\$3
@@ -9,15 +9,21 @@
  .SH NAME
  xmj, mj\-server, mj\-player \- programs for playing Mah\-Jong
  .SH SYNOPSIS
---- mah-jong-1.10.orig/mj-server.man
-+++ mah-jong-1.10/mj-server.man
+--- mj-1.17.2-src.orig/mj-server.man	2025-09-07 17:50:26.000000000 +0200
++++ mj-1.17.2-src/mj-server.man	2026-05-08 00:00:00.000000000 +0200
 @@ -1,2 +1,2 @@
- .\" $Header$
+ .\" $Header: /home/jcb/MahJong/newmj/RCS/mj-server.man,v 12.0 2009/06/28 20:43:12 jcb Rel $
 -.so man1/xmj.1
 +.so man6/xmj.6
---- mah-jong-1.10.orig/Makefile
-+++ mah-jong-1.10/Makefile
-@@ -54,9 +54,9 @@
+--- mj-1.17.2-src.orig/mj-player.man	2025-09-07 17:50:26.000000000 +0200
++++ mj-1.17.2-src/mj-player.man	2026-05-08 00:00:00.000000000 +0200
+@@ -1,2 +1,2 @@
+ .\" $Header: /home/jcb/MahJong/newmj/RCS/mj-player.man,v 12.0 2009/06/28 20:43:12 jcb Rel $
+-.so man1/xmj.1
++.so man6/xmj.6
+--- mj-1.17.2-src.orig/Makefile	2025-09-07 17:50:26.000000000 +0200
++++ mj-1.17.2-src/Makefile	2026-05-08 00:00:00.000000000 +0200
+@@ -52,9 +52,9 @@
  DESTDIR = /usr/local/
  BINDIR = bin
  # The man pages go into $(DESTDIR)$(MANDIR)
@@ -27,18 +33,12 @@
 +MANDIR = share/man/man6
 +# and the appropriate suffix is 6
 +MANSUFFIX = 6
- 
- ### End of local configuration.
- 
---- mah-jong-1.10.orig/mj-player.man
-+++ mah-jong-1.10/mj-player.man
-@@ -1,2 +1,2 @@
- .\" $Header$
--.so man1/xmj.1
-+.so man6/xmj.6
---- mah-jong-1.10.orig/Makefile.in
-+++ mah-jong-1.10/Makefile.in
-@@ -54,9 +54,9 @@
+
+ # if you are cross-compiling from Linux to Windows,
+ # MGW should be the root of your MinGW hierarchy for the GTK libraries
+--- mj-1.17.2-src.orig/Makefile.in	2025-09-07 17:50:25.000000000 +0200
++++ mj-1.17.2-src/Makefile.in	2026-05-08 00:00:00.000000000 +0200
+@@ -52,9 +52,9 @@
  DESTDIR = /usr/local/
  BINDIR = bin
  # The man pages go into $(DESTDIR)$(MANDIR)
@@ -48,6 +48,6 @@
 +MANDIR = share/man/man6
 +# and the appropriate suffix is 6
 +MANSUFFIX = 6
- 
- ### End of local configuration.
- 
+
+ # if you are cross-compiling from Linux to Windows,
+ # MGW should be the root of your MinGW hierarchy for the GTK libraries
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mj.git/commitdiff/542f7b2c7edebbcbf0518665f4e179ecfef4fd56