Fix compile issues with fltk (bug #352867).

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 47 insertions, 4 deletions

diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index da1486833334..694036d230ae 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.33 2011/02/28 18:07:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.34 2011/03/10 09:21:10 radhermit Exp $
+
+  10 Mar 2011; Tim Harder <radhermit@gentoo.org> mup-5.6.ebuild,
+  +files/mup-5.6-fltk-fixes.patch:
+  Fix compile issues with fltk (bug #352867).
 
   28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> mup-5.4.ebuild,
   mup-5.6.ebuild:
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 2c81e0e8e84a..fba843cc6129 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,8 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mup-5.4-Makefile.patch 9853 RMD160 11c9708a39dbd9ae49080fe3af7bd388ade7cb70 SHA1 a9d7fb3904708d6707c57b9c86200d186f2021b8 SHA256 3c8780b7abdd0dfcca4b1948054e9f1c685735f3aa9af4d2d83e20283f3206c8
 AUX mup-5.6-Makefile.patch 11140 RMD160 d5958ab4b496b47e7a9e999e70a4d9100725fdf1 SHA1 99d529bf0e13ce7c6b3a6012e026cda0a3821b6a SHA256 d72e6453f2c761cd576d284732681ca08bd15c39cf2eeb5bc69ef71fb520e6e4
+AUX mup-5.6-fltk-fixes.patch 811 RMD160 9c808fbb5b54f9f9c0be5cc28355005dc937f2ba SHA1 5d293e7908ee77450450101b19b044afd917210b SHA256 929e95bf539270a37cbd1aaa62970294b94ac875a4ecd65747c8420010bf8a41
 DIST mup54src.tar.gz 1705171 RMD160 27687208fe59bf41c208cc8a54ff9ed149a4a748 SHA1 70864d8bf935fe3bf24bec7a922a7ea2b3c74ee7 SHA256 a29b6b4a1294b8b52e3f265d980c6a16e5a90cc233e8b4254131159e78216ec0
 DIST mup56src.tar.gz 1845464 RMD160 01983c6d13a5d352f7da5c2ac77c627a10d99f26 SHA1 fe16153c364427f3a78700a95d343c5c82c30703 SHA256 2751be81131b155e01d770c5c6c8b5507748eeb21ea8b2dd7dba321ffd8fb1b6
 EBUILD mup-5.4.ebuild 1063 RMD160 cc6ed59e734cf6d835a26a45bb5f203ae497f718 SHA1 231b277f1fd20bad98ee33a3835c514c2fe54453 SHA256 66b1f07ced30769f043096efba6bba6b16df8d7723ec81b649e820d5fce93c4c
-EBUILD mup-5.6.ebuild 1066 RMD160 4d53e0befd7145f13b485041545e58c79f7a623e SHA1 cae401774e88ae95c58dc07ce6d84eab7830ba4e SHA256 343c536bf09dac906902ef4655257c8a6e2a44c073f7e68068728ac119a2ac18
-MISC ChangeLog 4084 RMD160 32a69be6081b75ca9cdc5c1d42fefaa7266828c3 SHA1 f5e2ec3b65dc482a86512f19fb3103634e083a79 SHA256 334f5d60751eb3958524a4d56ca67ac7b70cd103175bc0a2dc3bd615787b48c9
+EBUILD mup-5.6.ebuild 1110 RMD160 703753f4506828263672a0afe440d1802fca785c SHA1 2d9c4fc19239779ac165c7bedf29b3a007f5c4b2 SHA256 77729b3b82d9886c7e3cde160e2a319e21b353c8f3e090a7a5320bafed1071c8
+MISC ChangeLog 4231 RMD160 507ce7b83381c730f9b6559acf2433d03368a84c SHA1 56296ba6d84b2d56d7cb77919fe6709b1bee07c6 SHA256 81d298df4ef0cf2afb0a36403d1f31a116211ad84ecf9a7223b9f18e902a35b7
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNeJgOAAoJEEqz6FtPBkyjQcIH/0tbEz5hHTsuTvuL9IPo6V22
+A5ZD2S/KoefvDzAKsl0wwTUQaRIpweZwwKF8V9hVJxfR5ZEnFv2d0eEQ5oNEfPl+
+/ZGKeLuthYEMPZmeMy15qD1/2wzW3ML/CapumeOCQc0ntgtEaIbaoRys5WWD02Ld
+7havQLaYL9PkQRh+bQhPbbaOsZSPYYhmnGfgapLthQcvY9/PgERAqG6gD90VH5DR
+eiwa5DOSMlFV1Dco0bdiuE/+0Gx3LEPyUkMXCVyi5j1qNtPXev5xcS0OxFpgxSWH
+aRvhd3tdmSIAqQvEUtwOPC1ihHR/tx9DlNJ/USX5C3ut5yb9S9PuUkfJNxc3+TA=
+=y4RC
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mup/files/mup-5.6-fltk-fixes.patch b/media-sound/mup/files/mup-5.6-fltk-fixes.patch
new file mode 100644
index 000000000000..e4429c3679bf
--- /dev/null
+++ b/media-sound/mup/files/mup-5.6-fltk-fixes.patch
@@ -0,0 +1,23 @@
+--- mup-5.6.orig/mupmate/Config.C
++++ mup-5.6/mupmate/Config.C
+@@ -264,7 +264,7 @@
+ //-----------------------------------------------------------------
+ 
+ // List of standard FLTK fonts, and info to map name to menu entry.
+-static struct Font {
++static struct FlFont {
+ 	const char * name;
+ 	Fl_Font	value;
+ 	int menu_offset;
+--- mup-5.6.orig/mupmate/Edit.C
++++ mup-5.6/mupmate/Edit.C
+@@ -201,8 +201,7 @@
+ 	// a previous Replace/Find Next
+ 	int start, end, isRect, rectStart, rectEnd;
+ 	bool at_pattern = false;
+-	if (editor_p->buffer()->highlight_position(&start, &end, &isRect,
+-						&rectStart, &rectEnd)) {
++	if (editor_p->buffer()->highlight_position(&start, &end)) {
+ 		int place = editor_p->insert_position();
+ 		if (place == end && (end - start == pattern_p->size())) {
+ 			if (casematch_p->value()) {
diff --git a/media-sound/mup/mup-5.6.ebuild b/media-sound/mup/mup-5.6.ebuild
index ca3cbc67e3af..4106c175e5b9 100644
--- a/media-sound/mup/mup-5.6.ebuild
+++ b/media-sound/mup/mup-5.6.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/media-sound/mup/mup-5.6.ebuild,v 1.2 2011/02/28 18:07:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.6.ebuild,v 1.3 2011/03/10 09:21:10 radhermit Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-fltk-fixes.patch
 	sed -i -e "s:/lib:/$(get_libdir):g" Makefile || die "sed failed"
 }