Attachment #171036 for bug #209965

Lines 2-11 Link Here

(-)Makefile (-3 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= spectrwm	4	PORTNAME= spectrwm
5	PORTVERSION= 2.7.2	5	PORTVERSION= 3.0.2
6	CATEGORIES= x11-wm	6	CATEGORIES= x11-wm
7	MASTER_SITES= https://opensource.conformal.com/snapshots/${PORTNAME}/
8	EXTRACT_SUFX= .tgz
9		7
10	MAINTAINER= zeising@FreeBSD.org	8	MAINTAINER= zeising@FreeBSD.org
11	COMMENT= Small, dynamic tiling window manager for X11	9	COMMENT= Small, dynamic tiling window manager for X11
Lines 17-22 Link Here
17	libxcb-keysyms.so:x11/xcb-util-keysyms	15	libxcb-keysyms.so:x11/xcb-util-keysyms
18	RUN_DEPENDS+= dmenu:x11/dmenu	16	RUN_DEPENDS+= dmenu:x11/dmenu
19		17
		18	USE_GITHUB= yes
		19	GH_ACCOUNT= conformal
		20	GH_TAGNAME= SPECTRWM_3_0_2
		21
20	USE_XORG= x11 xcb xcursor xft xrandr xt	22	USE_XORG= x11 xcb xcursor xft xrandr xt
21		23
22	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (spectrwm-2.7.2.tgz) = b56cffa01ee2c58515350c1be1940140286fd18778659c6f5ada4595319f97cb	1	SHA256 (conformal-spectrwm-3.0.2-SPECTRWM_3_0_2_GH0.tar.gz) = 82ce0280039de642c41684f3096abb0388926b60c37987ca1dbc53a0913cab18
2	SIZE (spectrwm-2.7.2.tgz) = 132554	2	SIZE (conformal-spectrwm-3.0.2-SPECTRWM_3_0_2_GH0.tar.gz) = 147355




From 0e4d41f065f7803d096e6c53b3956c820186c3ea Mon Sep 17 00:00:00 2001
From: Reginald Kennedy <rk@rejii.com>
Date: Sun, 31 May 2015 07:25:46 +0800
Subject: [PATCH] Add SIMPLEQ->STAILQ macros for freebsd.

---
 freebsd/util.h |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/freebsd/util.h b/freebsd/util.h
index 4737d42..34b5c36 100644
--- freebsd/util.h
+++ freebsd/util.h
@@ -1,5 +1,21 @@
 #include <libutil.h>
 
 #ifndef TAILQ_END
-#define	TAILQ_END(head)			NULL
+#define TAILQ_END(head)			NULL
+#endif
+
+#ifndef SIMPLEQ_HEAD
+#define SIMPLEQ_HEAD			STAILQ_HEAD
+#define SIMPLEQ_HEAD_INITIALIZER	STAILQ_HEAD_INITIALIZER
+#define SIMPLEQ_ENTRY			STAILQ_ENTRY
+#define SIMPLEQ_INIT			STAILQ_INIT
+#define SIMPLEQ_INSERT_AFTER		STAILQ_INSERT_AFTER
+#define SIMPLEQ_INSERT_HEAD		STAILQ_INSERT_HEAD
+#define SIMPLEQ_INSERT_TAIL		STAILQ_INSERT_TAIL
+#define SIMPLEQ_EMPTY			STAILQ_EMPTY
+#define SIMPLEQ_FIRST			STAILQ_FIRST
+#define SIMPLEQ_REMOVE_AFTER		STAILQ_REMOVE_AFTER
+#define SIMPLEQ_REMOVE_HEAD		STAILQ_REMOVE_HEAD
+#define SIMPLEQ_FOREACH			STAILQ_FOREACH
+#define SIMPLEQ_END(head)		NULL
 #endif
-- 
1.7.6


Lines 1-6 Link Here

(-)files/patch-spectrwm.c (-3 / +3 lines)
1	--- spectrwm.c.orig 2014-04-06 09:43:33.000000000 +0200	1	--- spectrwm.c.orig 2016-06-05 07:12:06 UTC
2	+++ spectrwm.c 2014-04-06 09:43:33.000000000 +0200	2	+++ spectrwm.c
3	@@ -7008,7 +7008,7 @@	3	@@ -7876,7 +7876,7 @@ validate_spawns(void)
4	void	4	void
5	setup_spawn(void)	5	setup_spawn(void)
6	{	6	{




From e4d823fc43527b676f631d72cc2cfd22254b15ff Mon Sep 17 00:00:00 2001
From: Reginald Kennedy <rk@rejii.com>
Date: Sat, 4 Jul 2015 13:24:24 +0800
Subject: [PATCH] Fix spectrwm.conf unbind example.

---
 spectrwm.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/spectrwm.conf b/spectrwm.conf
index 35948ef..2302580 100644
--- spectrwm.conf
+++ spectrwm.conf
@@ -92,7 +92,7 @@
 
 # To disable validation of the above, free the respective binding(s):
 # bind[]		= MOD+Shift+Delete	# disable lock
-# bind[]		= MOD+Shift+Enter	# disable term
+# bind[]		= MOD+Shift+Return	# disable term
 # bind[]		= MOD+p			# disable menu
 
 # Optional default programs that will only be validated if you override:
-- 
1.7.6


Return to bug 209965

Lines 1-39 Link Here

(-)files/patch-freebsd_util.h (-39 lines)
1	From 0e4d41f065f7803d096e6c53b3956c820186c3ea Mon Sep 17 00:00:00 2001
2	From: Reginald Kennedy <rk@rejii.com>
3	Date: Sun, 31 May 2015 07:25:46 +0800
4	Subject: [PATCH] Add SIMPLEQ->STAILQ macros for freebsd.
5
6	---
7	freebsd/util.h \| 18 +++++++++++++++++-
8	1 files changed, 17 insertions(+), 1 deletions(-)
9
10	diff --git a/freebsd/util.h b/freebsd/util.h
11	index 4737d42..34b5c36 100644
12	--- freebsd/util.h
13	+++ freebsd/util.h
14	@@ -1,5 +1,21 @@
15	#include <libutil.h>
16
17	#ifndef TAILQ_END
18	-#define TAILQ_END(head) NULL
19	+#define TAILQ_END(head) NULL
20	+#endif
21	+
22	+#ifndef SIMPLEQ_HEAD
23	+#define SIMPLEQ_HEAD STAILQ_HEAD
24	+#define SIMPLEQ_HEAD_INITIALIZER STAILQ_HEAD_INITIALIZER
25	+#define SIMPLEQ_ENTRY STAILQ_ENTRY
26	+#define SIMPLEQ_INIT STAILQ_INIT
27	+#define SIMPLEQ_INSERT_AFTER STAILQ_INSERT_AFTER
28	+#define SIMPLEQ_INSERT_HEAD STAILQ_INSERT_HEAD
29	+#define SIMPLEQ_INSERT_TAIL STAILQ_INSERT_TAIL
30	+#define SIMPLEQ_EMPTY STAILQ_EMPTY
31	+#define SIMPLEQ_FIRST STAILQ_FIRST
32	+#define SIMPLEQ_REMOVE_AFTER STAILQ_REMOVE_AFTER
33	+#define SIMPLEQ_REMOVE_HEAD STAILQ_REMOVE_HEAD
34	+#define SIMPLEQ_FOREACH STAILQ_FOREACH
35	+#define SIMPLEQ_END(head) NULL
36	#endif
37	--
38	1.7.6
39

Lines 1-25 Link Here

(-)files/patch-spectrwm.conf (-25 lines)
1	From e4d823fc43527b676f631d72cc2cfd22254b15ff Mon Sep 17 00:00:00 2001
2	From: Reginald Kennedy <rk@rejii.com>
3	Date: Sat, 4 Jul 2015 13:24:24 +0800
4	Subject: [PATCH] Fix spectrwm.conf unbind example.
5
6	---
7	spectrwm.conf \| 2 +-
8	1 files changed, 1 insertions(+), 1 deletions(-)
9
10	diff --git a/spectrwm.conf b/spectrwm.conf
11	index 35948ef..2302580 100644
12	--- spectrwm.conf
13	+++ spectrwm.conf
14	@@ -92,7 +92,7 @@
15
16	# To disable validation of the above, free the respective binding(s):
17	# bind[] = MOD+Shift+Delete # disable lock
18	-# bind[] = MOD+Shift+Enter # disable term
19	+# bind[] = MOD+Shift+Return # disable term
20	# bind[] = MOD+p # disable menu
21
22	# Optional default programs that will only be validated if you override:
23	--
24	1.7.6
25