Drop patches applied upstream.

diff --git a/debian/patches/01-drop_juce.patch b/debian/patches/01-drop_juce.patch
deleted file mode 100644 (file)
index fe35534..0000000
--- a/debian/patches/01-drop_juce.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: only use JUCE if VST is enabled
- drop all references to JUCE is VST is disabled.
-Author: Debian
-Forwarded: http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2016-May/051554.html
-Last-Update: 2016-05-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: giada/Makefile.am
-===================================================================
---- giada.orig/Makefile.am
-+++ giada/Makefile.am
-@@ -227,7 +227,10 @@ src/core/pluginHost.cpp      \
- src/core/dataStorageIni.cpp  \
- src/core/dataStorageJson.cpp \
- src/utils/utils.cpp          \
--src/utils/log.cpp            \
-+src/utils/log.cpp
-+
-+if WITH_VST
-+giada_tests_SOURCES +=        \
- src/deps/juce/juce_audio_basics/juce_audio_basics.cpp         \
- src/deps/juce/juce_audio_processors/juce_audio_processors.cpp \
- src/deps/juce/juce_core/juce_core.cpp                         \
-@@ -236,6 +239,7 @@ src/deps/juce/juce_events/juce_events.cp
- src/deps/juce/juce_graphics/juce_graphics.cpp                 \
- src/deps/juce/juce_gui_basics/juce_gui_basics.cpp             \
- src/deps/juce/juce_gui_extra/juce_gui_extra.cpp
-+endif
- 
- giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
-   -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
-@@ -243,8 +247,11 @@ giada_tests_LDADD = -ljansson -lsndfile
- 
- giada_tests_CXXFLAGS = -std=c++11
- 
--giada_tests_CPPFLAGS = -I./src/deps/juce -I./src/deps/vst -I/usr/include \
-+giada_tests_CPPFLAGS =
-+if WITH_VST
-+giada_tests_CPPFLAGS += -I./src/deps/juce -I./src/deps/vst -I/usr/include \
-                        -I/usr/include/freetype2
-+endif
- 
- # make rename ------------------------------------------------------------------
- 

diff --git a/debian/patches/03-build_with_gcc6.patch b/debian/patches/03-build_with_gcc6.patch
deleted file mode 100644 (file)
index e3ddbbb..0000000
--- a/debian/patches/03-build_with_gcc6.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Fix build with gcc6
-Author: Jaromír Mikeš <mira.mikes@seznam.cz>
-Forwarded: <giadaloopmachine@gmail.com>
-
-Index: giada/src/core/recorder.cpp
-===================================================================
---- giada.orig/src/core/recorder.cpp
-+++ giada/src/core/recorder.cpp
-@@ -651,10 +651,10 @@ void stopOverdub(int frame)
- 
-       /* remove any nested action between keypress----keyrel, then record */
- 
--      if (!nullLoop)
-+      if (!nullLoop) {
-               deleteActions(cmp.a2.chan, cmp.a1.frame, cmp.a2.frame, cmp.a1.type);
-               deleteActions(cmp.a2.chan, cmp.a1.frame, cmp.a2.frame, cmp.a2.type);
--
-+                      }
-       if (!ringLoop && !nullLoop) {
-               rec(cmp.a2.chan, cmp.a2.type, cmp.a2.frame);
- 
-Index: giada/src/glue/glue.cpp
-===================================================================
---- giada.orig/src/glue/glue.cpp
-+++ giada/src/glue/glue.cpp
-@@ -56,6 +56,7 @@
- #include "../core/patch_DEPR_.h"
- #include "../core/conf.h"
- #include "glue.h"
-+#include <math.h>
- 
- 
- extern gdMainWindow *mainWin;
-@@ -711,7 +712,7 @@ void glue_setPanning(class gdEditor *win
-               ch->panRight= 0.0f + val;
- 
-               char buf[8];
--              sprintf(buf, "%d L", abs((ch->panRight * 100.0f) - 100));
-+              sprintf(buf, "%f L", fabs((ch->panRight * 100.0f) - 100));
-               win->panNum->value(buf);
-       }
-       else if (val == 1.0f) {
-@@ -724,7 +725,7 @@ void glue_setPanning(class gdEditor *win
-               ch->panRight= 1.0f;
- 
-               char buf[8];
--              sprintf(buf, "%d R", abs((ch->panLeft * 100.0f) - 100));
-+              sprintf(buf, "%f R", fabs((ch->panLeft * 100.0f) - 100));
-               win->panNum->value(buf);
-       }
-       win->panNum->redraw();
-Index: giada/src/gui/dialogs/gd_editor.cpp
-===================================================================
---- giada.orig/src/gui/dialogs/gd_editor.cpp
-+++ giada/src/gui/dialogs/gd_editor.cpp
-@@ -45,6 +45,7 @@
- #include "gd_editor.h"
- #include "gd_mainWindow.h"
- #include "gd_warnings.h"
-+#include <math.h>
- 
- 
- extern Mixer         G_Mixer;
-@@ -202,7 +203,7 @@ gdEditor::gdEditor(SampleChannel *ch)
- 
-   if (ch->panRight < 1.0f) {
-     char buf[8];
--    sprintf(buf, "%d L", abs((ch->panRight * 100.0f) - 100));
-+    sprintf(buf, "%f L", fabs((ch->panRight * 100.0f) - 100));
-     pan->value(ch->panRight);
-     panNum->value(buf);
-   }
-@@ -212,7 +213,7 @@ gdEditor::gdEditor(SampleChannel *ch)
-   }
-   else {
-     char buf[8];
--    sprintf(buf, "%d R", abs((ch->panLeft * 100.0f) - 100));
-+    sprintf(buf, "%f R", fabs((ch->panLeft * 100.0f) - 100));
-     pan->value(2.0f - ch->panLeft);
-     panNum->value(buf);
-   }
-Index: giada/src/gui/elems/ge_mixed.cpp
-===================================================================
---- giada.orig/src/gui/elems/ge_mixed.cpp
-+++ giada/src/gui/elems/ge_mixed.cpp
-@@ -612,9 +612,10 @@ void gBaseButton::trimLabel()
-       len--;
-     }
-   }
--  else
-+  else {
-     out = "";
-     copy_label(out.c_str());
-+       }
- }
- 
- 

diff --git a/debian/patches/series b/debian/patches/series
index 0ad48f7e228c8dfd08ce60facea2b7289ce36510..bfef84f05e01b594378fd21970d8cb4aa92c9d54 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-#01-drop_juce.patch
 02-rtmidi-pkgconfig.patch
-#03-build_with_gcc6.patch