Refreshed patches, dropped those applied upstream

diff --git a/debian/patches/debian_apply-reproducible-date.patch b/debian/patches/debian_apply-reproducible-date.patch
index d803b09a4bcee3105596322dfd91b2d2eeacb627..59ac073c656ea666da932a2c35d8173fe39ac0aa 100644 (file)
--- a/debian/patches/debian_apply-reproducible-date.patch
+++ b/debian/patches/debian_apply-reproducible-date.patch
@@ -7,11 +7,11 @@ Last-Update: 2016-02-10
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h
 +++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h
-@@ -18,6 +18,7 @@
- // [BEGIN_USER_CODE_SECTION]\r
+@@ -36,6 +36,7 @@
  \r
- // (You can add your own code in this section, and the Projucer will not overwrite it)\r
-+#include "../../../debian/libbuilder/build/libjuce_builddate.h"\r
+ // END SECTION A\r
  \r
++#include "../../../debian/libbuilder/build/libjuce_builddate.h"\r
  // [END_USER_CODE_SECTION]\r
  \r
+ /*\r

diff --git a/debian/patches/debian_do-not-track.patch b/debian/patches/debian_do-not-track.patch
deleted file mode 100644 (file)
index b455f96..0000000
--- a/debian/patches/debian_do-not-track.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: do not track!
- remove tracking code (google analytics) from the documentation.
-Author: IOhannes m zmölnig
-Last-Update: 2015-12-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/doxygen/footer.html
-+++ juce/doxygen/footer.html
-@@ -1,14 +1,4 @@
- <hr class="footer"/>
- <address class="footer"><small>All content &copy ROLI Ltd.</small></address><br/>
--<script type="text/javascript">
--var _gaq = _gaq || [];
--_gaq.push(['_setAccount', 'UA-19759318-1']);
--_gaq.push(['_trackPageview']);
--(function() {
--var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
--ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
--var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
--})();
--</script>
- </body>
- </html>

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index c605085d1e4688ac82b4061e5b1326e7eac9bf76..d1a270c102355b0f7396332f02d6d695bbe8dcce 100644 (file)
--- a/debian/patches/debian_fixed-defines.patch
+++ b/debian/patches/debian_fixed-defines.patch
@@ -12,7 +12,7 @@ Last-Update: 2016-04-07
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/modules/juce_core/juce_core.h
 +++ juce/modules/juce_core/juce_core.h
-@@ -71,6 +71,28 @@
+@@ -65,6 +65,28 @@
  \r
  #include "system/juce_TargetPlatform.h"\r
  \r
@@ -43,7 +43,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
 --- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
 +++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
-@@ -22,6 +22,30 @@
+@@ -24,6 +24,30 @@
    ==============================================================================\r
  */\r
  \r
@@ -74,7 +74,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  // The following checks should cause a compile error if you've forgotten to\r
  // define all your plugin settings properly..\r
  \r
-@@ -37,6 +61,7 @@
+@@ -39,6 +63,7 @@
  #endif\r
  #define JUCE_CHECKSETTINGMACROS_H\r
  \r

diff --git a/debian/patches/debian_make-projucer.patch b/debian/patches/debian_make-projucer.patch
deleted file mode 100644 (file)
index 9c05ad3..0000000
--- a/debian/patches/debian_make-projucer.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-Description: fix make-file to allow additional FLAGS
- also print the compiler/linker command before executing it
-Author: IOhannes m zmölnig
-Last-Update: 2015-01-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile
-+++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile
-@@ -16,6 +16,8 @@
-   CONFIG=Debug\r
- endif\r
- \r
-+LIBJUCE_PATH=../../../../debian/libbuilder/build/\r
-+\r
- ifeq ($(CONFIG),Debug)\r
-   JUCE_BINDIR := build\r
-   JUCE_LIBDIR := build\r
-@@ -23,13 +25,13 @@
-   JUCE_OUTDIR := build\r
- \r
-   ifeq ($(TARGET_ARCH),)\r
--    TARGET_ARCH := -march=native\r
-+    TARGET_ARCH :=\r
-   endif\r
- \r
--  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules\r
-+  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)\r
-   JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11\r
-   JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11\r
--  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt \r
-+  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt \r
- \r
-   TARGET := Projucer\r
-   BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
-@@ -43,13 +45,13 @@
-   JUCE_OUTDIR := build\r
- \r
-   ifeq ($(TARGET_ARCH),)\r
--    TARGET_ARCH := -march=native\r
-+    TARGET_ARCH :=\r
-   endif\r
- \r
--  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules\r
-+  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS)\r
-   JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11\r
-   JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11\r
--  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt \r
-+  JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt \r
- \r
-   TARGET := Projucer\r
-   BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
-@@ -106,13 +108,6 @@
-   $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \\r
-   $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \\r
-   $(JUCE_OBJDIR)/BinaryData_ce4232d4.o \\r
--  $(JUCE_OBJDIR)/juce_core_75b14332.o \\r
--  $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o \\r
--  $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o \\r
--  $(JUCE_OBJDIR)/juce_events_d2be882c.o \\r
--  $(JUCE_OBJDIR)/juce_graphics_9c18891e.o \\r
--  $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o \\r
--  $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o \\r
- \r
- .PHONY: clean\r
- \r
-@@ -121,7 +116,7 @@
-       -@mkdir -p $(JUCE_BINDIR)\r
-       -@mkdir -p $(JUCE_LIBDIR)\r
-       -@mkdir -p $(JUCE_OUTDIR)\r
--      @$(BLDCMD)\r
-+      $(BLDCMD)\r
- \r
- check-pkg-config:\r
-       @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }\r
-@@ -129,290 +124,290 @@
- \r
- clean:\r
-       @echo Cleaning Projucer\r
--      @$(CLEANCMD)\r
-+      $(CLEANCMD)\r
- \r
- strip:\r
-       @echo Stripping Projucer\r
--      -@$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET)\r
-+      -$(STRIP) --strip-unneeded $(JUCE_OUTDIR)/$(TARGET)\r
- \r
- $(JUCE_OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_AppearanceSettings.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_AutoUpdater_ca658dc2.o: ../../Source/Application/jucer_AutoUpdater.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_AutoUpdater.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o: ../../Source/Application/jucer_CommandLine.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_CommandLine.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Application/jucer_DocumentEditorComponent.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_DocumentEditorComponent.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_8a38703f.o: ../../Source/Application/jucer_DownloadCompileEngineThread.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_DownloadCompileEngineThread.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_GlobalPreferences.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o: ../../Source/Application/jucer_Main.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_Main.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainWindow.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_MainWindow.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_OpenDocumentManager.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_OpenDocumentManager.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling projucer_CompileEngineClient.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling projucer_CompileEngineServer.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_SourceCodeEditor.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ComponentTypeHandler.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ButtonDocument.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ComponentDocument.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ColouredElement.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_PaintElement.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_PaintElementPath.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ComponentLayoutEditor.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ComponentOverlayComponent.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_EditingPanelBase.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_JucerDocumentEditor.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_PaintRoutineEditor.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_PaintRoutinePanel.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ResourceEditorPanel.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_TestComponent.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_BinaryResources.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ComponentLayout.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_GeneratedCode.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_JucerDocument.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ObjectTypes.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_PaintRoutine.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_DependencyPathPropertyComponent.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_Module.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_Project.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ProjectExporter.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ProjectSaver.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ResourceFile.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_CodeHelpers.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_FileHelpers.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_Icons.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_JucerTreeViewBase.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_MiscUtilities.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_ProjucerLookAndFeel.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_SlidingPanelComponent.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_StoredSettings.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_NewFileWizard.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling jucer_NewProjectWizardClasses.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling BinaryData.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling juce_core.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling juce_cryptography.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling juce_data_structures.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling juce_events.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling juce_graphics.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling juce_gui_basics.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp\r
-       -@mkdir -p $(JUCE_OBJDIR)\r
-       @echo "Compiling juce_gui_extra.cpp"\r
--      @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- -include $(OBJECTS:%.o=%.d)\r
---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h
-+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h
-@@ -50,7 +50,7 @@
- #endif\r
- \r
- #ifndef    JUCE_LOG_ASSERTIONS\r
-- #define   JUCE_LOG_ASSERTIONS 1\r
-+// #define   JUCE_LOG_ASSERTIONS 1\r
- #endif\r
- \r
- #ifndef    JUCE_CHECK_MEMORY_LEAKS\r

diff --git a/debian/patches/debian_projucer-modulepath.patch b/debian/patches/debian_projucer-modulepath.patch
deleted file mode 100644 (file)
index 6d8a870..0000000
--- a/debian/patches/debian_projucer-modulepath.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Debian specific search-path for modules
-Author: Debian
-Forwarded: not-needed
-Last-Update: 2015-01-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/Source/Application/jucer_MainWindow.cpp
-+++ juce/extras/Projucer/Source/Application/jucer_MainWindow.cpp
-@@ -628,5 +628,9 @@
-         f = parent;\r
-     }\r
- \r
-+    File debian ("/usr/share/juce");\r
-+    if (isJuceFolder(debian))\r
-+        return debian.getChildFile ("modules");\r
-+\r
-     return File();\r
- }\r

diff --git a/debian/patches/fix-build-libpng16.patch b/debian/patches/fix-build-libpng16.patch
deleted file mode 100644 (file)
index e962f86..0000000
--- a/debian/patches/fix-build-libpng16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix build with libpng16
- This patch is inspired with the patch available at https://gist.github.com/balr0g/3004353
-Forwarded: https://github.com/julianstorer/JUCE/pull/124
-Author: Gianfranco Costamagna <locutusofborg@debian.org>
-
---- juce.orig/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
-+++ juce/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
-@@ -320,7 +320,7 @@
- \r
-     static void JUCE_CDECL errorCallback (png_structp p, png_const_charp)\r
-     {\r
--        longjmp (*(jmp_buf*) p->error_ptr, 1);\r
-+        setjmp(png_jmpbuf(p));\r
-     }\r
- \r
-     static void JUCE_CDECL warningCallback (png_structp, png_const_charp) {}\r
-@@ -442,8 +442,12 @@
-             for (size_t y = 0; y < height; ++y)\r
-                 rows[y] = (png_bytep) (tempBuffer + lineStride * y);\r
- \r
-+            png_bytep trans_alpha;\r
-+            int num_trans;\r
-+            png_color_16p trans_color;\r
-+            png_get_tRNS(pngReadStruct, pngInfoStruct,  &trans_alpha, &num_trans, &trans_color);\r
-             if (readImageData (pngReadStruct, pngInfoStruct, errorJumpBuf, rows))\r
--                return createImageFromData ((colorType & PNG_COLOR_MASK_ALPHA) != 0 || pngInfoStruct->num_trans > 0,\r
-+                return createImageFromData ((colorType & PNG_COLOR_MASK_ALPHA) != 0 || num_trans,\r
-                                             (int) width, (int) height, rows);\r
-         }\r
- \r

diff --git a/debian/patches/no-ztypes.patch b/debian/patches/no-ztypes.patch
deleted file mode 100644 (file)
index fb6ae6e..0000000
--- a/debian/patches/no-ztypes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: do not use z_uInt
- the zlib/gzip consumers use a type z_uInt, which is nowhere actually defined.
- use (uInt) instead
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/julianstorer/JUCE/pull/124
-Last-Update: 2015-01-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
-+++ juce/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
-@@ -77,6 +77,7 @@
-   #endif\r
-  #else\r
-   #include JUCE_ZLIB_INCLUDE_PATH\r
-+  #define z_uInt uInt\r
-  #endif\r
- }\r
- \r

diff --git a/debian/patches/projucer-makegenerator.patch b/debian/patches/projucer-makegenerator.patch
deleted file mode 100644 (file)
index cea73ae..0000000
--- a/debian/patches/projucer-makegenerator.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Description: projucer fixes
- projucer creates Linux Makefiles, but they do silent builds and do not allow
- to override CPP/C/CXXFLAGS.
- this patch changes projucer to honor the "V" build variable, so "V=1" will
- build verbosely.
- it also renames *FLAGS to JUCE_*FLAGS and appends the ordinary *FLAGS to them.
- .
- Note: This patch is applied manually because the patched files contain spaces,
- which makes problems during automated builds
-Author: IOhannes m zmölnig
-Origin: Debian
-Forwarded: https://github.com/julianstorer/JUCE/pull/124
-Last-Update: 2015-02-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Make.h
-+++ juce/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Make.h
-@@ -202,15 +202,16 @@
- \r
-     void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const\r
-     {\r
--        out << "  CPPFLAGS := $(DEPFLAGS)";\r
-+        out << "  JUCE_CPPFLAGS := $(DEPFLAGS)";\r
-         writeDefineFlags (out, config);\r
-         writeHeaderPathFlags (out, config);\r
--        out << newLine;\r
-+        out << " $(CPPFLAGS)"\r
-+            << newLine;\r
-     }\r
- \r
-     void writeLinkerFlags (OutputStream& out, const BuildConfiguration& config) const\r
-     {\r
--        out << "  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)";\r
-+        out << "  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR)";\r
- \r
-         {\r
-             StringArray flags (makefileExtraLinkerFlags);\r
-@@ -240,7 +241,8 @@
-         if (libraries.size() != 0)\r
-             out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim();\r
- \r
--        out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim()\r
-+        out << " " << replacePreprocessorTokens (config, getExtraLinkerFlagsString()).trim();\r
-+        out << " $(LDFLAGS)"\r
-             << newLine;\r
-     }\r
- \r
-@@ -269,7 +271,7 @@
- \r
-         writeCppFlags (out, config);\r
- \r
--        out << "  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)";\r
-+        out << "  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH)";\r
- \r
-         if (config.isDebug())\r
-             out << " -g -ggdb";\r
-@@ -279,6 +281,7 @@
- \r
-         out << " -O" << config.getGCCOptimisationFlag()\r
-             << (" "  + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd()\r
-+            << " $(CFLAGS)"\r
-             << newLine;\r
- \r
-         String cppStandardToUse (getCppStandardString());\r
-@@ -286,8 +289,9 @@
-         if (cppStandardToUse.isEmpty())\r
-             cppStandardToUse = "-std=c++11";\r
- \r
--        out << "  CXXFLAGS += $(CFLAGS) "\r
-+        out << "  JUCE_CXXFLAGS += $(JUCE_CFLAGS) "\r
-             << cppStandardToUse\r
-+            << " $(CXXFLAGS)"\r
-             << newLine;\r
- \r
-         writeLinkerFlags (out, config);\r
-@@ -306,7 +310,7 @@
-         if (projectType.isStaticLibrary())\r
-             out << "  BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine;\r
-         else\r
--            out << "  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine;\r
-+            out << "  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)" << newLine;\r
- \r
-         out << "  CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine\r
-             << "endif" << newLine\r
-@@ -330,6 +334,14 @@
-             << "# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!" << newLine\r
-             << newLine;\r
- \r
-+        out << "# build with \"V=1\" for verbose builds" << newLine\r
-+            << "ifeq ($(V), 1)" << newLine\r
-+            << "V_AT =" << newLine\r
-+            << "else" << newLine\r
-+            << "V_AT = @" << newLine\r
-+            << "endif" << newLine\r
-+            << newLine;\r
-+\r
-         out << "# (this disables dependency generation if multiple architectures are set)" << newLine\r
-             << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine\r
-             << newLine;\r
-@@ -352,12 +364,12 @@
-             << "\t-@mkdir -p $(BINDIR)" << newLine\r
-             << "\t-@mkdir -p $(LIBDIR)" << newLine\r
-             << "\t-@mkdir -p $(OUTDIR)" << newLine\r
--            << "\t@$(BLDCMD)" << newLine\r
-+            << "\t$(V_AT)$(BLDCMD)" << newLine\r
-             << newLine;\r
- \r
-         out << "clean:" << newLine\r
-             << "\t@echo Cleaning " << projectName << newLine\r
--            << "\t@$(CLEANCMD)" << newLine\r
-+            << "\t$(V_AT)$(CLEANCMD)" << newLine\r
-             << newLine;\r
- \r
-         out << "strip:" << newLine\r
-@@ -375,8 +387,8 @@
-                     << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine\r
-                     << "\t-@mkdir -p $(OBJDIR)" << newLine\r
-                     << "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine\r
--                    << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t@$(CC) $(CFLAGS) -o \"$@\" -c \"$<\""\r
--                                                                         : "\t@$(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"")\r
-+                    << (files.getReference(i).hasFileExtension ("c;s;S") ? "\t$(V_AT)$(CC) $(JUCE_CFLAGS) -o \"$@\" -c \"$<\""\r
-+                                                                         : "\t$(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o \"$@\" -c \"$<\"")\r
-                     << newLine << newLine;\r
-             }\r
-         }\r

diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch
index e425853abdf0c0026fda8b15ec53a4620b393a7b..3655bd275148bb3a496244d1d26199a5fb6eb308 100644 (file)
--- a/debian/patches/reproducible-date.patch
+++ b/debian/patches/reproducible-date.patch
@@ -8,7 +8,7 @@ Last-Update: 2015-01-21
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/modules/juce_core/time/juce_Time.cpp
 +++ juce/modules/juce_core/time/juce_Time.cpp
-@@ -598,14 +598,20 @@
+@@ -610,14 +610,20 @@
      return 0;\r
  }\r
  \r
@@ -33,8 +33,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                   getMonthNumberForCompileDate (dateTokens[0]),\r
 --- juce.orig/extras/Projucer/Source/Application/jucer_Application.cpp
 +++ juce/extras/Projucer/Source/Application/jucer_Application.cpp
-@@ -130,6 +130,9 @@
-     icons = new Icons();\r
+@@ -136,6 +136,9 @@
+     tooltipWindow.setMillisecondsBeforeTipAppears (1200);\r
  }\r
  \r
 +#ifndef BUILD_DATE\r
@@ -43,7 +43,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  bool ProjucerApplication::initialiseLogger (const char* filePrefix)\r
  {\r
      if (logger == nullptr)\r
-@@ -142,7 +145,7 @@
+@@ -148,7 +151,7 @@
  \r
          logger = FileLogger::createDateStampedLogger (folder, filePrefix, ".txt",\r
                                                        getApplicationName() + " " + getApplicationVersion()\r

diff --git a/debian/patches/series b/debian/patches/series
index b4bc4dae5d814bd7077c63af5809a2134f7d41cf..8a005d82dda198b2bccc2b2d65312a6fd44401da 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-no-ztypes.patch
-fix-build-libpng16.patch
-#MANUAL#projucer-makegenerator.patch
 reproducible-date.patch
 debian_apply-reproducible-date.patch
 debian_fixed-defines.patch
-debian_projucer-modulepath.patch
-debian_make-projucer.patch
-debian_do-not-track.patch