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 | d2e600fda2afc735cf504bbc3a35c90e5c0b530c (patch) | |
| tree | 0ff2c47cfaec6f88c8ccdc60f80e5662b7eeecde /dev-ml | |
| parent | remove unused versions (diff) | |
| download | historical-d2e600fda2afc735cf504bbc3a35c90e5c0b530c.tar.gz historical-d2e600fda2afc735cf504bbc3a35c90e5c0b530c.tar.bz2 historical-d2e600fda2afc735cf504bbc3a35c90e5c0b530c.zip | |
Import a patch from mandriva to build against tk8.5, thanks to Pacho Ramos in bug #212678
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/lablgl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ml/lablgl/Manifest | 11 | ||||
| -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 |
4 files changed, 31 insertions, 7 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/Manifest b/dev-ml/lablgl/Manifest index e9a03a1c581c..c5fc9074528d 100644 --- a/dev-ml/lablgl/Manifest +++ b/dev-ml/lablgl/Manifest @@ -2,16 +2,17 @@ Hash: SHA1 AUX lablgl-1.00-Makefile.config 371 RMD160 49001982571e098388740d7a4fbc2437647d1ae8 SHA1 59bc604ad8f4c1341c8fd2cbb910a99a5441babe SHA256 124d2887a3be76a38af2e427d8074561941dfe209129db692e844acf91f8b98e +AUX lablgl-1.03-tk8.5.patch 534 RMD160 af4527af9f0870c5a6c7b112d4ba0802fe121990 SHA1 22754c689cf7641d07aa8f98ca43b891b8316a2b SHA256 219d195d385c701601d04b9b5c74bd2caa3e2712c79982dc9b371df0b8eba8e8 DIST lablgl-1.00.tar.gz 390570 RMD160 b61fb3d7311becbf9be3f54256a3bec76481b615 SHA1 73da3b3673112e4cf130b3ee73c16268641862c8 SHA256 f52558487b545776f29658f2c2d12c58c3915760818a6acb9847cb3b0d060a71 DIST lablgl-1.03.tar.gz 389404 RMD160 b4214c2ca6e88d6dc6ebe09b1ca8c60cc5341e0c SHA1 f86de74e4f14d8a636fa87d9d4307ab35a214049 SHA256 f4dcb28cb11e9a0791ba4d35eb86d9dcb19d8d4d0f3171dd18ede4c8d5e002db EBUILD lablgl-1.00.ebuild 2240 RMD160 c835af0dcf830c14b332344ca6014a58d5603c7b SHA1 dca39f01f2187fa36ccf753c17c703882f35e536 SHA256 9ca8815ad99d7ca679325034acb74401191917367bb3296dc1aead6a354ca439 -EBUILD lablgl-1.03-r1.ebuild 2948 RMD160 5e00a02e7b54542be06028ab589cc24135820dc1 SHA1 2affa4abd43a907ca47192ddf106ae229ee00cb5 SHA256 c5b4a275a827a6e4852ae0ac4cf88b54339b14899e32b535434b40d4cbf63136 -MISC ChangeLog 6256 RMD160 551e0d65161480edcc310af30902324b910b852a SHA1 973bbcc9cb238a16b006165bd9333f8012daa8c2 SHA256 18a6ff107744a2974d1d95a135cce632ff24c976ff2e061605449e6a1751d55c +EBUILD lablgl-1.03-r1.ebuild 3029 RMD160 91b2936b3a5fe70569c6d785dac8d4160acf0c29 SHA1 de3d27d8bf7a577bd2de128444dd7cddfd919298 SHA256 d69810a011f60c112c912a0f47048901ecb496f34b512fe92f725f773fc1a96f +MISC ChangeLog 6460 RMD160 1afe54b655d552c1ae5335825aa91b0e99baa7b7 SHA1 0dfdcffbfe726b96d95807a81c1de97080762377 SHA256 771e11d772aa9230fcb31ce41e23f46e3ec9d0953eb6f87e5a490b5cf7e4e1fe MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHwZpGvFcC4BYPU0oRAokKAJ0e6uvWsbcKlYkQpuUV1D6vMbJPgACfeUcP -obMjQ8O1EvV0yfzd0y3PWIc= -=gmGK +iD8DBQFH09JjvFcC4BYPU0oRAjfaAJ48IAD71Jgba6eCETTe5NlFgla1BgCffUtS +Y+Xz1lzpXavM63jr60MZDLc= +=1RuQ -----END PGP SIGNATURE----- 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 |