Fix build on BSD, bug #309443

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index bbe7157d63ddf6337fd6429d0d4fd105a2bc6b88..2910fe52165316eff75bba9dec608b61ac39cfce 100644 (file)
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.246 2010/03/07 21:24:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.247 2010/03/16 09:53:55 aballier Exp $
+
+  16 Mar 2010; Alexis Ballier <aballier@gentoo.org> metacity-2.28.1.ebuild,
+  +files/metacity-2.28.1-wif_macros.patch:
+  Fix build on BSD, bug #309443
 
   07 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -metacity-2.24.0-r2.ebuild, -files/metacity-2.24.0-crash-login.patch,

diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index f77c5b4a4e00f4ad2306fd961545b90a4ef4f907..c5836b84be4cc15a3880dbd02590b6faa0400a74 100644 (file)
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -4,16 +4,17 @@ Hash: SHA1
 AUX metacity-2.26.0-panel-behavior.patch 3374 RMD160 1793a72ce7e6e1904746c1c4d4113a2a66271ee2 SHA1 58bf8a33abb86026abc80d8e1dc04133f6fccc29 SHA256 02ad2a002af64ebc107a5481744e946a1e34402a10cf8ada12fb03fa846ebdb8
 AUX metacity-2.28.0-restartstylehint-when-replace.patch 4709 RMD160 da983b21c50dbacd8f5df06f50d233eef6c25331 SHA1 248f8dce5fc3b88ce43e796ba7995bf0d76a9d99 SHA256 3a7e484ec2eb97e7b7f1baaa33e5d925e67a35c84e49c5abe6c32cf2c25f16eb
 AUX metacity-2.28.0-sys-wait-header.patch 480 RMD160 5f3cb891f1f1e5e122db1b4a20af345df1963e48 SHA1 fb9cb941e877c552dd1aef8c49470bcdd300007f SHA256 7bcaa2ba358e8666cef98abeea30d7a01d8c9c9e60ead7ec0b2dee3ee6f84be0
+AUX metacity-2.28.1-wif_macros.patch 500 RMD160 570a8b9e76e815cc5d207fddcf0278e193edbf77 SHA1 fa42355b0200d577eef767e28b8674eef5eb9e42 SHA256 94c1f3bd17c618a8b59585939987138bdbd590de8b3f6c16b89586e68c7c6cef
 DIST metacity-2.26.0.tar.bz2 2289848 RMD160 26b75abb9b705f9fd7711dfbbff134e600dcfd56 SHA1 70593f69148960a0248527c8ae8d442a3d251d08 SHA256 29ba16411899d963bae69a4d72d37dec38a33e62412fe769d497de4555559078
 DIST metacity-2.28.1.tar.bz2 2348762 RMD160 3d93c7f0a771f8ba2d82ef03b13d79e90af4b62c SHA1 752d1aff3a1a96d63069bcf58de5cc21de9a240d SHA256 38e4d389d6fb375e82544fd572b3a32bbcd6d26ebe58a9a0a92c461edadf95e2
 EBUILD metacity-2.26.0-r1.ebuild 1618 RMD160 a08daa67044e9eb72558bb0c7a01df85e7218ed0 SHA1 44a5fcc3f33849ae518d06af7e9b55fdbd18fded SHA256 9129d7f87a1ca85795f9e9f8b9422a90fe76116f35483421a73ada16899dfecb
-EBUILD metacity-2.28.1.ebuild 2271 RMD160 e8030572925654c85a5b986b0ad33e96bad2c5e0 SHA1 345a7c71add071c45db0e961049275eb31848b90 SHA256 ddfcee580496ca1e0fcadceb7fc40d66447a25adde0f8b34006570205d57db13
-MISC ChangeLog 29682 RMD160 d4a7dc1bfe10a4a07223d9c1fcc524a70f8fae80 SHA1 4f1459762b616f46b4993fbd7e76c623771e6df6 SHA256 80587e6280f7137f641f221a357def0a0822c0209f7481d103c09d8e27814913
+EBUILD metacity-2.28.1.ebuild 2512 RMD160 2f3bfa0966c3d0ceddcbedba769006b31834629b SHA1 ab81fa9cbc0e2cff9f40fbecb4b7d090a460cffa SHA256 8b2015bfbd8e89bae9ee32667599cf5d67a0012471d440d4971c5e8f49ef27d2
+MISC ChangeLog 29839 RMD160 3b7b0815db57dfdc7874c1400c874b93072c7c7a SHA1 4b2809144c3ea8a3cc740d5a50b038c3920bae2d SHA256 48de3766374ede461880de088f69e06261113d495950e0eda2b44d9b023d59d4
 MISC metadata.xml 409 RMD160 cd76d1e78c03fb5379abca2a1e136cba116eacae SHA1 703d6a46d96d2734062f1496880b983b89f837c9 SHA256 cbc77bb6077444f8b66e4f8a4cd4cf1af7dbbe8d410b4819ef5e1af049378218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuUGaYACgkQ1fmVwcYIWAa0vACgue9HAR5iWNMA8C3VSIqPT8RX
-x9EAnR0hHDJ0tEG64/mat3sQ+SglgrO8
-=rtsG
+iEYEARECAAYFAkufVTkACgkQvFcC4BYPU0q24QCbBxv7sV7+ICXrfZw6eGpGPe0J
+ADMAnRZF7UxeGkWdx4XCAq6BqffXgo7q
+=P8RB
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch b/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch
new file mode 100644 (file)
index 0000000..4ce382e
--- /dev/null
+++ b/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch
@@ -0,0 +1,16 @@
+WIFEXITED and friends are defined in sys/wait.h
+Fixes a build failure on BSD.
+
+https://bugs.gentoo.org/show_bug.cgi?id=309443
+https://bugzilla.gnome.org/show_bug.cgi?id=605460
+
+--- metacity-2.28.1/src/core/delete.c.old      2010-03-15 07:46:52.000000000 +0100
++++ metacity-2.28.1/src/core/delete.c  2010-03-15 07:47:12.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include "workspace.h"
+ 
+ #include <sys/types.h>
++#include <sys/wait.h> /* WIF* macros */
+ #include <signal.h>
+ #include <unistd.h>
+ #include <errno.h>

diff --git a/x11-wm/metacity/metacity-2.28.1.ebuild b/x11-wm/metacity/metacity-2.28.1.ebuild
index 0aeae00260048e2ad6329f80e8c252b04bd573ef..5f615a59c2ed610026ee0d64c7752c6004ea4414 100644 (file)
--- a/x11-wm/metacity/metacity-2.28.1.ebuild
+++ b/x11-wm/metacity/metacity-2.28.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.28.1.ebuild,v 1.1 2010/02/06 18:18:03 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.28.1.ebuild,v 1.2 2010/03/16 09:53:55 aballier Exp $
 
 EAPI="2"
 # debug only changes CFLAGS
@@ -79,4 +79,10 @@ src_prepare() {
        # Use sys/wait.h header instead of wait.h as described in posix specs,
        # bug 292009
        epatch "${FILESDIR}/${PN}-2.28.0-sys-wait-header.patch"
+
+       # WIFEXITED and friends are defined in sys/wait.h
+       # Fixes a build failure on BSD.
+       # https://bugs.gentoo.org/show_bug.cgi?id=309443
+       # https://bugzilla.gnome.org/show_bug.cgi?id=605460
+       epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
 }