diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2011-04-20 15:28:29 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2011-04-20 15:28:29 +0000 |
commit | 6d884fb2eb6ed459d372b03420af77a6653eeb7c (patch) | |
tree | 87267f66c630753c03d62e86eb06258013c85c13 /gnustep-libs/cddb | |
parent | fix build after the big libav* version bump, backported by Luca Barbato, bug ... (diff) | |
download | historical-6d884fb2eb6ed459d372b03420af77a6653eeb7c.tar.gz historical-6d884fb2eb6ed459d372b03420af77a6653eeb7c.tar.bz2 historical-6d884fb2eb6ed459d372b03420af77a6653eeb7c.zip |
Fix compilation (use of bool keyword as variable name)
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'gnustep-libs/cddb')
-rw-r--r-- | gnustep-libs/cddb/ChangeLog | 6 | ||||
-rw-r--r-- | gnustep-libs/cddb/Manifest | 13 | ||||
-rw-r--r-- | gnustep-libs/cddb/cddb-0.2.ebuild | 3 | ||||
-rw-r--r-- | gnustep-libs/cddb/files/cddb-0.2-bool.patch | 57 |
4 files changed, 71 insertions, 8 deletions
diff --git a/gnustep-libs/cddb/ChangeLog b/gnustep-libs/cddb/ChangeLog index 33b3cedb03d1..12f7c263a5a5 100644 --- a/gnustep-libs/cddb/ChangeLog +++ b/gnustep-libs/cddb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnustep-libs/cddb # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cddb/ChangeLog,v 1.3 2011/04/10 18:21:07 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cddb/ChangeLog,v 1.4 2011/04/20 15:28:29 voyageur Exp $ + + 20 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org> cddb-0.2.ebuild, + +files/cddb-0.2-bool.patch: + Fix compilation (use of bool keyword as variable name) 10 Apr 2011; Christian Faulhammer <fauli@gentoo.org> cddb-0.2.ebuild: stable x86, bug 356967 diff --git a/gnustep-libs/cddb/Manifest b/gnustep-libs/cddb/Manifest index 65b3616ea1d0..c510deb264d1 100644 --- a/gnustep-libs/cddb/Manifest +++ b/gnustep-libs/cddb/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX cddb-0.2-bool.patch 2150 RMD160 9adc5cdd1872822d79fe1a767849f46eadd626e4 SHA1 7c8f5c724ab3beff01a9d2189b5696497cdd81d9 SHA256 a46e9b7d9b74aa5b792c38b0bf7d588e87d12647b0dc073ccd2e9f88032e5cda AUX cddb-0.2-gnustep-make-2.patch 402 RMD160 065ad9df7da527362c7ef6b6cbc083a36e5b7608 SHA1 9f181a7ea227fbcaef3c7e16550c7ecc5960efe0 SHA256 aa068ca53dc7a5ceaca028e10e33f9b98bae1ffd73d419ddf6c463dbbcb81e22 DIST cddb.bundle-0.2.tar.gz 16936 RMD160 2de6c627b64dd644ba7612159b86fae83a79e6df SHA1 d1401dd70587ff0cdebe88098dd38eb3bd218e29 SHA256 35801712b61d39d76a044cbcc30c727a31b3cffc0a3531b8a69e130bc07a051e -EBUILD cddb-0.2.ebuild 547 RMD160 6f4c94d394054760432e30159cfb3d3415b2e224 SHA1 c285b87ee0a8f15fed74b503164d6c8265e48812 SHA256 771f479b0cd9d7b17a9d0b071ba89a0905658d917b82f0f799b1d68c4e15799d -MISC ChangeLog 601 RMD160 01ec2bd11fe5c7a270075d1e38e6ff344975fa0d SHA1 a6ffa4f322bceb141da0a9e475777d07761b752b SHA256 3b373ad3081f8ee3e91f8b45881cb35f32288fa9832183ee2abcbb0e24ee629c +EBUILD cddb-0.2.ebuild 588 RMD160 9706b69a0ac50006e8d0a0eff360fe979dfb377c SHA1 fc1e53e6140b671f47a8e0bb709e55241a19cabb SHA256 9dd318eef4789b724e0d3ed6daf24b6bfde9277782202c7629434e69a5b42be2 +MISC ChangeLog 764 RMD160 2ac899747a7856542452a93f429c217bab12b56d SHA1 92f07d2909a9cb7261feac3f1e60f9aee47af31b SHA256 34e10bfad6e10cc513a3792b99feaa41660e08b6d8fed8b23b88c1c68d04c8c7 MISC metadata.xml 227 RMD160 baab4b9b2cace229b130c5b3ace12c3b9f9598e8 SHA1 19518061de03d505e5332be80e20f7695e84eb9a SHA256 614ba9ec6a6d96730b450041400d6e6bd0067e0d59e7c85a148ed6d02b76d0c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2h9SUACgkQNQqtfCuFneOhswCfWrFllpRFSL5gbosy3TtGdaSd -jjgAn3x4aYwWvXrIESk9DucVc4hW7u7A -=IfX7 +iF4EAREIAAYFAk2u+68ACgkQFYEBGcdFJfJxIwEAoyVTeB2qJVm4eoZqHmn/9unS +WAamfUm18FBGCAzkWI8A/3da6I5uVAiK414v+kW+u1DVoFgYBAS9vAKMk50JIKui +=e+b3 -----END PGP SIGNATURE----- diff --git a/gnustep-libs/cddb/cddb-0.2.ebuild b/gnustep-libs/cddb/cddb-0.2.ebuild index 30f70b1f4b9a..dfd28ff6acdc 100644 --- a/gnustep-libs/cddb/cddb-0.2.ebuild +++ b/gnustep-libs/cddb/cddb-0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cddb/cddb-0.2.ebuild,v 1.3 2011/04/10 18:21:07 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cddb/cddb-0.2.ebuild,v 1.4 2011/04/20 15:28:29 voyageur Exp $ inherit gnustep-2 @@ -20,4 +20,5 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-gnustep-make-2.patch + epatch "${FILESDIR}"/${P}-bool.patch } diff --git a/gnustep-libs/cddb/files/cddb-0.2-bool.patch b/gnustep-libs/cddb/files/cddb-0.2-bool.patch new file mode 100644 index 000000000000..4b3407f789e5 --- /dev/null +++ b/gnustep-libs/cddb/files/cddb-0.2-bool.patch @@ -0,0 +1,57 @@ +diff -Naur cddb.bundle.orig/Cddb/Cddb.h cddb.bundle/Cddb/Cddb.h +--- cddb.bundle.orig/Cddb/Cddb.h 2002-10-15 16:32:13.000000000 +0200 ++++ cddb.bundle/Cddb/Cddb.h 2011-04-20 17:13:48.209532185 +0200 +@@ -54,8 +54,7 @@ + * The number of object in NSArray are the number of tracks. + * The keys of NSDictionary are "length" and "offset". + */ +-- (NSString *) discidWithCDTracks: (NSArray *) tracks +- locally: (BOOL) bool; ++- (NSString *) discidWithCDTracks: (NSArray *) tracks locally: (BOOL) boolean; + + /* Return the query using a NSArray of NSDictionary. + * The number of object in NSArray are the number of tracks. +@@ -75,9 +74,7 @@ + * NSString, "extdata" (extra data about this album) + * NSArray, "exttitles" (extra-title of each track) + */ +-- (NSDictionary *) readWithCategory: (NSString *) category +- discid: (NSString *) discid +- postProcess: (BOOL) bool; ++- (NSDictionary *) readWithCategory: (NSString *) category discid: (NSString *) discid postProcess: (BOOL) boolean; + + /* Low-level methods */ + /* Input format: +diff -Naur cddb.bundle.orig/Cddb/Cddb.m cddb.bundle/Cddb/Cddb.m +--- cddb.bundle.orig/Cddb/Cddb.m 2002-10-17 15:17:01.000000000 +0200 ++++ cddb.bundle/Cddb/Cddb.m 2011-04-20 17:14:08.737891180 +0200 +@@ -44,7 +44,7 @@ + + + - (NSString *) discidWithCDTracks: (NSArray *) tracks +- locally: (BOOL) bool ++ locally: (BOOL) boolean + { + NSMutableString *string = [NSMutableString new]; + int i = 0, numtracks = 0; +@@ -72,7 +72,7 @@ + + [string appendFormat: @" %d", totaltime]; + +- if (bool == YES) // Calculate locally ++ if (boolean == YES) // Calculate locally + { + RELEASE(string); + RELEASE(tracks); +@@ -123,9 +123,9 @@ + + - (NSDictionary *) readWithCategory: (NSString *) category + discid: (NSString *) discid +- postProcess: (BOOL) bool ++ postProcess: (BOOL) boolean + { +- if (bool == NO) ++ if (boolean == NO) + return [self read: [NSString stringWithFormat: @"%@ %@", category, discid]]; + else + { |