Fix build without fltk, bug #437018

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 37 insertions, 7 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index 5d6cac81c6d6..43e58dd58781 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/zynaddsubfx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.42 2012/07/25 09:08:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.43 2012/11/27 11:49:11 aballier Exp $
+
+  27 Nov 2012; Alexis Ballier <aballier@gentoo.org> zynaddsubfx-2.4.3.ebuild,
+  +files/zynaddsubfx-2.4.3-nofltk.patch:
+  Fix build without fltk, bug #437018
 
 *zynaddsubfx-2.4.3 (25 Jul 2012)
 
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index e5f748e5faf3..33e412811d84 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -4,18 +4,19 @@ Hash: SHA256
 AUX zynaddsubfx-2.4.1-docs.patch 420 SHA256 379c61a8f911d4794f3369f5b12b46142b46fb771d2cd2877e220c33e6891ec2 SHA512 541da21e9b1e86da83a9d369f86efcdcac4fc49c9b0158182c42dbf49287e5eb59e466443be2cf7ce87c1daca85ccc141e0fa5f288839ee6fe2da4e7cd978157 WHIRLPOOL 67e128af2a008a0db6436c7f9c2792d50af679c0a1ddae9f457f62576587bdf9f6b3a644d82142a6860775abf3866527b11c1723b6c57c8c72394fa7d895f7bb
 AUX zynaddsubfx-2.4.1-fltk.patch 1492 SHA256 b4fab50f4fd3f91d655e9c613973b2a50750b73577044301cf6b7017d0714c47 SHA512 03cafdc4aafa8956d4b143fe3726f3187f0372c7b5e93d1acd26692c3a506d141ce8015aa96e9786576e89e5f0e6318e8505492095c9dbbefb5922e0d3d04b3d WHIRLPOOL 6bdd127d9c3e485223f2f8985b33acd5e6d45b0c92e9d51787e881bcf189c1453f3f67aadb79e307ce6533a3198119f3e8d3c4a5fe142fbd7fb9dac139b2d384
 AUX zynaddsubfx-2.4.1-fltk13.patch 1978 SHA256 34b328ae07ec901e0508914ae76f0b9b38cb0cf2e12afed585900eaee7048d22 SHA512 7fc4ddf564035b88ec7c9100eb1b29c0011a6b567c141d25861db1c1a76ab931d5dc6a704d9300d78ae524b00a05eca61612e1ea05f284026524b56af799ccdf WHIRLPOOL 91ab050f379fb7724c49486e0da31d70e72806e690b873f06201a7ce1be7b67f526846d0b1b73c3e70447fd60c10760f4f6494c724c484f9b785118bc0806b72
+AUX zynaddsubfx-2.4.3-nofltk.patch 487 SHA256 8428e1214a257a03ec6cdb3aa702d2ff55ad055c6ed59f4432ecb416af107528 SHA512 c0ecfc942eb3e3ceced6fffbd05f764fc4ded5e16eb74510b327c0c7ac7641d5a33cf219a1c111c6a2a48ce327a075dbe2f4f9768a0e67f260db9c2334328d9e WHIRLPOOL 97e7fae25a218cbb83c50bee855b6b7e10245a6ef7e92fbc28986492ca6eb27c4e84e64bb77cc22569c07b75032b3fc8435e4480e6f50d89e20068abb3348ac2
 DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 SHA256 cf796e23c1f268307373dca3d0dacaf80a19d813da4bd290742b6773e0a3c5fe
 DIST ZynAddSubFX-2.4.2.tar.bz2 2447485 SHA256 7d43bfece3b02625528dab7139e0fbada5768ac2722df137794b157602f8e802 SHA512 558389a62d121242ae8d3f2e9501082a64ef9e2f4540873d4baaaa82bac7113e2941d5119268bbfee375953d0fe8a8d91006f06998de4035705588e9c56b56d7 WHIRLPOOL bdec8e7a05db9b20948e2537cb644836093148a3438db67097e523acd64ee85c86ad6c978c821e840fc4096b380e325609d6d330e3f0e4d61fedc2c0d757876a
 DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
 EBUILD zynaddsubfx-2.4.1.ebuild 1762 SHA256 836d2580c8b6efb4558b5f3d4df096b7ff3f2bd72652d701e4bcb4183197efa7 SHA512 8dacaac459ecca5c1e290d91c00dbe06d929ffdee736b8e2cf0c4b502d2ae1d5c71d987359998f0137b96e8b806f58c5b82bf59f5649d10a2d02c96756c35185 WHIRLPOOL a2032a2e8b33bb6db93c93aac44c91f9f4a98fd5ab7d8abb632279e7c66da54a2c133a2e4b0649b1cb7a461f637a0b624892306bb50a8c26c0482c78d647d034
 EBUILD zynaddsubfx-2.4.2.ebuild 1707 SHA256 ec35306f626302368d61dfb96aa782fc391db333cf4269e2ad7d425b800b53b6 SHA512 a094bd19042f29c4192636070f6e7434a50d5f54998edfc14e9cac3c5ed62b3fd384e69215e014ffb796c58fd6c341bc6b0f972b6448b71f96136d22a2557ca2 WHIRLPOOL 68f6b9cf500d8c06c8720c3a8674dd6c2f6f455e9f7e629e1f1d549086eb9ef220856484223ff28888b4207a6827fc5230021672da353e9772aba85acf96a7c0
