update to 26.1, removed old patches, and shortened git commits

5 files changed, 21 insertions, 171 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 196695ea6c07..9ce90e2ce301 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = giada
 	pkgdesc = A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians
-	pkgver = 0.26.0
-	pkgrel = 3
+	pkgver = 0.26.1
+	pkgrel = 1
 	url = https://www.giadamusic.com/
 	arch = x86_64
 	groups = pro-audio
@@ -38,15 +38,15 @@ pkgbase = giada
 	provides = giada
 	options = !buildflags
 	options = !makeflags
-	source = giada-0.26.0::git+https://github.com/monocasual/giada/#tag=0.26.0
-	source = git+https://github.com/juce-framework/JUCE.git#commit=69795dc8e589a9eb5df251b6dd994859bf7b3fab
-	source = git+https://github.com/steinbergmedia/vst3sdk.git#commit=ef0a70df2f82a3c218abaca0dbfbb66ae6c61025
-	source = git+https://github.com/monocasual/rtaudio.git#commit=8a362b1082ce17d3be1f47bd116839e40f189cf1
-	source = git+https://github.com/monocasual/geompp.git#commit=2b9edac100435d1ec1cf857f36605ca2f4f229ec
-	source = git+https://github.com/monocasual/mcl-audio-buffer.git#commit=d641e3e40219ea931e2a9945a1ef0aa2f54f4d2c
-	source = git+https://github.com/monocasual/mcl-atomic-swapper.git#commit=459d45df051408c8533483cd2b15aa309cef0767
-	source = git+https://github.com/fltk/fltk.git#commit=d9d474c59372a8b2b0829c400b5d0584129e3822
-	source = git+https://github.com/cameron314/concurrentqueue.git#commit=bf1fe24c8eb413494884dc151712a3ed526fc5a3
+	source = giada-0.26.1::git+https://github.com/monocasual/giada/#tag=0.26.1
+	source = git+https://github.com/juce-framework/JUCE.git#commit=69795dc
+	source = git+https://github.com/steinbergmedia/vst3sdk.git#commit=ef0a70d
+	source = git+https://github.com/monocasual/rtaudio.git#commit=8a362b1
+	source = git+https://github.com/monocasual/geompp.git#commit=dd75643
+	source = git+https://github.com/monocasual/mcl-audio-buffer.git#commit=d641e3e
+	source = git+https://github.com/monocasual/mcl-atomic-swapper.git#commit=459d45d
+	source = git+https://github.com/fltk/fltk.git#commit=06d1289
+	source = git+https://github.com/cameron314/concurrentqueue.git#commit=bf1fe24
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fe1b04bef1e7..6443e53d7b0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # NOTE: can currently not be built using devtools:
 # https://github.com/monocasual/giada/issues/553
 pkgname=giada
-pkgver=0.26.0
-pkgrel=3
+pkgver=0.26.1
+pkgrel=1
 pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
 arch=(x86_64)
 url="https://www.giadamusic.com/"
@@ -19,21 +19,21 @@ checkdepends=(catch2-v2)
 provides=(vst3-host giada)
 source=(
 "$pkgname-$pkgver::git+https://github.com/monocasual/giada/#tag=$pkgver"
-"git+https://github.com/juce-framework/JUCE.git#commit=69795dc8e589a9eb5df251b6dd994859bf7b3fab"
+"git+https://github.com/juce-framework/JUCE.git#commit=69795dc"
 
-"git+https://github.com/steinbergmedia/vst3sdk.git#commit=ef0a70df2f82a3c218abaca0dbfbb66ae6c61025"
+"git+https://github.com/steinbergmedia/vst3sdk.git#commit=ef0a70d"
 
-"git+https://github.com/monocasual/rtaudio.git#commit=8a362b1082ce17d3be1f47bd116839e40f189cf1"
+"git+https://github.com/monocasual/rtaudio.git#commit=8a362b1"
 
-"git+https://github.com/monocasual/geompp.git#commit=2b9edac100435d1ec1cf857f36605ca2f4f229ec"
+"git+https://github.com/monocasual/geompp.git#commit=dd75643"
 
-"git+https://github.com/monocasual/mcl-audio-buffer.git#commit=d641e3e40219ea931e2a9945a1ef0aa2f54f4d2c"
+"git+https://github.com/monocasual/mcl-audio-buffer.git#commit=d641e3e"
 
-"git+https://github.com/monocasual/mcl-atomic-swapper.git#commit=459d45df051408c8533483cd2b15aa309cef0767"
+"git+https://github.com/monocasual/mcl-atomic-swapper.git#commit=459d45d"
 
-"git+https://github.com/fltk/fltk.git#commit=d9d474c59372a8b2b0829c400b5d0584129e3822"
+"git+https://github.com/fltk/fltk.git#commit=06d1289"
 
-"git+https://github.com/cameron314/concurrentqueue.git#commit=bf1fe24c8eb413494884dc151712a3ed526fc5a3"
+"git+https://github.com/cameron314/concurrentqueue.git#commit=bf1fe24"
 )
 sha512sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
