diff options
| author | rene <rene@FreeBSD.org> | 2013-02-05 05:39:41 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2013-02-05 05:39:41 +0800 |
| commit | 04a3323de7ecf67d3e487f0c6119b31c483a53c1 (patch) | |
| tree | d9eaf8daae675cb284f0921d0feb52e0d901b124 /www/chromium | |
| parent | 5c14a72fbb1496d6bd8c2afe6e6fe47a07439867 (diff) | |
| download | freebsd-ports-gnome-04a3323de7ecf67d3e487f0c6119b31c483a53c1.tar.gz freebsd-ports-gnome-04a3323de7ecf67d3e487f0c6119b31c483a53c1.tar.zst freebsd-ports-gnome-04a3323de7ecf67d3e487f0c6119b31c483a53c1.zip | |
- revert r310861, which seems to cause IPC memory leaks.
- bump PORTREVISION
Discussed on: freebsd-chromium
Diffstat (limited to 'www/chromium')
| -rw-r--r-- | www/chromium/Makefile | 1 | ||||
| -rw-r--r-- | www/chromium/files/patch-ui__surface__transport_dib_linux.cc | 27 |
2 files changed, 13 insertions, 15 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 6dcfd6106451..4d5ef3619f59 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -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/ \ diff --git a/www/chromium/files/patch-ui__surface__transport_dib_linux.cc b/www/chromium/files/patch-ui__surface__transport_dib_linux.cc index 0bf21dd862d6..f21230f672c1 100644 --- a/www/chromium/files/patch-ui__surface__transport_dib_linux.cc +++ b/www/chromium/files/patch-ui__surface__transport_dib_linux.cc @@ -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 */); |