diff options
Diffstat (limited to 'media-sound/audacity/files')
3 files changed, 30 insertions, 93 deletions
diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch deleted file mode 100644 index c9fdad5fbafd..000000000000 --- a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://github.com/audacity/audacity/issues/4489 -https://github.com/audacity/audacity/commit/a49d145ef5e3046273c879be0a21d48ecd4dcab7 -https://bugs.gentoo.org/899764 - ---- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h -+++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h -@@ -46,7 +46,8 @@ typedef uint64_t uintmax_t; - */ - #endif - --#include <stddef.h> -+#include <cstddef> -+#include <cstdint> - #include <string> - #include <iostream> - #include <sstream> -@@ -355,10 +356,6 @@ - typedef signed int SINT32; - typedef float FLOAT32; - typedef double FLOAT64; --// added by RBD --#ifdef __linux__ --#define intptr_t long --#endif - - // The default sampling rate. - const StkFloat SRATE = 44100.0; ---- a/src/effects/LoadEffects.cpp -+++ b/src/effects/LoadEffects.cpp -@@ -154,9 +154,9 @@ void BuiltinEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm) - if (rediscoverAll || - !pm.IsPluginRegistered(path, &pair.second->name.Msgid()) - ){ -- DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -+ DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID& - { -- const auto pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident); -+ const auto& pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident); - if(pair.second->excluded) - PluginManager::Get().EnablePlugin(pluginId, false); - return pluginId; ---- a/libraries/lib-module-manager/PluginHost.cpp -+++ b/libraries/lib-module-manager/PluginHost.cpp -@@ -37,11 +37,11 @@ namespace - TranslatableString errorMessage{}; - auto validator = provider->MakeValidator(); - auto numPlugins = provider->DiscoverPluginsAtPath( -- pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -+ pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID& - { - //Workaround: use DefaultRegistrationCallback to create all descriptors for us - //and then put a copy into result -- auto id = PluginManager::DefaultRegistrationCallback(provider, ident); -+ auto& id = PluginManager::DefaultRegistrationCallback(provider, ident); - if(const auto ptr = PluginManager::Get().GetPlugin(id)) - { - auto desc = *ptr; diff --git a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch deleted file mode 100644 index f84508a2c903..000000000000 --- a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/909201 -upstream fix: https://github.com/audacity/audacity/pull/4866 - ---- a/locale/be.po -+++ b/locale/be.po -@@ -3097,7 +3097,7 @@ - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "Памылка (магчыма, файл не запісаны): %hs" -+msgstr "Памылка (магчыма, файл не запісаны): %s" - - #: src/FileFormats.cpp - #, fuzzy ---- a/locale/fa.po -+++ b/locale/fa.po -@@ -3053,7 +3053,7 @@ - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs" -+msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s" - - #: src/FileFormats.cpp - msgid "&Copy uncompressed files into the project (safer)" ---- a/locale/fr.po -+++ b/locale/fr.po -@@ -3142,7 +3142,7 @@ - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %hs" -+msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %s" - - # trebmuh to check (accélérateur) - #: src/FileFormats.cpp diff --git a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch new file mode 100644 index 000000000000..f06799030b4b --- /dev/null +++ b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch @@ -0,0 +1,30 @@ +From 23f1df0b13c46cef746674434640588864f8c453 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Sun, 18 Feb 2024 23:16:28 +0300 +Subject: [PATCH] Fix compilation with audiocom + +Fix error `OAuthService.h: error: field mAccessToken has incomplete type +std::string {aka std::_cxx11::basic_string<char>}` + +See: https://bugs.gentoo.org/920363 + +Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com> +--- + libraries/lib-cloud-audiocom/OAuthService.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libraries/lib-cloud-audiocom/OAuthService.h b/libraries/lib-cloud-audiocom/OAuthService.h +index bd01f1656..18761df6d 100644 +--- a/libraries/lib-cloud-audiocom/OAuthService.h ++++ b/libraries/lib-cloud-audiocom/OAuthService.h +@@ -12,6 +12,7 @@ + + #include <chrono> + #include <functional> ++#include <string> + #include <string_view> + #include <mutex> + +-- +2.43.0 + |