From 89bb4a7a3e7e8096717a0c5db949cbb755033d97 Mon Sep 17 00:00:00 2001
From: degroote <degroote>
Date: Sat, 9 Aug 2014 19:14:01 +0000
Subject: Update to 4.8

Important changes since 4.7:
	- layout saving / restoring
	- proper handling of DPI
	- improve compatibility with other softwares (java-based, or external
	  pagers)
	- fix several memory leaks
---
 wm/i3/Makefile                |  5 ++---
 wm/i3/distinfo                | 10 +++++-----
 wm/i3/patches/patch-src_log.c | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'wm/i3')

diff --git a/wm/i3/Makefile b/wm/i3/Makefile
index 25e7b53f03f..b3a80b5db18 100644
--- a/wm/i3/Makefile
+++ b/wm/i3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/05/29 23:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/09 19:14:01 degroote Exp $
 #
 
-DISTNAME=	i3-4.7.2
-PKGREVISION=	2
+DISTNAME=	i3-4.8
 CATEGORIES=	wm
 MASTER_SITES=	http://i3wm.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/i3/distinfo b/wm/i3/distinfo
index 632f6ad256b..115c6edec40 100644
--- a/wm/i3/distinfo
+++ b/wm/i3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2014/04/30 21:38:37 degroote Exp $
+$NetBSD: distinfo,v 1.4 2014/08/09 19:14:01 degroote Exp $
 
-SHA1 (i3-4.7.2.tar.bz2) = a324170f0fee581fd1f34549eda0800cab985ad8
-RMD160 (i3-4.7.2.tar.bz2) = 70af64384479a773ae3585ba1390b31e03eb625d
-Size (i3-4.7.2.tar.bz2) = 897398 bytes
+SHA1 (i3-4.8.tar.bz2) = 857d8d0014b873de406e2041dea94d81cc515b74
+RMD160 (i3-4.8.tar.bz2) = 2f21b7f59aa6edab50f2d5dbf093c68e1ddf5d03
+Size (i3-4.8.tar.bz2) = 939690 bytes
 SHA1 (patch-Makefile) = 919f0e87efa951bde531b9172b74589d3e1c474a
-SHA1 (patch-src_log.c) = d555354ee2200ffcaa61c52f498de7e689084d90
+SHA1 (patch-src_log.c) = 75ac4d0681d114e0343ddb015292c6c8ee81c1ae
 SHA1 (patch-src_main.c) = c03fcb12d404fcdfd14c1892b771ee0c7a86b39d
diff --git a/wm/i3/patches/patch-src_log.c b/wm/i3/patches/patch-src_log.c
index cb00ea695d3..0f9b2316082 100644
--- a/wm/i3/patches/patch-src_log.c
+++ b/wm/i3/patches/patch-src_log.c
@@ -1,26 +1,26 @@
-$NetBSD: patch-src_log.c,v 1.2 2013/10/17 22:41:12 tonnerre Exp $
+$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	2013-08-07 18:50:24.000000000 +0000
-+++ src/log.c	2013-10-06 16:45:34.000000000 +0000
+--- 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 @@
           * 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;
+     long long physical_mem_bytes;
  #if defined(__APPLE__)
-         int mib[2] = { CTL_HW, HW_MEMSIZE };
-@@ -157,6 +158,7 @@
-         logwalk = logbuffer + sizeof(i3_shmlog_header);
-         loglastwrap = logbuffer + logbuffer_size;
-         store_log_markers();
+     int mib[2] = {CTL_HW, HW_MEMSIZE};
+@@ -163,6 +164,7 @@
+     logwalk = logbuffer + sizeof(i3_shmlog_header);
+     loglastwrap = logbuffer + logbuffer_size;
+     store_log_markers();
 +#endif /* !defined(__NetBSD__) */
  }
  
  /*
-@@ -164,10 +166,12 @@
+@@ -170,10 +172,12 @@
   *
   */
  void close_logbuffer(void) {
-- 
cgit v1.2.3