Refresh patches

diff --git a/debian/patches/debian_buildcmake.patch b/debian/patches/debian_buildcmake.patch
index f6e33ab51830080bd80906bebaf2a6b35daf609c..54dbe0309b29cf58f9a04d2df5414447ccf6f7a1 100644 (file)
--- a/debian/patches/debian_buildcmake.patch
+++ b/debian/patches/debian_buildcmake.patch
@@ -15,7 +15,7 @@ Last-Update: 2021-01-13
 
 --- juce.orig/extras/Build/CMake/JUCEUtils.cmake
 +++ juce/extras/Build/CMake/JUCEUtils.cmake
-@@ -83,6 +83,7 @@
+@@ -87,6 +87,7 @@
  if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD"))
      _juce_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl)
      _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0)
@@ -23,7 +23,7 @@ Last-Update: 2021-01-13
  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
      find_program(JUCE_XCRUN xcrun)
  
-@@ -225,6 +226,8 @@
+@@ -235,6 +236,8 @@
          if(needs_browser)
              target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_BROWSER_LINUX_DEPS)
          endif()

diff --git a/debian/patches/debian_cmake.patch b/debian/patches/debian_cmake.patch
index 8b1cad1fd2ecf6d17d68dc6522884f6d10aa76ea..b73b270821f428e74000f6faab73b0b74948139b 100644 (file)
--- a/debian/patches/debian_cmake.patch
+++ b/debian/patches/debian_cmake.patch
@@ -7,16 +7,16 @@ Last-Update: 2021-12-14
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/extras/Build/CMake/JUCEConfig.cmake.in
 +++ juce/extras/Build/CMake/JUCEConfig.cmake.in
-@@ -20,6 +20,8 @@
+@@ -22,6 +22,8 @@
  
- @PACKAGE_INIT@
+ include("${CMAKE_CURRENT_LIST_DIR}/LV2_HELPER.cmake")
  
 +set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@")
 +
  if(NOT TARGET juce::juceaide)
      add_executable(juce::juceaide IMPORTED)
      set_target_properties(juce::juceaide PROPERTIES
-@@ -28,11 +30,11 @@
+@@ -30,11 +32,11 @@
  
  check_required_components("@PROJECT_NAME@")
  
@@ -31,7 +31,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  set(_juce_modules
      juce_analytics
-@@ -84,7 +86,7 @@
+@@ -86,7 +88,7 @@
  unset(_targets_expected)
  
  foreach(_juce_module IN LISTS _juce_modules)

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index d719ab7707266768fde52f14a37a75aaf506946f..edcf584366329d3e882306385ae50a3bee6a3d5c 100644 (file)
--- a/debian/patches/debian_fixed-defines.patch
+++ b/debian/patches/debian_fixed-defines.patch
@@ -44,7 +44,7 @@ Forwarded: not-needed
  // The following checks should cause a compile error if you've forgotten to\r
  // define all your plugin settings properly..\r
  \r
-@@ -39,6 +63,7 @@
+@@ -38,6 +62,7 @@
  #endif\r
  #define JUCE_CHECKSETTINGMACROS_H\r
  \r

diff --git a/debian/patches/debian_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch
index 7e7d8fe25974d3b18c9d6ef2625514d2958db044..6eafd1d35846c04171e2dbdc6aeeacf9b3821788 100644 (file)
--- a/debian/patches/debian_link_systemlibs.patch
+++ b/debian/patches/debian_link_systemlibs.patch
@@ -16,7 +16,7 @@ Last-Update: 2019-08-21
 
 --- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
 +++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
-@@ -652,6 +652,9 @@
+@@ -692,6 +692,9 @@
          StringArray result (linuxLibs);\r
  \r
          auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'");\r
@@ -28,7 +28,7 @@ Last-Update: 2019-08-21
          for (auto& lib : libraries)\r
 --- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
 +++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
-@@ -520,6 +520,39 @@
+@@ -558,6 +558,39 @@
      if (isCurlEnabled (project) && ! isLoadCurlSymbolsLazilyEnabled (project))\r
          packages.add ("libcurl");\r
  \r

diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch
index a54815bc54877241b5bb37fc10015e5ebe812f67..8261983f39b54d0603bd7076b01ce5e69dbabc51 100644 (file)
--- a/debian/patches/debian_system_modules.patch
+++ b/debian/patches/debian_system_modules.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
 
 --- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
 +++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
-@@ -362,7 +362,7 @@
+@@ -352,7 +352,7 @@
      }\r
      else if (key == Ids::defaultJuceModulePath)\r
      {\r

diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch
index df636d2f7b6057f341f755165ff972897923b974..d898e653771117d5e2d4329716307e73555ffa08 100644 (file)
--- a/debian/patches/debian_unittests_globalpaths.patch
+++ b/debian/patches/debian_unittests_globalpaths.patch
@@ -51,5 +51,5 @@ Forwarded: not-needed
 +    <MODULE id="juce_product_unlocking" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>\r
 +    <MODULES id="juce_video" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>\r
    </MODULES>\r
-   <JUCEOPTIONS JUCE_STRICT_REFCOUNTEDPOINTER="1"/>\r
+   <JUCEOPTIONS JUCE_STRICT_REFCOUNTEDPOINTER="1" JUCE_PLUGINHOST_LV2="1" JUCE_PLUGINHOST_VST3="1"/>\r
    <LIVE_SETTINGS>\r