Skip to content

Commit

Permalink
x11/xforward: Permanently fix LLVM15 build error
Browse files Browse the repository at this point in the history
Permanently fix:

xforward.c:528:87: error: incompatible pointer to integer conversion passing 'void *' to parameter of type 'Cardinal' (aka 'unsigned int') [-Wint-conversion]
                        topshell = XtAppCreateShell(NULL,"Xforward",applicationShellWidgetClass, dpy, NULL,NULL);
                                                                                                           ^~~~
  • Loading branch information
cschuber committed Feb 15, 2023
1 parent 0609537 commit e66cede
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
10 changes: 2 additions & 8 deletions x11/xforward/files/patch-Makefile
@@ -1,5 +1,5 @@
--- Makefile.orig 1993-06-04 19:32:01.000000000 -0700
+++ Makefile 2023-02-11 06:30:12.418352000 -0800
+++ Makefile 2023-02-14 20:39:04.842100000 -0800
@@ -18,18 +18,19 @@
# MANDIR is where the manual page will be installed.

Expand All @@ -25,13 +25,7 @@
CFLAGS= ${INCFLAGS} -O

# For CenterLine CodeCenter
@@ -46,11 +47,12 @@
cc ${LDFLAGS} xforward.o -o xforward ${LIBS}

xforward.o: xforward.c
- cc -c ${CFLAGS} xforward.c
+ cc -c -Wno-int-conversion ${CFLAGS} xforward.c

@@ -51,6 +52,7 @@
install: ${PROGS}
install -c xforward ${DESTDIR}${BINDIR}/xforward
install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1
Expand Down
11 changes: 10 additions & 1 deletion x11/xforward/files/patch-xforward.c
@@ -1,5 +1,5 @@
--- xforward.c.orig 1993-06-04 19:30:16.000000000 -0700
+++ xforward.c 2012-04-27 13:20:20.603550383 -0700
+++ xforward.c 2023-02-14 20:42:29.724713000 -0800
@@ -292,7 +292,7 @@
struct timeval timeout;
struct pend_conn *cur,*prev;
Expand All @@ -9,3 +9,12 @@
int exitstat,wopts,newoutgoing;

/* for each entry, call waitpid */
@@ -525,7 +525,7 @@
app_con = XtCreateApplicationContext();
dpy = XtOpenDisplay(app_con,disp_str,NULL,"Xforward",
NULL,0,&argc,argv);
- topshell = XtAppCreateShell(NULL,"Xforward",applicationShellWidgetClass, dpy, NULL,NULL);
+ topshell = XtAppCreateShell(NULL,"Xforward",applicationShellWidgetClass, dpy, NULL, (Cardinal)NULL);
sprintf(dialog_message,"Allow X connection from %s ?",
okhost_names[i]);
msg_str = XmStringCreateSimple(dialog_message);

0 comments on commit e66cede

Please sign in to comment.