Date: Mon, 4 Feb 2013 21:39:41 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311648 - in head/www/chromium: . files Message-ID: <201302042139.r14Ldfb9098333@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon Feb 4 21:39:41 2013 New Revision: 311648 URL: http://svnweb.freebsd.org/changeset/ports/311648 Log: - revert r310861, which seems to cause IPC memory leaks. - bump PORTREVISION Discussed on: freebsd-chromium Modified: head/www/chromium/Makefile head/www/chromium/files/patch-ui__surface__transport_dib_linux.cc Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Mon Feb 4 21:19:38 2013 (r311647) +++ head/www/chromium/Makefile Mon Feb 4 21:39:41 2013 (r311648) @@ -4,6 +4,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- DISTVERSION= 24.0.1312.57 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ Modified: head/www/chromium/files/patch-ui__surface__transport_dib_linux.cc ============================================================================== --- head/www/chromium/files/patch-ui__surface__transport_dib_linux.cc Mon Feb 4 21:19:38 2013 (r311647) +++ head/www/chromium/files/patch-ui__surface__transport_dib_linux.cc Mon Feb 4 21:39:41 2013 (r311648) @@ -1,21 +1,18 @@ ---- ui/surface/transport_dib_linux.cc.orig 2013-01-08 04:46:06.000000000 +0200 -+++ ui/surface/transport_dib_linux.cc 2013-01-17 23:27:10.221168481 +0200 -@@ -37,6 +37,14 @@ - DCHECK(display_); - ui::DetachSharedMemory(display_, x_shm_); +--- ui/surface/transport_dib_linux.cc.orig 2011-09-14 11:02:00.000000000 +0300 ++++ ui/surface/transport_dib_linux.cc 2011-09-21 13:59:55.000000000 +0300 +@@ -31,6 +31,11 @@ + address_ = kInvalidAddress; } -+ + +#if defined(OS_FREEBSD) -+ if (is_valid_id(key_)) { -+ struct shmid_ds shmst; -+ if (shmctl(key_.shmkey, IPC_STAT, &shmst) == 0 && shmst.shm_nattch == 0) -+ shmctl(key_.shmkey, IPC_RMID, 0); -+ } ++ if(is_valid_id(key_)) ++ shmctl(key_.shmkey, IPC_RMID, 0); +#endif - } - - // static -@@ -51,10 +59,13 @@ ++ + if (x_shm_) { + DCHECK(display_); + ui::DetachSharedMemory(display_, x_shm_); +@@ -50,10 +55,13 @@ } void* address = shmat(shmkey, NULL /* desired address */, 0 /* flags */);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302042139.r14Ldfb9098333>