From c200978266f4802f8cd132abd2442396e8ae5fd5 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 22 Oct 2005 17:48:33 +0000 Subject: [PATCH] Added patch for ppc-macos that forces use of emulated poll() Package-Manager: portage-2.0.51.22-r3 --- dev-libs/glib/ChangeLog | 9 ++++++--- dev-libs/glib/Manifest | 5 +++-- dev-libs/glib/files/glib-2.8.3-macos.patch | 11 +++++++++++ dev-libs/glib/glib-2.8.3.ebuild | 3 ++- 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 dev-libs/glib/files/glib-2.8.3-macos.patch diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 5d131e16e4f5..6da79108af9b 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for dev-libs/glib # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.163 2005/10/22 15:37:42 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.164 2005/10/22 17:48:33 grobian Exp $ - 22 Oct 2005; Fabian Groffen glib-2.8.3.ebuild: + 22 Oct 2005; Fabian Groffen + +files/glib-2.8.3-macos.patch, glib-2.8.3.ebuild: Removed unnecessary conditional operations for ppc-macos (bug #110127). - Thanks to + Added patch for ppc-macos that forces use of emulated poll(), since the OSX + provided one is buggy as hell. Patch provided by and thanks to + *glib-2.8.3 (20 Oct 2005) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 27d17f9062bf..e2e79a187040 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,9 +1,10 @@ -MD5 90a04c6dc32a780dbb4c3a193015cfa0 glib-2.8.3.ebuild 1648 +MD5 0c3e285d25dbfda1564eab941c76ee7b glib-2.8.3.ebuild 1685 MD5 8b9798ea1c5936bd0a379ab470a1d12b glib-2.8.2.ebuild 1699 -MD5 7ba30ebf69a86e6160a4aed406afc22b ChangeLog 19097 +MD5 757ad3c4ca56e1b2485ac8f580a5a6ba ChangeLog 19264 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 e19f2f426fdecf8788d79e0a54c4905a glib-2.6.5.ebuild 1646 MD5 b75614f954c7353c9e75e011ee1adb59 glib-1.2.10-r5.ebuild 1536 +MD5 02673367ae3d806f2df4dd6fbfff54f4 files/glib-2.8.3-macos.patch 307 MD5 60c45aba2f0c1b47590e8193b533d7c7 files/digest-glib-2.6.5 64 MD5 191b2c40165605d5d4507a2bda91b556 files/digest-glib-2.8.2 64 MD5 db53dd4219e7b659886408c7174d7e67 files/digest-glib-2.8.3 64 diff --git a/dev-libs/glib/files/glib-2.8.3-macos.patch b/dev-libs/glib/files/glib-2.8.3-macos.patch new file mode 100644 index 000000000000..63445bb55e44 --- /dev/null +++ b/dev-libs/glib/files/glib-2.8.3-macos.patch @@ -0,0 +1,11 @@ +--- glib/gmain.c 2005-10-22 18:30:01.000000000 +0200 ++++ glib/gmain.c 2005-10-22 18:28:46.000000000 +0200 +@@ -52,7 +52,7 @@ + /* The poll() emulation on OS/X doesn't handle fds=NULL, nfds=0, + * so we prefer our own poll emulation. + */ +-#ifdef _POLL_EMUL_H_ ++#ifdef __APPLE__ + #undef HAVE_POLL + #endif + diff --git a/dev-libs/glib/glib-2.8.3.ebuild b/dev-libs/glib/glib-2.8.3.ebuild index 0dafeb4be101..cf6cc8d5417a 100644 --- a/dev-libs/glib/glib-2.8.3.ebuild +++ b/dev-libs/glib/glib-2.8.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.8.3.ebuild,v 1.2 2005/10/22 15:37:42 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.8.3.ebuild,v 1.3 2005/10/22 17:48:33 grobian Exp $ inherit gnome.org libtool eutils flag-o-matic debug @@ -30,6 +30,7 @@ src_unpack() { replace-flags -O[2-3] -O1 epatch ${FILESDIR}/glib-2.6.3-testglib-ssp.patch fi + epatch ${FILESDIR}/${P}-macos.patch } src_compile() { -- 2.26.2