Accepting request 1277653 from X11:Utilities

OBS-URL: https://build.opensuse.org/request/show/1277653
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xquarto?expand=0&rev=24

xquarto-gcc15.patch

@@ -0,0 +1,101 @@
+--- xquarto.c	2025-02-13 13:49:45.199173189 +0100
++++ xquarto.c	2025-02-13 13:50:09.895343460 +0100
+@@ -47,30 +47,32 @@ static void RandomPivots();
+ static void SetMessages(int i, int j);
+ static void ShowStatus();
+ static void InitGame();
+-static void PosProc();
+-static void PieceProc();
++static void PosProc(Widget widget,XtPointer posp,XtPointer call_data);
++static void PieceProc(Widget widget,XtPointer piecep,XtPointer call_data);
+ static void HilightProc();
+-static void GametypeProc();
+-static void LevelProc();
+-static void GeometryProc();
+-static void StartHumanProc();
+-static void StartComputerProc();
+-static void StartTwohumansProc();
+-static void StartNetworkProc();
+-static void CloseNetworkProc();
++static void GametypeProc(Widget widget,XtPointer gametypep,XtPointer call_data);
++static void LevelProc(Widget widget,XtPointer levelp,XtPointer call_data);
++static void GeometryProc(Widget widget,XtPointer geometryp,XtPointer call_data);
++static void StartHumanProc(Widget widget,XtPointer client_data,XtPointer call_data);
++static void StartComputerProc(Widget widget,XtPointer client_data,XtPointer call_data);
++static void StartTwohumansProc(Widget widget,XtPointer client_data,XtPointer call_data);
++static void StartNetworkProc(Widget w, XtPointer client_data, XtPointer call_data);
++static void CloseNetworkProc(Widget w, XtPointer client_data, XtPointer call_data);
+ static void StartNetworkProc2();
+-static void MessageProc();
+-static void HelpProc();
+-static void CloseHelpProc();
+-static void HelpProc2();
+-static void CloseHelpProc2();
+-static void QuitProc();
+-static void QuitProc2();
+-static void NewProc2();
+-static void SaveProc();
+-static void LoadProc();
+-static void HintProc();
+-static void UndoProc();
++static void HelpProc(Widget w, XtPointer client_data, XtPointer call_data);
++static void CloseHelpProc(Widget w, XtPointer client_data, XtPointer call_data);
++static void HelpProc2(Widget w, XtPointer client_data, XtPointer call_data);
++static void CloseHelpProc2(Widget w, XtPointer client_data, XtPointer call_data);
++static void QuitProc(Widget widget,XtPointer client_data,XtPointer call_data);
++static void NewProc2(struct _WidgetRec *, void *, void *);
++static void QuitProc2(struct _WidgetRec *, void *, void *);
++static void SaveProc(struct _WidgetRec *, void *, void *);
++static void ProcessRecord();
++static void LoadProc(struct _WidgetRec *, void *, void *);
++static void UndoProc(Widget widget,XtPointer posp,XtPointer call_data);
++static void HintProc(struct _WidgetRec *, void *, void *);
++static void MessageProc(Widget widget,XtPointer client_data,
++  XtPointer call_data);
+ 
+ Display       *dpy, *dpy2=NULL;
+ XtAppContext  app_cont;
+@@ -1207,14 +1209,14 @@ static void QuitProc(Widget widget,XtPoi
+   exit(0);
+ }
+ 
+-static void NewProc2()
++static void NewProc2(struct _WidgetRec *, void *, void *)
+ {
+   firstplayer=NETWORK1;
+   InitGame();
+   SetMessages(14,4);
+ }
+ 
+-static void QuitProc2()
++static void QuitProc2(struct _WidgetRec *, void *, void *)
+ {
+   if (top2)
+     XtDestroyWidget(top2);
+@@ -1235,7 +1237,7 @@ static void QuitProc2()
+   ShowStatus();
+ }
+ 
+-static void SaveProc()
++static void SaveProc(struct _WidgetRec *, void *, void *)
+ {
+ FILE *fd;
+ int  i;
+@@ -1299,7 +1301,7 @@ int i, j, k;
+     if (board[NPIECEPOS]==NPIECES) SetMessages(0,13);
+ }
+ 
+-static void LoadProc()
++static void LoadProc(struct _WidgetRec *, void *, void *)
+ {
+ FILE *fd;
+ char *ptr, c, d, line[512];
+@@ -1412,7 +1414,7 @@ int i,j,k;
+   ProcessRecord();
+ }
+ 
+-static void HintProc()
++static void HintProc(struct _WidgetRec *, void *, void *)
+ {
+   int inpiece, outpiece, outpos, i;
+ 

xquarto.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed May 14 16:29:52 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Use %make_build instead of %jobs (boo#1237231)
+- Mark COPYING file as %license
+
+-------------------------------------------------------------------
+Thu Feb 13 12:51:50 UTC 2025 - pgajdos@suse.com
+
+- fix build with gcc 15
+- added patches
+  + xquarto-gcc15.patch
+
 -------------------------------------------------------------------
 Mon Feb 26 12:25:45 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

xquarto.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xquarto
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,7 @@ Group:          Amusements/Games/Board/Puzzle
 URL:            ftp://ftp.ac-grenoble.fr/ge/educational_games/
 Source:         ftp://ftp.ac-grenoble.fr/ge/educational_games/%name-%version.tar.bz2
 Patch0:         xquarto-2.5-imake_font.patch
+Patch1:         xquarto-gcc15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  imake
 BuildRequires:  pkgconfig(x11)
@@ -63,7 +64,7 @@ more details).
 
 %build
 xmkmf -a
-make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS"
+%make_build CCOPTIONS="$RPM_OPT_FLAGS"
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -71,6 +72,8 @@ make DESTDIR=$RPM_BUILD_ROOT install.man
 
 %files
 %defattr(-, root, root)
+%license COPYING
+%doc README
 %{_bindir}/xquarto
 %doc %{_xorg7_mandir}/man1/xquarto.1x.gz