Manually refreshed patches

diff --git a/debian/patches/debian_apply-reproducible-date.patch b/debian/patches/debian_apply-reproducible-date.patch
index 5fdbfad48e5f4bf26c06202bc04b119dc851789c..d803b09a4bcee3105596322dfd91b2d2eeacb627 100644 (file)
--- a/debian/patches/debian_apply-reproducible-date.patch
+++ b/debian/patches/debian_apply-reproducible-date.patch
@@ -5,12 +5,12 @@ Author: IOhannes m zmölnig
 Last-Update: 2016-02-10
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h
-+++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h
+--- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h
++++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h
 @@ -18,6 +18,7 @@
  // [BEGIN_USER_CODE_SECTION]\r
  \r
- // (You can add your own code in this section, and the Introjucer will not overwrite it)\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
  \r
  // [END_USER_CODE_SECTION]\r

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index ee3878712eefe8054bbba7c4e7ecb1c08632f847..5f3a5a53ffb8b242c99dcf46d2787d9dcae124a4 100644 (file)
--- a/debian/patches/debian_fixed-defines.patch
+++ b/debian/patches/debian_fixed-defines.patch
@@ -12,10 +12,10 @@ 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
-@@ -61,6 +61,32 @@
+@@ -70,6 +70,28 @@
+ \r
  #include "system/juce_TargetPlatform.h"\r
  \r
- //=============================================================================\r
 +/** Debian specific constants\r
 +Debian's libjuce.so only allows to either create\r
 +- a proper Release build\r
@@ -38,13 +38,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +/** Debian specifics END\r
 +*/\r
 +\r
