diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2011-09-09 14:25:50 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2011-09-09 14:25:50 +0000 |
| commit | f84199e8ef9ce93002192e9317847168f5690a03 (patch) | |
| tree | e598f74b7cf36134ff0de6097cf8b9eff95307c9 /x11-apps | |
| parent | Stable for HPPA (bug #379289). (diff) | |
| download | gentoo-2-f84199e8ef9ce93002192e9317847168f5690a03.tar.gz gentoo-2-f84199e8ef9ce93002192e9317847168f5690a03.tar.bz2 gentoo-2-f84199e8ef9ce93002192e9317847168f5690a03.zip | |
Add patch to build on FreeBSD. Bug #352663. Re-add ~x86-fbsd
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xinit-1.3.1-prio-process.patch | 14 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.3.1.ebuild | 5 |
3 files changed, 22 insertions, 3 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index e9cf17763015..f27d7c8343e8 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.214 2011/09/05 19:19:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.215 2011/09/09 14:25:49 naota Exp $ + + 09 Sep 2011; Naohiro Aota <naota@gentoo.org> xinit-1.3.1.ebuild, + +files/xinit-1.3.1-prio-process.patch: + Add patch to build on FreeBSD. Bug #352663. Re-add ~x86-fbsd 05 Sep 2011; Markus Meier <maekke@gentoo.org> xinit-1.3.1.ebuild: arm stable, bug #380421 diff --git a/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch new file mode 100644 index 000000000000..838171bb67f9 --- /dev/null +++ b/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch @@ -0,0 +1,14 @@ +diff --git a/xinit.c b/xinit.c +index 42ff008..2ab817f 100644 +--- a/xinit.c ++++ b/xinit.c +@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group. + #endif + + /* For PRIO_PROCESS and setpriority() */ +-#ifdef __DragonFly__ + #include <sys/time.h> + #include <sys/resource.h> +-#endif /* __DragonFly__ */ + + #include <stdlib.h> diff --git a/x11-apps/xinit/xinit-1.3.1.ebuild b/x11-apps/xinit/xinit-1.3.1.ebuild index aee2eca9caf6..a18f0ecfa65b 100644 --- a/x11-apps/xinit/xinit-1.3.1.ebuild +++ b/x11-apps/xinit/xinit-1.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1.ebuild,v 1.5 2011/09/05 19:19:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1.ebuild,v 1.6 2011/09/09 14:25:49 naota Exp $ EAPI=4 @@ -9,7 +9,7 @@ inherit xorg-2 DESCRIPTION="X Window System initializer" LICENSE="${LICENSE} GPL-2" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="+minimal" RDEPEND=" @@ -29,6 +29,7 @@ PDEPEND="x11-apps/xrdb PATCHES=( "${FILESDIR}/0001-Gentoo-customizations.patch" + "${FILESDIR}/${P}-prio-process.patch" ) pkg_setup() { |