[packages/Xbae] - added type fixes and keyword workarounds for gcc 15
qboosh
qboosh at pld-linux.org
Fri Feb 6 19:39:58 CET 2026
commit 48f3f7244da7207d4e1630d595be19623715ac65
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Feb 6 19:40:18 2026 +0100
- added type fixes and keyword workarounds for gcc 15
Xbae-bool.patch | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
Xbae-types.patch | 22 ++++++++++
Xbae.spec | 6 ++-
3 files changed, 159 insertions(+), 1 deletion(-)
---
diff --git a/Xbae.spec b/Xbae.spec
index 0f2ea3c..219a4dc 100644
--- a/Xbae.spec
+++ b/Xbae.spec
@@ -10,6 +10,8 @@ Source0: https://downloads.sourceforge.net/xbae/%{srcname}-%{version}.tar.gz
# Source0-md5: 9690059474bb05191dccd041ff5052bd
Patch0: %{name}-ac.patch
Patch1: %{name}-am.patch
+Patch2: %{name}-types.patch
+Patch3: %{name}-bool.patch
URL: https://xbae.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -64,6 +66,8 @@ Biblioteka statyczna XbaeMatrix.
%setup -q -n %{srcname}-%{version}
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
%build
%{__libtoolize}
@@ -86,7 +90,7 @@ install -d $RPM_BUILD_ROOT%{_aclocaldir}
mandir=%{_mandir}
# workaround - configure decides not to install *.m4 if aclocaldir is not writable
-install ac_find_xbae.m4 $RPM_BUILD_ROOT%{_aclocaldir}
+cp -p ac_find_xbae.m4 $RPM_BUILD_ROOT%{_aclocaldir}
%{__rm} doc/Makefile* doc/images/Makefile*
diff --git a/Xbae-bool.patch b/Xbae-bool.patch
new file mode 100644
index 0000000..d04278e
--- /dev/null
+++ b/Xbae-bool.patch
@@ -0,0 +1,132 @@
+--- xbae-4.60.4/examples/input/input.c.orig 2001-03-30 09:52:02.000000000 +0200
++++ xbae-4.60.4/examples/input/input.c 2026-02-06 19:32:04.949832965 +0100
+@@ -126,7 +126,7 @@ main(int argc, char *argv[])
+ {
+ Widget toplevel, rc, pattern, cw, radio, frame;
+ XtAppContext app;
+- XmString true, false, begin, centre, end;
++ XmString true_, false_, begin, centre, end;
+
+ toplevel = XtVaAppInitialize(&app, "Input",
+ NULL, 0,
+@@ -160,8 +160,8 @@ main(int argc, char *argv[])
+
+ XtAddCallback(input, XmNvalidateCallback, validateCB, NULL);
+
+- true = XmStringCreateSimple("True");
+- false = XmStringCreateSimple("False");
++ true_ = XmStringCreateSimple("True");
++ false_ = XmStringCreateSimple("False");
+
+ cw = XtVaCreateManagedWidget(
+ "XmNautofill", xbaeCaptionWidgetClass, rc,
+@@ -173,8 +173,8 @@ main(int argc, char *argv[])
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNautoFill", 0, autoFillToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -191,8 +191,8 @@ main(int argc, char *argv[])
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNconvertCase", 1, convertCaseToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -224,8 +224,8 @@ main(int argc, char *argv[])
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNoverwriteMode", 0, overwriteModeToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -254,8 +254,8 @@ main(int argc, char *argv[])
+
+ XtManageChild(radio);
+
+- XmStringFree(true);
+- XmStringFree(false);
++ XmStringFree(true_);
++ XmStringFree(false_);
+ XmStringFree(begin);
+ XmStringFree(centre);
+ XmStringFree(end);
+--- xbae-4.60.4/examples/input/pattern.c.orig 2003-10-20 21:12:46.000000000 +0200
++++ xbae-4.60.4/examples/input/pattern.c 2026-02-06 19:32:51.633417756 +0100
+@@ -128,7 +128,7 @@ main(int argc, char *argv[])
+ {
+ Widget toplevel, rc, pattern, cw, radio, frame;
+ XtAppContext app;
+- XmString true, false, begin, centre, end;
++ XmString true_, false_, begin, centre, end;
+
+ toplevel = XtVaAppInitialize(&app, "Input",
+ NULL, 0,
+@@ -167,8 +167,8 @@ main(int argc, char *argv[])
+ XmNoverwriteMode, False,
+ NULL);
+
+- true = XmStringCreateSimple("True");
+- false = XmStringCreateSimple("False");
++ true_ = XmStringCreateSimple("True");
++ false_ = XmStringCreateSimple("False");
+
+ cw = XtVaCreateManagedWidget(
+ "XmNautofill", xbaeCaptionWidgetClass, rc,
+@@ -180,8 +180,8 @@ main(int argc, char *argv[])
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNautoFill", 0, autoFillToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -198,8 +198,8 @@ main(int argc, char *argv[])
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNconvertCase", 1, convertCaseToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -231,8 +231,8 @@ main(int argc, char *argv[])
+
+ radio = XmVaCreateSimpleRadioBox(
+ frame, "XmNoverwriteMode", 0, overwriteModeToggle,
+- XmVaRADIOBUTTON, false, NULL, NULL, NULL,
+- XmVaRADIOBUTTON, true, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, false_, NULL, NULL, NULL,
++ XmVaRADIOBUTTON, true_, NULL, NULL, NULL,
+ NULL);
+
+ XtVaSetValues(radio, XmNtraversalOn, False, NULL);
+@@ -261,8 +261,8 @@ main(int argc, char *argv[])
+
+ XtManageChild(radio);
+
+- XmStringFree(true);
+- XmStringFree(false);
++ XmStringFree(true_);
++ XmStringFree(false_);
+ XmStringFree(begin);
+ XmStringFree(centre);
+ XmStringFree(end);
diff --git a/Xbae-types.patch b/Xbae-types.patch
new file mode 100644
index 0000000..672be88
--- /dev/null
+++ b/Xbae-types.patch
@@ -0,0 +1,22 @@
+--- xbae-4.60.4/src/Methods.c.orig 2006-05-26 10:57:25.000000000 +0200
++++ xbae-4.60.4/src/Methods.c 2026-02-06 19:30:05.429189170 +0100
+@@ -1688,7 +1688,7 @@ DoEditCell(XbaeMatrixWidget mw, XEvent *
+ * The event must have occurred in a legal position
+ * otherwise control wouldn't have made it here
+ */
+- xbaeEventToRowColumn(mw, event, &r, &c, &x, &y);
++ xbaeEventToRowColumn((Widget)mw, event, &r, &c, &x, &y);
+ x -= mw->matrix.cell_shadow_thickness;
+ y -= mw->matrix.cell_shadow_thickness;
+ position = XmTextXYToPos(TextField(mw), x, y);
+--- xbae-4.60.4/examples/tests/leak2.c.orig 2003-06-21 11:38:46.000000000 +0200
++++ xbae-4.60.4/examples/tests/leak2.c 2026-02-06 19:34:26.933931089 +0100
+@@ -20,7 +20,7 @@ AppRes appres;
+
+ XtResource resources[] = {
+ { "numIter", "NumIter", XtRInt, sizeof(int),
+- XtOffsetOf(AppRes, numIter), XtRImmediate, 1000 },
++ XtOffsetOf(AppRes, numIter), XtRImmediate, (XtPointer)1000 },
+ };
+
+ int
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Xbae.git/commitdiff/48f3f7244da7207d4e1630d595be19623715ac65
More information about the pld-cvs-commit
mailing list