openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

xinvaders: fix build with llvm22

Browse Source 
gamewidget and labelwidget are Widgets of class vadersWidgetClass, not
VadersWidgets
This commit is contained in:
tb
2026-05-22 16:15:42 +00:00
parent ae4117174d
commit 7a706b2f80
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
games/xinvaders/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
COMMENT= shoot them nasty little bugs COMMENT= shoot them nasty little bugs
DISTNAME= xinvaders-2.1.1 DISTNAME= xinvaders-2.1.1
REVISION= 3 REVISION= 4
CATEGORIES= games CATEGORIES= games
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
games/xinvaders/patches/patch-main_c
+10 -5
View File
@@ -1,5 +1,6 @@
--- main.c.orig Mon Sep 11 00:32:16 2000 Index: main.c
+++ main.c Tue Aug 25 21:10:26 2015 --- main.c.orig
+++ main.c
@@ -26,7 +26,6 @@ Wed May 8 1991 @@ -26,7 +26,6 @@ Wed May 8 1991
#include <X11/IntrinsicP.h> #include <X11/IntrinsicP.h>
#include <X11/Label.h> #include <X11/Label.h>
@@ -132,7 +133,7 @@
form = XtCreateManagedWidget ("form", formWidgetClass, form = XtCreateManagedWidget ("form", formWidgetClass,
toplevel, NULL, 0); toplevel, NULL, 0);
@@ -189,8 +188,8 @@ int main(Cardinal argc, char **argv) @@ -189,10 +188,10 @@ int main(Cardinal argc, char **argv)
XtSetArg (args[n], XtNright, XtChainLeft); n++; XtSetArg (args[n], XtNright, XtChainLeft); n++;
XtSetArg (args[n], XtNtop, XtChainTop); n++; XtSetArg (args[n], XtNtop, XtChainTop); n++;
XtSetArg (args[n], XtNbottom, XtChainTop); n++; XtSetArg (args[n], XtNbottom, XtChainTop); n++;
@@ -141,8 +142,11 @@
+ XtSetArg (args[n], XtNwidth, app_data.width); n++; + XtSetArg (args[n], XtNwidth, app_data.width); n++;
+ XtSetArg (args[n], XtNheight, app_data.height); n++; + XtSetArg (args[n], XtNheight, app_data.height); n++;
gamewidget = (VadersWidget) - gamewidget = (VadersWidget)
+ gamewidget =
XtCreateManagedWidget("field", vadersWidgetClass, form, args, n); XtCreateManagedWidget("field", vadersWidgetClass, form, args, n);
XtSetKeyboardFocus (form, (Widget) gamewidget);
@@ -204,29 +203,29 @@ int main(Cardinal argc, char **argv) @@ -204,29 +203,29 @@ int main(Cardinal argc, char **argv)
XtSetArg (args[n], XtNbottom, XtChainTop); n++; XtSetArg (args[n], XtNbottom, XtChainTop); n++;
XtSetArg (args[n], XtNfromHoriz, gamewidget); n++; XtSetArg (args[n], XtNfromHoriz, gamewidget); n++;
@@ -152,7 +156,8 @@
+ XtSetArg (args[n], XtNwidth, app_data.scale*IWIDTH); n++; + XtSetArg (args[n], XtNwidth, app_data.scale*IWIDTH); n++;
+ XtSetArg (args[n], XtNheight, app_data.height/2); n++; + XtSetArg (args[n], XtNheight, app_data.height/2); n++;
labelwidget = (VadersWidget) - labelwidget = (VadersWidget)
+ labelwidget =
XtCreateManagedWidget("label", vadersWidgetClass, form, args, n); XtCreateManagedWidget("label", vadersWidgetClass, form, args, n);
pausebutton = MakeCommandButton(form, "pause", Pause, labelwidget, gamewidget, NULL); pausebutton = MakeCommandButton(form, "pause", Pause, labelwidget, gamewidget, NULL);
games/xinvaders/patches/patch-vaders_h
+7 -1
View File
@@ -1,7 +1,7 @@
Index: vaders.h Index: vaders.h
--- vaders.h.orig --- vaders.h.orig
+++ vaders.h +++ vaders.h
@@ -90,15 +90,82 @@ typedef struct _VadersRec { @@ -90,20 +90,87 @@ typedef struct _VadersRec {
@@ -86,6 +86,12 @@ Index: vaders.h
ext int level; ext int level;
ext Display *dpy; ext Display *dpy;
ext Window gamewindow, labelwindow;
-ext VadersWidget gamewidget, labelwidget;
+ext Widget gamewidget, labelwidget;
ext int gamewidth, gameheight;
ext Widget toplevel;
ext int score;
@@ -111,54 +178,31 @@ ext int basesleft; @@ -111,54 +178,31 @@ ext int basesleft;
/* Base info: */ /* Base info: */