diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-03-09 12:04:45 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-03-09 12:04:45 +0000 |
| commit | 156f023df5208468e8d8ed58361b1aa2e99f0a0f (patch) | |
| tree | 8d35acde836ceb8ffbd7947261c699e623419c42 /dev-ml | |
| parent | remove unused versions (diff) | |
| download | gentoo-2-156f023df5208468e8d8ed58361b1aa2e99f0a0f.tar.gz gentoo-2-156f023df5208468e8d8ed58361b1aa2e99f0a0f.tar.bz2 gentoo-2-156f023df5208468e8d8ed58361b1aa2e99f0a0f.zip | |
Import a patch from mandriva to build against tk8.5, thanks to Pacho Ramos in bug #212678
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/lablgl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ml/lablgl/files/lablgl-1.03-tk8.5.patch | 12 | ||||
| -rw-r--r-- | dev-ml/lablgl/lablgl-1.03-r1.ebuild | 8 |
3 files changed, 25 insertions, 2 deletions
diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog index 8522f016295c..eaa1e1fa0c72 100644 --- a/dev-ml/lablgl/ChangeLog +++ b/dev-ml/lablgl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ml/lablgl # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.44 2008/02/24 16:24:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.45 2008/03/09 12:04:44 aballier Exp $ + + 09 Mar 2008; Alexis Ballier <aballier@gentoo.org> + +files/lablgl-1.03-tk8.5.patch, lablgl-1.03-r1.ebuild: + Import a patch from mandriva to build against tk8.5, thanks to Pacho Ramos + in bug #212678 *lablgl-1.03-r1 (24 Feb 2008) diff --git a/dev-ml/lablgl/files/lablgl-1.03-tk8.5.patch b/dev-ml/lablgl/files/lablgl-1.03-tk8.5.patch new file mode 100644 index 000000000000..c5421a170fcf --- /dev/null +++ b/dev-ml/lablgl/files/lablgl-1.03-tk8.5.patch @@ -0,0 +1,12 @@ +diff -Naur --exclude '*~' lablgl-1.02/Togl/src/Togl/togl.c lablgl-1.02.tk8.5/Togl/src/Togl/togl.c +--- lablgl-1.02/Togl/src/Togl/togl.c 2004-11-02 08:03:34.000000000 +0100 ++++ lablgl-1.02.tk8.5/Togl/src/Togl/togl.c 2007-09-01 18:37:15.000000000 +0200 +@@ -148,6 +148,8 @@ + # include "tkInt8.3.h" + #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 + # include "tkInt8.4.h" ++#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==5 ++# include "tkInt8.4.h" + #else + Sorry, you will have to edit togl.c to include the right tkInt.h file + #endif diff --git a/dev-ml/lablgl/lablgl-1.03-r1.ebuild b/dev-ml/lablgl/lablgl-1.03-r1.ebuild index ae17978691e6..b71aa644319b 100644 --- a/dev-ml/lablgl/lablgl-1.03-r1.ebuild +++ b/dev-ml/lablgl/lablgl-1.03-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03-r1.ebuild,v 1.1 2008/02/24 16:24:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03-r1.ebuild,v 1.2 2008/03/09 12:04:44 aballier Exp $ inherit multilib eutils toolchain-funcs @@ -43,6 +43,12 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-tk8.5.patch" +} + src_compile() { # make configuration file echo "BINDIR=/usr/bin" > Makefile.config |