summaryrefslogtreecommitdiff
path: root/wm/i3/patches
diff options
context:
space:
mode:
Diffstat (limited to 'wm/i3/patches')
-rw-r--r--wm/i3/patches/patch-Makefile12
-rw-r--r--wm/i3/patches/patch-Makefile.in14
-rw-r--r--wm/i3/patches/patch-src_log.c3
-rw-r--r--wm/i3/patches/patch-src_main.c3
4 files changed, 20 insertions, 12 deletions
diff --git a/wm/i3/patches/patch-Makefile b/wm/i3/patches/patch-Makefile
deleted file mode 100644
index 4e6434b1a9e..00000000000
--- a/wm/i3/patches/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2013/02/12 23:25:35 tonnerre Exp $
-
---- Makefile.orig 2012-11-25 16:04:42.000000000 +0000
-+++ Makefile
-@@ -18,7 +18,6 @@ include i3-msg/i3-msg.mk
- include i3-input/i3-input.mk
- include i3-nagbar/i3-nagbar.mk
- include i3bar/i3bar.mk
--include i3-dump-log/i3-dump-log.mk
- include docs/docs.mk
- include man/man.mk
-
diff --git a/wm/i3/patches/patch-Makefile.in b/wm/i3/patches/patch-Makefile.in
new file mode 100644
index 00000000000..a06e8ed0ae2
--- /dev/null
+++ b/wm/i3/patches/patch-Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/08/09 11:13:30 nros Exp $
+* install conf files in examples dir to follow the pkgsrc
+ way of installing conf files.
+--- Makefile.in.orig 2017-08-08 07:26:56.000000000 +0000
++++ Makefile.in
+@@ -749,7 +749,7 @@ dist_bin_SCRIPTS = \
+ i3-sensible-pager \
+ i3-sensible-terminal
+
+-i3confdir = $(sysconfdir)/i3
++i3confdir = $(datadir)/examples/i3
+ dist_i3conf_DATA = \
+ etc/config \
+ etc/config.keycodes
diff --git a/wm/i3/patches/patch-src_log.c b/wm/i3/patches/patch-src_log.c
index df1f2493f48..6beeaa265ab 100644
--- a/wm/i3/patches/patch-src_log.c
+++ b/wm/i3/patches/patch-src_log.c
@@ -1,3 +1,6 @@
+$NetBSD: patch-src_log.c,v 1.5 2017/08/09 11:13:30 nros Exp $
+* NetBSD versions below and 7 miss shm_open and shm_unlink
+* NetBSD versions below 8 miss pthread_condattr_pshared
--- src/log.c.orig 2016-03-06 15:17:18.000000000 +0000
+++ src/log.c 2016-05-01 10:51:32.392955298 +0000
@@ -116,6 +116,7 @@
diff --git a/wm/i3/patches/patch-src_main.c b/wm/i3/patches/patch-src_main.c
index 6d94c7bef0a..8983d11e455 100644
--- a/wm/i3/patches/patch-src_main.c
+++ b/wm/i3/patches/patch-src_main.c
@@ -1,3 +1,6 @@
+$NetBSD: patch-src_main.c,v 1.3 2017/08/09 11:13:30 nros Exp $
+* NetBSD versions lower than 7 does not have shm_open and shm_unlink
+ see patch-src_log.c
--- src/main.c.orig 2016-05-01 10:53:25.236039259 +0000
+++ src/main.c 2016-05-01 10:54:26.269651048 +0000
@@ -166,11 +166,13 @@