diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-07-03 13:08:01 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-07-03 13:08:01 +0000 |
| commit | a45401c281c13a2dcf14b2a4cf5dfc6f95a7f3ac (patch) | |
| tree | cffd691e2706ced765993a0906e8c4672422651e /x11-libs | |
| parent | alpha/sparc stable wrt #325531 (diff) | |
| download | gentoo-2-a45401c281c13a2dcf14b2a4cf5dfc6f95a7f3ac.tar.gz gentoo-2-a45401c281c13a2dcf14b2a4cf5dfc6f95a7f3ac.tar.bz2 gentoo-2-a45401c281c13a2dcf14b2a4cf5dfc6f95a7f3ac.zip | |
Fix compilation on Darwin8
(Portage version: 2.2.01.15352-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/gtk+/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch | 13 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.20.1-r1.ebuild | 6 |
3 files changed, 21 insertions, 4 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 53fc3396ffef..0b7ae42af39f 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.460 2010/06/20 11:15:18 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.461 2010/07/03 13:08:01 grobian Exp $ + + 03 Jul 2010; Fabian Groffen <grobian@gentoo.org> gtk+-2.20.1-r1.ebuild, + +files/gtk+-2.20.1-darwin8.patch: + Fix compilation on Darwin8 20 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org> gtk+-2.20.1-r1.ebuild, metadata.xml: diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch b/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch new file mode 100644 index 000000000000..f4a865c5d39b --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch @@ -0,0 +1,13 @@ +NSUInteger is available starting from OSX 10.5 (Leopard) + +--- gtk/gtkquartz.c ++++ gtk/gtkquartz.c +@@ -260,7 +260,7 @@ + GdkDisplay *display; + gint format; + const guchar *data; +- NSUInteger length; ++ guint length; + + target = gdk_atom_name (gtk_selection_data_get_target (selection_data)); + display = gtk_selection_data_get_display (selection_data); diff --git a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild index d6f8721b0fbe..1aa3d2d8431f 100644 --- a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.20.1-r1.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-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.2 2010/06/20 11:15:18 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.3 2010/07/03 13:08:01 grobian Exp $ EAPI="3" @@ -79,8 +79,8 @@ src_prepare() { # Don't break inclusion of gtkclist.h, upstream bug 536767 epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch" - # add correct framework linking options, for aqua - epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch" + # Fix for missing NSUInteger on Darwin8 (10.4) + [[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${P}-darwin8.patch # Remove the definition of libpixbufloader_gdip_png_la_* epatch "${FILESDIR}/${P}-libpixbufloader-warning.patch" |