diff --git a/cstdint.patch b/cstdint.patch
deleted file mode 100644
index 7559a4a6e621..000000000000
--- a/cstdint.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur giada-0.25.0/src/core/const.h giada-0.25.0-new/src/core/const.h
---- giada-0.25.0/src/core/const.h	2023-07-04 02:32:41.265777772 -0400
-+++ giada-0.25.0-new/src/core/const.h	2023-07-04 01:40:33.684388828 -0400
-@@ -29,6 +29,7 @@
- 
- #include "deps/rtaudio/RtAudio.h"
- #include <RtMidi.h>
-+#include <cstdint>
- 
- /* -- environment ----------------------------------------------------------- */
- #if defined(_WIN32)
-diff -Naur giada-0.25.0/src/gui/elems/midiIO/midiLearner.h giada-0.25.0-new/src/gui/elems/midiIO/midiLearner.h
---- giada-0.25.0/src/gui/elems/midiIO/midiLearner.h	2023-07-04 01:19:39.580013546 -0400
-+++ giada-0.25.0-new/src/gui/elems/midiIO/midiLearner.h	2023-07-04 02:30:26.716527266 -0400
-@@ -30,7 +30,7 @@
- #include "gui/elems/basics/flex.h"
- #include <functional>
- #include <string>
--
-+#include <cstdint>
- namespace giada::v
- {
- class geBox;
diff --git a/fmt-gcc12.patch b/fmt-gcc12.patch
deleted file mode 100644
index c92da262f821..000000000000
--- a/fmt-gcc12.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 014a269b1cf8d1c7a751e76bb4e3d9a5160b013d Mon Sep 17 00:00:00 2001
-From: Orivej Desh <orivej@gmx.fr>
-Date: Wed, 29 Mar 2023 21:35:51 +0000
-Subject: [PATCH] Fix build with fmt 9, GCC 12
-
-fmt::format requires the non-static format argument to be wrapped with fmt::runtime check.
-
-Fixes #634
----
- src/gui/dialogs/about.cpp           | 2 +-
- src/gui/dialogs/sampleEditor.cpp    | 2 +-
- src/gui/elems/config/tabPlugins.cpp | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/gui/dialogs/about.cpp b/src/gui/dialogs/about.cpp
-index c2d77cf65..c7965d20a 100644
---- a/src/gui/dialogs/about.cpp
-+++ b/src/gui/dialogs/about.cpp
-@@ -62,7 +62,7 @@ gdAbout::gdAbout()
- 
- 			geBox* text = new geBox();
- 			text->align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_TOP);
--			text->copy_label(fmt::format(g_ui.getI18Text(LangMap::ABOUT_BODY),
-+			text->copy_label(fmt::format(fmt::runtime(g_ui.getI18Text(LangMap::ABOUT_BODY)),
- 			    G_VERSION_STR, debug ? "Debug" : "Release", BUILD_DATE)
- 			                     .c_str());
- 
-diff --git a/src/gui/dialogs/sampleEditor.cpp b/src/gui/dialogs/sampleEditor.cpp
-index e66e81cf5..4eddfdf4e 100644
---- a/src/gui/dialogs/sampleEditor.cpp
-+++ b/src/gui/dialogs/sampleEditor.cpp
-@@ -228,7 +228,7 @@ void gdSampleEditor::refresh()
- 
- void gdSampleEditor::updateInfo()
- {
--	std::string infoText = fmt::format(g_ui.getI18Text(LangMap::SAMPLEEDITOR_INFO),
-+	std::string infoText = fmt::format(fmt::runtime(g_ui.getI18Text(LangMap::SAMPLEEDITOR_INFO)),
- 	    m_data.wavePath, m_data.waveSize, m_data.waveDuration,
- 	    m_data.waveBits != 0 ? std::to_string(m_data.waveBits) : "?", m_data.waveRate);
- 
-diff --git a/src/gui/elems/config/tabPlugins.cpp b/src/gui/elems/config/tabPlugins.cpp
-index 1b95dc267..5484b5d08 100644
---- a/src/gui/elems/config/tabPlugins.cpp
-+++ b/src/gui/elems/config/tabPlugins.cpp
-@@ -89,7 +89,7 @@ geTabPlugins::geTabPlugins(geompp::Rect<int> bounds)
- 
- 	m_scanButton->onClick = [this]() {
- 		std::function<void(float)> callback = [this](float progress) {
--			std::string l = fmt::format(g_ui.getI18Text(LangMap::CONFIG_PLUGINS_SCANNING), static_cast<int>(progress * 100));
-+			std::string l = fmt::format(fmt::runtime(g_ui.getI18Text(LangMap::CONFIG_PLUGINS_SCANNING)), static_cast<int>(progress * 100));
- 			m_info->label(l.c_str());
- 			Fl::wait();
- 		};
-@@ -109,7 +109,7 @@ void geTabPlugins::rebuild()
- {
- 	m_data = c::config::getPluginData();
- 
--	const std::string scanLabel = fmt::format(g_ui.getI18Text(LangMap::CONFIG_PLUGINS_SCAN), m_data.numAvailablePlugins);
-+	const std::string scanLabel = fmt::format(fmt::runtime(g_ui.getI18Text(LangMap::CONFIG_PLUGINS_SCAN)), m_data.numAvailablePlugins);
- 	m_scanButton->copy_label(scanLabel.c_str());
- 
- 	m_folderPath->setValue(m_data.pluginPath);
diff --git a/giada-patches.patch b/giada-patches.patch
deleted file mode 100644
index f930973ef835..000000000000
--- a/giada-patches.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur giada-0.22.0-src/CMakeLists.txt giada-0.22.0-src-new/CMakeLists.txt
---- giada-0.22.0-src/CMakeLists.txt	2022-06-11 08:07:54.000000000 -0400
-+++ giada-0.22.0-src-new/CMakeLists.txt	2022-06-15 22:27:49.696961106 -0400
-@@ -252,7 +252,7 @@
- option(WITH_VST2 "Enable VST2 support." OFF)
- option(WITH_VST3 "Enable VST3 support." OFF)
- option(WITH_TESTS "Include the test suite." OFF)
--
-+option(WITH_SYSTEM_JSON "Use a system copy of nlohmann_json." OFF)
- if(DEFINED OS_LINUX)
- 	option(WITH_ALSA "Enable ALSA support (Linux only)." ON)
- 	option(WITH_PULSE "Enable PulseAudio support (Linux only)." ON)
-@@ -397,9 +397,18 @@
- 
- # nlohmann_json (embedded as git submodule)
- 
--set(JSON_Install OFF CACHE INTERNAL "") # No need to install it
--set(JSON_BuildTests OFF CACHE INTERNAL "") # Don't build tests
--add_subdirectory(src/deps/json)
-+if (WITH_SYSTEM_JSON)
-+
-+	find_package(nlohmann_json REQUIRED)
-+
-+else()
-+
-+	set(JSON_Install OFF CACHE INTERNAL "") # No need to install it
-+	set(JSON_BuildTests OFF CACHE INTERNAL "") # Don't build tests
-+	add_subdirectory(src/deps/json)
-+
-+endif()
-+
- list(APPEND LIBRARIES nlohmann_json::nlohmann_json)
- 
- # Catch (if tests enabled)
-diff -Naur giada-0.22.0-src/src/deps/juce/modules/juce_core/system/juce_StandardHeader.h giada-0.22.0-src-new/src/deps/juce/modules/juce_core/system/juce_StandardHeader.h
---- giada-0.22.0-src/src/deps/juce/modules/juce_core/system/juce_StandardHeader.h	2022-06-11 08:08:49.000000000 -0400
-+++ giada-0.22.0-src-new/src/deps/juce/modules/juce_core/system/juce_StandardHeader.h	2022-06-15 23:02:49.231516608 -0400
-@@ -63,6 +63,7 @@
- #include <sstream>

- #include <typeindex>

- #include <unordered_set>

-+#include <utility>

- #include <vector>

- #include <set>

- 

-diff -Naur giada-0.22.0-src/src/utils/log.h giada-0.22.0-src-new/src/utils/log.h
---- giada-0.22.0-src/src/utils/log.h	2022-06-11 08:07:54.000000000 -0400
-+++ giada-0.22.0-src-new/src/utils/log.h	2022-06-15 22:34:31.585034263 -0400
-@@ -80,6 +80,8 @@
- 
- 	if (mode == LOG_MODE_FILE && stat == true)
- 	{
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-security"
- 		// Replace any std::string in the arguments by its C-string
- 		std::fprintf(f, format, string_to_c_str(std::forward<Args>(args))...);
- #ifdef _WIN32
-@@ -88,6 +90,7 @@
- 	}
- 	else
- 		std::printf(format, string_to_c_str(std::forward<Args>(args))...);
-+#pragma GCC diagnostic pop
- }
- } // namespace giada::u::log
-