diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-03-15 12:10:25 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-03-15 12:10:25 +0000 |
| commit | 1cfab6dae342935d8634065d3089b731b125de1d (patch) | |
| tree | 03cbf895fadaf257610c6a3b11cb0e73f62a21cc /net-misc/x2goclient | |
| parent | Bump to 1.17.14, thanks to slepnoga. Bug #408045 (diff) | |
| download | gentoo-2-1cfab6dae342935d8634065d3089b731b125de1d.tar.gz gentoo-2-1cfab6dae342935d8634065d3089b731b125de1d.tar.bz2 gentoo-2-1cfab6dae342935d8634065d3089b731b125de1d.zip | |
Support both cups 1.4 and 1.5, reported by luis in bug #408105
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/x2goclient')
| -rw-r--r-- | net-misc/x2goclient/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/x2goclient/files/x2goclient-3.0.1.18-cups1.5.patch | 10 | ||||
| -rw-r--r-- | net-misc/x2goclient/x2goclient-3.0.1.18.ebuild | 4 |
3 files changed, 17 insertions, 3 deletions
diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog index 42df08e45b99..6afb71dafd71 100644 --- a/net-misc/x2goclient/ChangeLog +++ b/net-misc/x2goclient/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/x2goclient # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.7 2012/03/14 22:27:01 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.8 2012/03/15 12:10:25 voyageur Exp $ + + 15 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> + x2goclient-3.0.1.18.ebuild, +files/x2goclient-3.0.1.18-cups1.5.patch: + Support both cups 1.4 and 1.5, reported by luis in bug #408105 *x2goclient-3.0.1.18 (14 Mar 2012) diff --git a/net-misc/x2goclient/files/x2goclient-3.0.1.18-cups1.5.patch b/net-misc/x2goclient/files/x2goclient-3.0.1.18-cups1.5.patch new file mode 100644 index 000000000000..16d53fc9e132 --- /dev/null +++ b/net-misc/x2goclient/files/x2goclient-3.0.1.18-cups1.5.patch @@ -0,0 +1,10 @@ +--- cupsprint.h.orig 2012-03-15 11:43:34.426485061 +0100 ++++ cupsprint.h 2012-03-15 11:43:52.533812925 +0100 +@@ -15,6 +15,7 @@ + #ifndef Q_OS_WIN + #include <QStringList> + #include <cups/cups.h> ++#include <cups/ppd.h> + /** + @author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + */ diff --git a/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild b/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild index 9a22de2b16e5..4bb7db519481 100644 --- a/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild +++ b/net-misc/x2goclient/x2goclient-3.0.1.18.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/x2goclient/x2goclient-3.0.1.18.ebuild,v 1.1 2012/03/14 22:27:01 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild,v 1.2 2012/03/15 12:10:25 voyageur Exp $ EAPI=4 inherit qt4-r2 @@ -28,7 +28,7 @@ S=${WORKDIR}/${P/-/_} src_prepare() { # qmake looks for these files in the main directory mv x2goclient/* . && rmdir x2goclient || die - sed -e "s#cups/cups.h#cups/ppd.h#" -i cupsprint.h || die + epatch "${FILESDIR}"/${P}-cups1.5.patch if ! use ldap; then sed -e "s/-lldap//" -i x2goclient.pro || die sed -e "s/#define USELDAP//" -i x2goclientconfig.h || die |