diff options
author | Fabian Groffen <grobian@gentoo.org> | 2013-07-23 20:10:49 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2013-07-23 20:10:49 +0000 |
commit | 07e0d956c6b55a8bbe846c71b7ee7ff0fe14287e (patch) | |
tree | 1718ff5986dc39518f8100d3aae83af48383822d /x11-libs/gtk+ | |
parent | Restore and bump ebuild for (still maintained) 1.3 branch (diff) | |
download | gentoo-2-07e0d956c6b55a8bbe846c71b7ee7ff0fe14287e.tar.gz gentoo-2-07e0d956c6b55a8bbe846c71b7ee7ff0fe14287e.tar.bz2 gentoo-2-07e0d956c6b55a8bbe846c71b7ee7ff0fe14287e.zip |
Fix install on Darwin
(Portage version: 2.2.01.22124-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'x11-libs/gtk+')
-rw-r--r-- | x11-libs/gtk+/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch | 15 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-2.24.20.ebuild | 6 |
3 files changed, 23 insertions, 4 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 1696e3cc33f4..a4495979727d 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.669 2013/07/07 13:03:07 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.670 2013/07/23 20:10:49 grobian Exp $ + + 23 Jul 2013; Fabian Groffen <grobian@gentoo.org> + +files/gtk+-2.24.20-darwin-quartz-pasteboard.patch, gtk+-2.24.20.ebuild: + Fix install on Darwin *gtk+-2.24.20 (07 Jul 2013) diff --git a/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch new file mode 100644 index 000000000000..a07e6537d22e --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch @@ -0,0 +1,15 @@ +gdk_quartz_target_to_pasteboard_type_libgtk_only was moved in +a269c2f8d26a588c4b61ad605ef496e89759cc03 +https://mail.gnome.org/archives/commits-list/2013-March/msg20203.html +https://bugzilla.gnome.org/show_bug.cgi?id=704766 + +--- gtk/gtkclipboard-quartz.c ++++ gtk/gtkclipboard-quartz.c +@@ -33,6 +33,7 @@ + #include "gtktextbuffer.h" + #include "gtkquartz.h" + #include "gtkalias.h" ++#include "quartz/gdkquartz.h" + + enum { + OWNER_CHANGE, diff --git a/x11-libs/gtk+/gtk+-2.24.20.ebuild b/x11-libs/gtk+/gtk+-2.24.20.ebuild index 1552b361bcdd..07361e81cd9a 100644 --- a/x11-libs/gtk+/gtk+-2.24.20.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.20.ebuild,v 1.1 2013/07/07 13:03:07 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.20.ebuild,v 1.2 2013/07/23 20:10:49 grobian Exp $ EAPI="5" inherit eutils flag-o-matic gnome2-utils gnome.org multilib virtualx autotools readme.gentoo @@ -99,8 +99,8 @@ src_prepare() { # Don't break inclusion of gtkclist.h, upstream bug #536767 epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch" - # fix building with gir #372953, upstream bug #642085 - epatch "${FILESDIR}"/${PN}-2.24.7-darwin-quartz-introspection.patch + # Fix building due to moved definition, upstream bug #704766 + epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch # marshalers code was pre-generated with glib-2.31, upstream bug #671763 rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \ |