svn commit: r553913 - in head/x11-wm/wmii-devel: . files
Rodrigo Osorio
rodrigo at FreeBSD.org
Mon Nov 2 14:39:54 UTC 2020
Author: rodrigo
Date: Mon Nov 2 14:39:51 2020
New Revision: 553913
URL: https://svnweb.freebsd.org/changeset/ports/553913
Log:
Fix whith -fno-common in FreeBSD 13
Lastest version of llvm introduced in
FreeBSD 13 has the flag -fno-common
enabled by default. Fix the issue.
Added:
head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c (contents, props changed)
head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h (contents, props changed)
head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c (contents, props changed)
head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c (contents, props changed)
head/x11-wm/wmii-devel/files/patch-include_ixp__local.h (contents, props changed)
head/x11-wm/wmii-devel/files/patch-include_util.h (contents, props changed)
head/x11-wm/wmii-devel/files/patch-include_x11.h (contents, props changed)
Modified:
head/x11-wm/wmii-devel/Makefile
Modified: head/x11-wm/wmii-devel/Makefile
==============================================================================
--- head/x11-wm/wmii-devel/Makefile Mon Nov 2 14:34:39 2020 (r553912)
+++ head/x11-wm/wmii-devel/Makefile Mon Nov 2 14:39:51 2020 (r553913)
@@ -3,7 +3,7 @@
PORTNAME= wmii
PORTVERSION= 3.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://dl.suckless.org/wmii/
PKGNAMESUFFIX= -devel
Added: head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmii-devel/files/patch-cmd_wmii9menu.c Mon Nov 2 14:39:51 2020 (r553913)
@@ -0,0 +1,10 @@
+--- cmd/wmii9menu.c.orig 2020-10-18 16:18:05 UTC
++++ cmd/wmii9menu.c
+@@ -35,6 +35,7 @@
+ * Heavily modified by Kris Maglione for use with wmii.
+ */
+
++#define EXTERN
+ #define IXP_NO_P9_
+ #define IXP_P9_STRUCTS
+ #include <fmt.h>
Added: head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmii-devel/files/patch-cmd_wmii_dat.h Mon Nov 2 14:39:51 2020 (r553913)
@@ -0,0 +1,35 @@
+--- cmd/wmii/dat.h.orig 2020-10-18 11:55:59 UTC
++++ cmd/wmii/dat.h
+@@ -358,7 +358,7 @@ EXTERN Divide* divs;
+ EXTERN Client c_magic;
+ EXTERN Client c_root;
+
+-EXTERN Handlers framehandler;
++extern Handlers framehandler;
+
+ EXTERN char buffer[8092];
+ EXTERN char* _buffer;
+@@ -371,7 +371,7 @@ static char* const _buf_end = buffer + sizeof buffer;
+
+ /* IXP */
+ EXTERN IxpServer srv;
+-EXTERN Ixp9Srv p9srv;
++extern Ixp9Srv p9srv;
+
+ /* X11 */
+ EXTERN uint valid_mask;
+@@ -382,12 +382,12 @@ EXTERN Image* ibuf32;
+ EXTERN Cursor cursor[CurLast];
+
+ typedef void (*XHandler)(XEvent*);
+-EXTERN XHandler handler[LASTEvent];
++extern XHandler handler[LASTEvent];
+
+ /* Misc */
+ EXTERN int starting;
+ EXTERN bool resizing;
+-EXTERN long ignoreenter;
++extern long ignoreenter;
+ EXTERN char* user;
+ EXTERN char* execstr;
+ EXTERN int debugflag;
Added: head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmii-devel/files/patch-cmd_wmii_event.c Mon Nov 2 14:39:51 2020 (r553913)
@@ -0,0 +1,11 @@
+--- cmd/wmii/event.c.orig 2020-10-18 09:39:16 UTC
++++ cmd/wmii/event.c
+@@ -5,6 +5,8 @@
+ #include <X11/keysym.h>
+ #include "fns.h"
+
++long ignoreenter;
++
+ typedef void (*EvHandler)(XEvent*);
+
+ void
Added: head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmii-devel/files/patch-cmd_wmiir.c Mon Nov 2 14:39:51 2020 (r553913)
@@ -0,0 +1,10 @@
+--- cmd/wmiir.c.orig 2020-10-18 16:14:32 UTC
++++ cmd/wmiir.c
+@@ -1,6 +1,7 @@
+ /* Copyight ©2007-2010 Kris Maglione <fbsdaemon at gmail.com>
+ * See LICENSE file for license details.
+ */
++#define EXTERN
+ #define IXP_NO_P9_
+ #define IXP_P9_STRUCTS
+ #include <stdio.h>
Added: head/x11-wm/wmii-devel/files/patch-include_ixp__local.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmii-devel/files/patch-include_ixp__local.h Mon Nov 2 14:39:51 2020 (r553913)
@@ -0,0 +1,15 @@
+--- include/ixp_local.h.orig 2020-10-18 08:53:49 UTC
++++ include/ixp_local.h
+@@ -3,7 +3,11 @@
+ #include <ixp.h>
+ #include <stdbool.h>
+
+-char *argv0;
++#ifndef EXTERN
++# define EXTERN extern
++#endif
++
++EXTERN char *argv0;
+ #define ARGBEGIN \
+ int _argtmp=0, _inargv=0; char *_argv=nil; \
+ if(!argv0) {argv0=*argv; argv++, argc--;} \
Added: head/x11-wm/wmii-devel/files/patch-include_util.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmii-devel/files/patch-include_util.h Mon Nov 2 14:39:51 2020 (r553913)
@@ -0,0 +1,22 @@
+--- include/util.h.orig 2010-06-10 07:24:03 UTC
++++ include/util.h
+@@ -4,6 +4,10 @@
+ #define nil ((void*)0)
+ #define nelem(ary) (sizeof(ary) / sizeof(*ary))
+
++#ifndef EXTERN
++# define EXTERN extern
++#endif
++
+ /* Types */
+ #undef uchar
+ #undef ushort
+@@ -55,7 +59,7 @@ char* vsxprint(const char*, va_list);
+ #define die(...) \
+ _die(__FILE__, __LINE__, __VA_ARGS__)
+
+-char *argv0;
++EXTERN char *argv0;
+ #undef ARGBEGIN
+ #undef ARGEND
+ #undef ARGF
Added: head/x11-wm/wmii-devel/files/patch-include_x11.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmii-devel/files/patch-include_x11.h Mon Nov 2 14:39:51 2020 (r553913)
@@ -0,0 +1,24 @@
+--- include/x11.h.orig 2020-10-18 08:56:29 UTC
++++ include/x11.h
+@@ -17,6 +17,10 @@
+ #undef Font
+ #undef Screen
+
++#ifndef EXTERN
++# define EXTERN extern
++#endif
++
+ enum Align {
+ North = 0x01,
+ East = 0x02,
+@@ -182,8 +186,8 @@ struct Screen {
+ # pragma varargck type "W" Window*
+ #endif
+
+-Display *display;
+-Screen scr;
++EXTERN Display *display;
++EXTERN Screen scr;
+
+ extern const Point ZP;
+ extern const Rectangle ZR;
More information about the svn-ports-head
mailing list