diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-06-25 00:38:39 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-06-25 00:38:39 +0000 |
| commit | bf6b1cbdd8e401b8122188e59abba84b192eb44d (patch) | |
| tree | 345e632b85fc450eb8fb5bc8903cbac17bb229b8 /net-misc/tsclient | |
| parent | Fix system-config-printer-common dependency (bug #422709, thanks to Charles N... (diff) | |
| download | gentoo-2-bf6b1cbdd8e401b8122188e59abba84b192eb44d.tar.gz gentoo-2-bf6b1cbdd8e401b8122188e59abba84b192eb44d.tar.bz2 gentoo-2-bf6b1cbdd8e401b8122188e59abba84b192eb44d.zip | |
Fix building with glib-2.32 (bug #423283, thanks to Diego Elio Pettenò).
(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/tsclient')
| -rw-r--r-- | net-misc/tsclient/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/tsclient/files/tsclient-2.0.1-glib-2.32.patch | 21 | ||||
| -rw-r--r-- | net-misc/tsclient/tsclient-2.0.1-r1.ebuild | 5 |
3 files changed, 29 insertions, 3 deletions
diff --git a/net-misc/tsclient/ChangeLog b/net-misc/tsclient/ChangeLog index fee6d054158b..e8f4ed915f55 100644 --- a/net-misc/tsclient/ChangeLog +++ b/net-misc/tsclient/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/tsclient # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.38 2012/05/05 03:20:44 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.39 2012/06/25 00:38:39 tetromino Exp $ + + 25 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + tsclient-2.0.1-r1.ebuild, +files/tsclient-2.0.1-glib-2.32.patch: + Fix building with glib-2.32 (bug #423283, thanks to Diego Elio Pettenò). 05 May 2012; Jeff Horelick <jdhore@gentoo.org> tsclient-2.0.1-r1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/net-misc/tsclient/files/tsclient-2.0.1-glib-2.32.patch b/net-misc/tsclient/files/tsclient-2.0.1-glib-2.32.patch new file mode 100644 index 000000000000..d18f13f13850 --- /dev/null +++ b/net-misc/tsclient/files/tsclient-2.0.1-glib-2.32.patch @@ -0,0 +1,21 @@ +Submitted: Dominique Leuenberger (dimstar) - 2011-12-01 03:38:02 PST + +Since glib 2.31, including any header than glib.h (plus some exceptions) is +no longer possible. Headers are indirectly implicit included by glib.h + +The attached patch fixes what's needed. + +http://sourceforge.net/tracker/?func=detail&aid=3446993&group_id=192483&atid=941576 + +Index: tsclient-2.0.2/src/tsc-bookmarkfile.h +=================================================================== +--- tsclient-2.0.2.orig/src/tsc-bookmarkfile.h ++++ tsclient-2.0.2/src/tsc-bookmarkfile.h +@@ -21,7 +21,6 @@ + #define __TSC_BOOKMARK_FILE_H__ + + #include <glib.h> +-#include <glib/gerror.h> + #include <time.h> + + G_BEGIN_DECLS diff --git a/net-misc/tsclient/tsclient-2.0.1-r1.ebuild b/net-misc/tsclient/tsclient-2.0.1-r1.ebuild index f370d253545c..d2a1b1ec5d51 100644 --- a/net-misc/tsclient/tsclient-2.0.1-r1.ebuild +++ b/net-misc/tsclient/tsclient-2.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-2.0.1-r1.ebuild,v 1.4 2012/05/05 03:20:44 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-2.0.1-r1.ebuild,v 1.5 2012/06/25 00:38:39 tetromino Exp $ EAPI=2 @@ -38,7 +38,8 @@ src_prepare() { # Fix .desktop file as per upstream changes, bug #351386 epatch "${FILESDIR}"/${P}-no-networkmanager.patch \ "${FILESDIR}"/${P}-libnotify-0.7.patch \ - "${FILESDIR}"/${P}-desktop-file.patch + "${FILESDIR}"/${P}-desktop-file.patch \ + "${FILESDIR}"/${P}-glib-2.32.patch # For recent libgnomeui sed -i -e 's:libgnome-2\.0:\0 libgnomeui-2\.0:' \ |