diff options
| -rw-r--r-- | wm/i3/Makefile | 6 | ||||
| -rw-r--r-- | wm/i3/PLIST | 2 | ||||
| -rw-r--r-- | wm/i3/distinfo | 14 | ||||
| -rw-r--r-- | wm/i3/patches/patch-src_log.c | 27 | ||||
| -rw-r--r-- | wm/i3/patches/patch-src_main.c | 33 |
5 files changed, 40 insertions, 42 deletions
diff --git a/wm/i3/Makefile b/wm/i3/Makefile index fcaac4fb060..c69906e70d0 100644 --- a/wm/i3/Makefile +++ b/wm/i3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2015/11/09 11:05:44 nros Exp $ +# $NetBSD: Makefile,v 1.14 2016/05/01 09:39:58 degroote Exp $ # -DISTNAME= i3-4.11 +DISTNAME= i3-4.12 CATEGORIES= wm MASTER_SITES= http://i3wm.org/downloads/ EXTRACT_SUFX= .tar.bz2 @@ -27,7 +27,7 @@ MAKE_ENV+= DEBUG=0 MAKE_ENV+= SHM_SUPPORT=0 REPLACE_PERL+= i3-dmenu-desktop -REPLACE_PERL+= i3-migrate-config-to-v4 +REPLACE_PERL+= i3-migrate-config-to-v4 REPLACE_PERL+= i3-save-tree SUBST_CLASSES+= conf diff --git a/wm/i3/PLIST b/wm/i3/PLIST index 1301fcbc21f..4432e59c64d 100644 --- a/wm/i3/PLIST +++ b/wm/i3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2015/04/05 17:02:51 nros Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/05/01 09:39:58 degroote Exp $ bin/i3 bin/i3-config-wizard bin/i3-dmenu-desktop diff --git a/wm/i3/distinfo b/wm/i3/distinfo index 7f165f4540e..38c8e8f0906 100644 --- a/wm/i3/distinfo +++ b/wm/i3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2015/11/09 11:05:44 nros Exp $ +$NetBSD: distinfo,v 1.10 2016/05/01 09:39:58 degroote Exp $ -SHA1 (i3-4.11.tar.bz2) = 85d04492214bd26c2804dfa83c979fda54b51c08 -RMD160 (i3-4.11.tar.bz2) = afdc6ef9708e797870b4c6c4dedc3b289a7b7d9c -SHA512 (i3-4.11.tar.bz2) = 76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df3dddd28f912ff49a4f -Size (i3-4.11.tar.bz2) = 972929 bytes +SHA1 (i3-4.12.tar.bz2) = 264e682c7404ee8d5da76e3d652c546db1662a2b +RMD160 (i3-4.12.tar.bz2) = 65d74a4ddc775d7e5888c72cf72fbb43873dd9e0 +SHA512 (i3-4.12.tar.bz2) = 966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5 +Size (i3-4.12.tar.bz2) = 988084 bytes SHA1 (patch-Makefile) = 919f0e87efa951bde531b9172b74589d3e1c474a -SHA1 (patch-src_log.c) = 75ac4d0681d114e0343ddb015292c6c8ee81c1ae -SHA1 (patch-src_main.c) = c03fcb12d404fcdfd14c1892b771ee0c7a86b39d +SHA1 (patch-src_log.c) = 3d2a869a79e9ae851c6044752d1d0b3d2a4b0ee2 +SHA1 (patch-src_main.c) = 98428db66fed3352ee8f76ad43930b0418079b01 diff --git a/wm/i3/patches/patch-src_log.c b/wm/i3/patches/patch-src_log.c index 0f9b2316082..df1f2493f48 100644 --- a/wm/i3/patches/patch-src_log.c +++ b/wm/i3/patches/patch-src_log.c @@ -1,18 +1,14 @@ -$NetBSD: patch-src_log.c,v 1.3 2014/08/09 19:14:01 degroote Exp $ - -NetBSD does not support shm_open (3), disable the code in this case - ---- src/log.c.orig 2014-06-15 17:12:43.000000000 +0000 -+++ src/log.c 2014-08-09 20:52:23.000000000 +0000 -@@ -108,6 +108,7 @@ +--- 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 @@ + * + */ + void open_logbuffer(void) { ++#if !defined(__NetBSD__) + /* Reserve 1% of the RAM for the logfile, but at max 25 MiB. * For 512 MiB of RAM this will lead to a 5 MiB log buffer. * At the moment (2011-12-10), no testcase leads to an i3 log - * of more than ~ 600 KiB. */ -+#if !defined(__NetBSD__) - long long physical_mem_bytes; - #if defined(__APPLE__) - int mib[2] = {CTL_HW, HW_MEMSIZE}; -@@ -163,6 +164,7 @@ +@@ -166,6 +167,7 @@ logwalk = logbuffer + sizeof(i3_shmlog_header); loglastwrap = logbuffer + logbuffer_size; store_log_markers(); @@ -20,16 +16,17 @@ NetBSD does not support shm_open (3), disable the code in this case } /* -@@ -170,10 +172,12 @@ +@@ -173,11 +175,13 @@ * */ void close_logbuffer(void) { +#if !defined(__NetBSD__) close(logbuffer_shm); shm_unlink(shmlogname); + free(shmlogname); logbuffer = NULL; shmlogname = ""; -+#endif ++#endif /* !defined(__NetBSD__) */ } /* diff --git a/wm/i3/patches/patch-src_main.c b/wm/i3/patches/patch-src_main.c index 7e6eea7137e..6d94c7bef0a 100644 --- a/wm/i3/patches/patch-src_main.c +++ b/wm/i3/patches/patch-src_main.c @@ -1,27 +1,28 @@ -$NetBSD: patch-src_main.c,v 1.1.1.1 2013/02/12 23:25:35 tonnerre Exp $ - ---- src/main.c.orig 2012-12-11 23:08:17.000000000 +0000 -+++ src/main.c -@@ -218,12 +218,6 @@ static void i3_exit(void) { - #if EV_VERSION_MAJOR >= 4 +--- 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 @@ ev_loop_destroy(main_loop); #endif -- -- if (*shmlogname != '\0') { -- fprintf(stderr, "Closing SHM log \"%s\"\n", shmlogname); -- fflush(stderr); -- shm_unlink(shmlogname); -- } + ++#if !defined(__NetBSD__) + if (*shmlogname != '\0') { + fprintf(stderr, "Closing SHM log \"%s\"\n", shmlogname); + fflush(stderr); + shm_unlink(shmlogname); + } ++#endif /* !defined(__NetBSD__) */ } /* -@@ -233,9 +227,6 @@ static void i3_exit(void) { +@@ -180,9 +182,11 @@ * */ static void handle_signal(int sig, siginfo_t *info, void *data) { -- if (*shmlogname != '\0') { -- shm_unlink(shmlogname); -- } ++#if !defined(__NetBSD__) + if (*shmlogname != '\0') { + shm_unlink(shmlogname); + } ++#endif /* !defined(__NetBSD__) */ raise(sig); } |