-EBUILD zynaddsubfx-2.4.3.ebuild 1701 SHA256 7d5f971c0b748c377d08bf8a3f13d7358fa065bbd91ae75b78e7608db7ad62bd SHA512 7cb7842162c490d8e7d92890b2e255e1135ee3e80cb7dcb9d61afae0fa42aa51f3ccaa0c3752c1ff3733874f138f1abb860e0e4c1fafef7cbefae45d99a30493 WHIRLPOOL 544e58c6d956e626bc432abff3fee6c0cd94b6f58e28aa76f5ee787c205be64dd88d1a38fe93322bc5f3c1c5b3586499574e3ecb904126368ae9f771a10a0151
-MISC ChangeLog 7420 SHA256 892c183dfc38f9b5c751ef64bafc83225eabed06b315bc9ffc63e9b60dd3f7c7 SHA512 99bd6e632d81ea968608ed44cbaa5405ee278bf3118def1886ea40f58d567367ac2cd616174559f8f5d90a3bd19a86188e3e860e0072ad352e010fb7f0a33a8f WHIRLPOOL f21c4c1e7643bad946472ee904563bcf974b917a14bcae2f86d98e29cdb00b0b66e46d2965d53270b0870315d1f5a70b9a0e1838f2a944d10951946e25588dc0
+EBUILD zynaddsubfx-2.4.3.ebuild 1741 SHA256 35e86a8cdf3b272764c49543de8bfa679d34445e98474b585a5ed31e70dbc3f5 SHA512 0e37488727c83da922a85728f7d60dc59dea53a63eaa3d620c1c03f51fc483da675c5f3e5a8555f9a517d17d90864cf846ae9e89b67b7b2e78009a6154113efd WHIRLPOOL 0c8936810311aadc9b5808d75567e582e249638cffeef5d6bb98f8b3cca84edfe47caf703df555c2a37a73de11194f2f01214ee61750ff7875691ad5244921a3
+MISC ChangeLog 7578 SHA256 f82e4afd8fe0ef3ee9f9bb67e1cc7ea3b4ea716b56eb9287dea9a956e78cc6b5 SHA512 7a9c7c130695fa60f5af19f806e050101e0f3e52e8f4817582b0d9984d093fb103588ddb769e045862668d88d905323e6397075d5b975e314edd27d7e6be2de0 WHIRLPOOL 2b7f63ba7722752e85030e845349ccc46374bca1dadc7721ffbacd851c772850de606db97ae4d0dbc21b230f91e7f64496adf5585a07a6b9a0e2518174039742
 MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAPt5sACgkQvFcC4BYPU0pKfACdFZ+iZQ+/XlU7fgwEXcac6gqF
-iAsAoIUaZq0/byfQnNt12XnhPwDjPXAL
-=UvrS
+iEYEAREIAAYFAlC0qLgACgkQvFcC4BYPU0oGdQCeN9Q6/sCD0yBkJ04ZtOuK2K4O
+1AgAn1IFksqOOZ1X9eu66ElMw8yvB+5Q
+=2whz
 -----END PGP SIGNATURE-----
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
new file mode 100644
index 000000000000..c20828328f26
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=437018
+
+Index: ZynAddSubFX-2.4.3/src/main.cpp
+===================================================================
+--- ZynAddSubFX-2.4.3.orig/src/main.cpp
++++ ZynAddSubFX-2.4.3/src/main.cpp
+@@ -37,8 +37,6 @@
+ #include "Misc/Dump.h"
+ extern Dump dump;
+ 
+-#include <FL/Fl.H>
+-
+ //Nio System
+ #include "Nio/Nio.h"
+ 
+@@ -51,6 +49,8 @@ QApplication *app;
+ 
+ #elif defined FLTK_GUI
+ 
++#include <FL/Fl.H>
++
+ #include "UI/MasterUI.h"
+ #endif // FLTK_GUI
+ 
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
index 2e3885c94981..8f57aec7ecd0 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.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/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild,v 1.1 2012/07/25 09:08:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild,v 1.2 2012/11/27 11:49:11 aballier Exp $
 
 EAPI=4
 inherit eutils cmake-utils
@@ -34,6 +34,7 @@ S=${WORKDIR}/${MY_P}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.1-docs.patch
+	"${FILESDIR}"/${PN}-2.4.3-nofltk.patch
 )
 
 DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"