-+\r
-+\r
-+\r
-+//=============================================================================\r
+ //==============================================================================\r
  /** Config: JUCE_FORCE_DEBUG\r
  \r
-     Normally, JUCE_DEBUG is set to 1 or 0 based on compiler and project settings,\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,42 @@
@@ -90,9 +86,9 @@ 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
-@@ -31,6 +67,7 @@
-  #error "You need to enable at least one plugin format!"\r
+@@ -37,6 +73,7 @@
  #endif\r
+ #define JUCE_CHECKSETTINGMACROS_H\r
  \r
 +\r
  #ifndef JucePlugin_IsSynth\r

diff --git a/debian/patches/debian_introjucer-modulepath.patch b/debian/patches/debian_introjucer-modulepath.patch
index be0313661479a2a19bfeaf2cdedbe610c06081b1..fc5779c7f0052f7bb9b0ef504179906bcf76f6b2 100644 (file)
--- a/debian/patches/debian_introjucer-modulepath.patch
+++ b/debian/patches/debian_introjucer-modulepath.patch
@@ -4,14 +4,15 @@ Forwarded: not-needed
 Last-Update: 2015-01-28
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Introjucer/Source/Application/jucer_MainWindow.cpp
-+++ juce/extras/Introjucer/Source/Application/jucer_MainWindow.cpp
-@@ -577,5 +577,8 @@
+--- juce.orig/extras/Projucer/Source/Application/jucer_MainWindow.cpp
++++ juce/extras/Projucer/Source/Application/jucer_MainWindow.cpp
+@@ -605,5 +605,9 @@
          f = parent;\r
      }\r
  \r
 +    File debian ("/usr/share/juce");\r
 +    if (isJuceFolder(debian))\r
 +        return debian.getChildFile ("modules");\r
-     return File::nonexistent;\r
++\r
+     return File();\r
  }\r

diff --git a/debian/patches/debian_make-introjucer.patch b/debian/patches/debian_make-introjucer.patch
index b3b80b07b94030978736e4fbb9b0397c154ab477..4db7764b1fb4ed5fc0a4a74ada34c4dccba4e7cd 100644 (file)
--- a/debian/patches/debian_make-introjucer.patch
+++ b/debian/patches/debian_make-introjucer.patch
@@ -4,8 +4,8 @@ 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/Introjucer/Builds/Linux/Makefile
-+++ juce/extras/Introjucer/Builds/Linux/Makefile
+--- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile
++++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile
 @@ -8,6 +8,8 @@
    CONFIG=Debug\r
  endif\r
@@ -16,58 +16,58 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    BINDIR := build\r
    LIBDIR := build\r
 @@ -18,13 +20,13 @@
-     TARGET_ARCH := \r
+     TARGET_ARCH := -march=native\r
    endif\r
  \r
--  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules\r
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare\r
+-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules\r
+-  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11\r
 -  CXXFLAGS += $(CFLAGS) -std=c++11\r
 -  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl \r
-+  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)\r
-+  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(CFLAGS)\r
++  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)\r
++  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS)\r
 +  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)\r
-+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(LDFLAGS)\r
++  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS)\r
  \r
-   TARGET := Introjucer\r
+   TARGET := Projucer\r
 -  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
 +  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
    CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)\r
  endif\r
  \r
 @@ -38,13 +40,13 @@
-     TARGET_ARCH := \r
+     TARGET_ARCH := -march=native\r
    endif\r
  \r
--  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules\r
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare\r
+-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules\r
+-  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11\r
 -  CXXFLAGS += $(CFLAGS) -std=c++11\r
 -  LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl \r
-+  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)\r
-+  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(CFLAGS)\r
++  JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS)\r
++  JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS)\r
 +  JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)\r
-+  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce  $(LDFLAGS)\r
++  JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS)\r
  \r
-   TARGET := Introjucer\r
+   TARGET := Projucer\r
 -  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
 +  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH)\r
    CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)\r
  endif\r
  \r
-@@ -95,13 +97,6 @@
+@@ -97,13 +99,6 @@
    $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \\r
    $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \\r
    $(OBJDIR)/BinaryData_ce4232d4.o \\r
--  $(OBJDIR)/juce_core_1ee54a40.o \\r
--  $(OBJDIR)/juce_cryptography_3b1f489a.o \\r
--  $(OBJDIR)/juce_data_structures_84790dfc.o \\r
--  $(OBJDIR)/juce_events_584896b4.o \\r
--  $(OBJDIR)/juce_graphics_f9afc18.o \\r
--  $(OBJDIR)/juce_gui_basics_90929794.o \\r
--  $(OBJDIR)/juce_gui_extra_b81d9e1c.o \\r
+-  $(OBJDIR)/juce_core_75b14332.o \\r
+-  $(OBJDIR)/juce_cryptography_6de2ebff.o \\r
+-  $(OBJDIR)/juce_data_structures_72d3da2c.o \\r
+-  $(OBJDIR)/juce_events_d2be882c.o \\r
+-  $(OBJDIR)/juce_graphics_9c18891e.o \\r
+-  $(OBJDIR)/juce_gui_basics_8a6da59c.o \\r
+-  $(OBJDIR)/juce_gui_extra_4a026f23.o \\r
  \r
  .PHONY: clean\r
  \r
-@@ -110,11 +105,11 @@
+@@ -112,11 +107,11 @@
        -@mkdir -p $(BINDIR)\r
        -@mkdir -p $(LIBDIR)\r
        -@mkdir -p $(OUTDIR)\r
@@ -75,13 +75,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +      $(BLDCMD)\r
  \r
  clean:\r
-       @echo Cleaning The Introjucer\r
+       @echo Cleaning Projucer\r
 -      @$(CLEANCMD)\r
 +      $(CLEANCMD)\r
  \r
  strip:\r
-       @echo Stripping The Introjucer\r
-@@ -123,266 +118,266 @@
+       @echo Stripping Projucer\r
+@@ -125,276 +120,276 @@
  $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling jucer_AppearanceSettings.cpp"\r
@@ -128,6 +128,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling jucer_OpenDocumentManager.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling projucer_CompileEngineClient.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling projucer_CompileEngineServer.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
  $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp\r
@@ -254,18 +266,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling jucer_PaintRoutine.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp\r
-       -@mkdir -p $(OBJDIR)\r
-       @echo "Compiling jucer_ProjectExporter.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
-+      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
- \r
- $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp\r
-       -@mkdir -p $(OBJDIR)\r
-       @echo "Compiling jucer_ResourceFile.cpp"\r
--      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
  $(OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp\r
@@ -286,15 +286,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o: ../../Source/Project/jucer_ProjectContentComponent.cpp\r
+ $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling jucer_ProjectExporter.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp\r
        -@mkdir -p $(OBJDIR)\r
-       @echo "Compiling jucer_ProjectContentComponent.cpp"\r
+       @echo "Compiling jucer_ProjectSaver.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/jucer_ProjectType_1bc27a24.o: ../../Source/Project/jucer_ProjectType.cpp\r
+ $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp\r
        -@mkdir -p $(OBJDIR)\r
-       @echo "Compiling jucer_ProjectType.cpp"\r
+       @echo "Compiling jucer_ResourceFile.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
@@ -326,6 +332,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling jucer_MiscUtilities.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
++      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
+ \r
+ $(OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp\r
+       -@mkdir -p $(OBJDIR)\r
+       @echo "Compiling jucer_ProjucerLookAndFeel.cpp"\r
+-      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
  $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp\r
@@ -358,52 +370,52 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_core_1ee54a40.o: ../../../../modules/juce_core/juce_core.cpp\r
+ $(OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling juce_core.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_cryptography_3b1f489a.o: ../../../../modules/juce_cryptography/juce_cryptography.cpp\r
+ $(OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling juce_cryptography.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_data_structures_84790dfc.o: ../../../../modules/juce_data_structures/juce_data_structures.cpp\r
+ $(OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling juce_data_structures.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_events_584896b4.o: ../../../../modules/juce_events/juce_events.cpp\r
+ $(OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling juce_events.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_graphics_f9afc18.o: ../../../../modules/juce_graphics/juce_graphics.cpp\r
+ $(OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling juce_graphics.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_gui_basics_90929794.o: ../../../../modules/juce_gui_basics/juce_gui_basics.cpp\r
+ $(OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling juce_gui_basics.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
- $(OBJDIR)/juce_gui_extra_b81d9e1c.o: ../../../../modules/juce_gui_extra/juce_gui_extra.cpp\r
+ $(OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp\r
        -@mkdir -p $(OBJDIR)\r
        @echo "Compiling juce_gui_extra.cpp"\r
 -      @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"\r
 +      $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"\r
  \r
  -include $(OBJECTS:%.o=%.d)\r
---- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h
-+++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h
-@@ -44,7 +44,7 @@
+--- 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

diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch
index da479e50c9c74eb0be32027c3ff29981ef498c0e..6dc3052135d1f17fcb45f9302eef08c2dffe6992 100644 (file)
--- a/debian/patches/reproducible-date.patch
+++ b/debian/patches/reproducible-date.patch
@@ -7,7 +7,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
-@@ -448,10 +448,13 @@
+@@ -598,11 +598,14 @@
      return 0;\r
  }\r
  \r
@@ -16,29 +16,31 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +#endif\r
  Time Time::getCompilationDate()\r
  {\r
-     StringArray dateTokens;\r
+     StringArray dateTokens, timeTokens;\r
+ \r
 -    dateTokens.addTokens (__DATE__, true);\r
 +    dateTokens.addTokens (BUILD_DATE, true);\r
      dateTokens.removeEmptyStrings (true);\r
  \r
-     return Time (dateTokens[2].getIntValue(),\r
---- juce.orig/extras/Introjucer/Source/Application/jucer_Application.h
-+++ juce/extras/Introjucer/Source/Application/jucer_Application.h
-@@ -101,13 +101,16 @@
-         return initialiseLogger ("log_");\r
-     }\r
+     timeTokens.addTokens (__TIME__, ":", StringRef());\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
+ }\r
  \r
 +#ifndef BUILD_DATE\r
 +# define BUILD_DATE __DATE__\r
 +#endif\r
-     bool initialiseLogger (const char* filePrefix)\r
-     {\r
-         if (logger == nullptr)\r
-         {\r
-             logger = FileLogger::createDateStampedLogger (getLogFolderName(), filePrefix, ".txt",\r
-                                                           getApplicationName() + " " + getApplicationVersion()\r
--                                                            + "  ---  Build date: " __DATE__);\r
-+                                                            + "  ---  Build date: " BUILD_DATE);\r
-             Logger::setCurrentLogger (logger);\r
-         }\r
+ bool ProjucerApplication::initialiseLogger (const char* filePrefix)\r
+ {\r
+     if (logger == nullptr)\r
+@@ -142,7 +145,7 @@
+ \r
+         logger = FileLogger::createDateStampedLogger (folder, filePrefix, ".txt",\r
+                                                       getApplicationName() + " " + getApplicationVersion()\r
+-                                                        + "  ---  Build date: " __DATE__);\r
++                                                        + "  ---  Build date: " BUILD_DATE);\r
+         Logger::setCurrentLogger (logger);\r
+     }\r
  \r