gentoo auto-resync : 27:12:2024 - 06:30:34

4 files changed, 25 insertions, 3 deletions

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 33592cd96d39..a54c1a6a53b7 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -3,10 +3,11 @@ AUX zyn-fusion-ui-3.0.6-libzest_location.patch 406 BLAKE2B 3e9fbe0b1de034b0a4520
 AUX zyn-fusion-ui-3.0.6-makefile_find.patch 4224 BLAKE2B 9f0c2dd1b22e2a15cec4ab1fa7b0bcce27e9f51de2b6ae76f4edf3c452eb73023407810e93b2d7c86e2a6bd9d40db212a7396f11b2cc07879f56d70ab52e7edd SHA512 50104b01593c7e726cbd3964be393017a1721dd4e10818db416da780413933051dba13f2b87e82045583a7fb5990e35098708f4ada0545292e0707f75457f2b7
 AUX zyn-fusion-ui-3.0.6-system_wide_location.patch 2027 BLAKE2B 94d9f41e0857db86f2fe9991adba31ada2e58f923f5edd2ece3237d1c44a606f3e6b145b0faaa206432dab1b5733bb2579ddb6bb2c69159483c91af33fa6da68 SHA512 b2a71f7a3d3616748037021091422ddc49d600aaed2bbd260ce49f4a2677a8a53f2884930251fbb792468fa0679bfd74168605a50508fd1c042a311a6bed9acd
 AUX zynaddsubfx-3.0.6-docs.patch 425 BLAKE2B ba34e77df73a889992965f6adb518259d0fd4acd2bbcd9e48f2fb5d199f3d301fef383ce6fe8a8c994b92e04c21e64ecf1c8c8a95bdecf422d70562ac54632af SHA512 a9de9608d9f4bed663411551edbd1facd4ef8dddcabc2d6a831fb2175d5826cdc0ea8fbfa016fc55bb2c357312e115c40043aecd55bcbf3cbc9eb613671c6d67
+AUX zynaddsubfx-3.0.6-fltk1.4.patch 582 BLAKE2B 90b9090ebc9e02981d61a4cd32c620569a0f3b3703f63de7a2eeea0b1191606ef7d4564e1ecc26670bf8293294d2d0f1e8f72d17e1d3b62efb1598041677732d SHA512 9e32994c6e1dabc8b4feb9cda0ee18f797264aa0729763e40ef20460d7048c0d15220776916f12d1fecbb1e9814d9fe89c844a488c13232d305b97a3dc997bf6
 AUX zynaddsubfx-3.0.6-libzest_location.patch 446 BLAKE2B 68425cda772935e71d06977fa3e4e5a60411a0069316848698be957614d3ec681a74ae2ef894b3575bdc737fd19555e238e18d4cbffbb9720ca78b2521ccdb74 SHA512 4d5891c0e84a1570e5d861beb1ba72f9920871660226587f23c14cf4657cfcd466eda222fa73d5bc6cc7151ef0aef159784a2eb3c52ca0598cd9829bffd0a030
 AUX zynaddsubfx-3.0.6-stdint.patch 2758 BLAKE2B cbf55ba32bdcd7a0af06a418fdb6d1c0caaf8b806382d41bb4946a6d68ab89f878c40a30fb5a2f89b42118653658e7721f7fbd14f62172253aff6d282d2494e2 SHA512 8aca66bc2ee3d886d8b3741dbbf67f1b90804a7b87a3a2858a4134f3104a5ab374e3823afc4e07f5deb02c193474f7e00b536c9c87b2fe897c1db6ffd4bdbe66
 DIST zyn-fusion-ui-src-3.0.6.tar.bz2 5266884 BLAKE2B d9715c319bfd313792f550e12a47939dec665eda6ef395f8bb7a175b11f0922a4037428f99dc95fe749c40074ce8976fa9d257b6bc1e8f1feb63ca943c3bdd76 SHA512 7f195cf6a193376160441863d725383640bc75ad0c21b8ef7786da67a42fe014be103e3c3d9c29c83ffc3d78b9e11a4031a6b3922d457a336d184228c16077cd
 DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
-EBUILD zynaddsubfx-3.0.6-r3.ebuild 2067 BLAKE2B 0868d33b6d518f5920794a355adac04e634ee4615f1330fa35fe8f35d91ac18f1a3b6515747a3a981ba4fb56f44cbfead87ae971e25a6b8aec1da4f0c468ece9 SHA512 a3c62400ecce2540181a98ee17fcbf27b24514c5383b6243cfe4d133ab1fb352d6a1ba017bd037470c3aef495877a328e479da1b9c661fa9100d12c6839fe748
-EBUILD zynaddsubfx-3.0.6-r4.ebuild 2752 BLAKE2B 9bb10e41712466a72aec84e16d1a906098d8cab17f5aad3327ff9ea9157de46f7898a150a70bb802c92732ff48f18a6334264e8c4c2b276453088014f6509549 SHA512 4830bb9f52ec9351a829c8185aa768e78daa448129274c73e4332439964e92dbd61967a9be3f332a1f9b5ae082d2d8a8006cfc4013cae3370a52455fd1d9c9dd
+EBUILD zynaddsubfx-3.0.6-r5.ebuild 2108 BLAKE2B f397965d0a336dd90fa0e5cfe114609c8102e78ffb51bccde6004473f998f27d25f2069e47a6f4ca94cdba68a5fd924d881b7757b543daae4dcab454fbeb70a0 SHA512 3441114b204811f85349854711b903bf624d979bd4e81de8228260fca135c1736446a774726516d7e10234ca20d3652e30fe49a30b0c44da96796c2f713c7295
+EBUILD zynaddsubfx-3.0.6-r6.ebuild 2752 BLAKE2B 9bb10e41712466a72aec84e16d1a906098d8cab17f5aad3327ff9ea9157de46f7898a150a70bb802c92732ff48f18a6334264e8c4c2b276453088014f6509549 SHA512 4830bb9f52ec9351a829c8185aa768e78daa448129274c73e4332439964e92dbd61967a9be3f332a1f9b5ae082d2d8a8006cfc4013cae3370a52455fd1d9c9dd
 MISC metadata.xml 428 BLAKE2B 5a450f26afae683f0aa9ff386c87c37c3445b81240d4864fe90564f2c86913af772174cfeaeb82c29b4df0b92337d00f710d8779c9f3300865e7d20e6f9fc06c SHA512 53de61301fd080758dc195c67dfaf9ece5fba941988d17ca6edb7249e01a8804fe4e7edf961a4a0ec6891730dc6f6250e5cf7e91441061eb1e487be243c9b111
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch
new file mode 100644
index 000000000000..db1bd93ece30
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch
@@ -0,0 +1,20 @@
+MasterUI.cxx:2377:3: error: 'fl_open_display' was not declared ...
+
+Other files are using x.H, but that header is deprecated and the
+correct one is platform.H. fl_display that it alse needs platform.H
+for is X-specific, so this likely cannot work without fltk[X] at
+the moment.
+
+(next revision of the ebuild removes fltk, so it won't matter much)
+--- a/src/UI/MasterUI.fl
++++ b/src/UI/MasterUI.fl
+@@ -76,6 +76,9 @@
+ decl {\#include "common.H"} {public local
+ } 
+ 
++decl {\#include "FL/platform.H"} {public local
++} 
++
+ decl {\#if USE_NSM
+ \#include "NSM.H"
+ extern NSM_Client *nsm;
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild
index da2c1db9b0e1..5a6403763d41 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	doc? ( dev-texlive/texlive-fontutils )
 	dssi? ( media-libs/dssi )
 	fltk? (
-		x11-libs/fltk:1
+		x11-libs/fltk:1=[X(+)]
 		x11-libs/libX11
 		x11-libs/libXpm
 	)
@@ -42,6 +42,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-docs.patch
 	"${FILESDIR}"/${P}-stdint.patch
+	"${FILESDIR}"/${P}-fltk1.4.patch
 )
 
 DOCS=( AUTHORS.txt NEWS.txt README.adoc )
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild
index 0f9fbe9e9d5c..0f9fbe9e9d5c 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild