From: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Date: Wed, 30 Nov 2022 12:12:45 +0000 (+0100)
Subject: Refresh patches
X-Git-Tag: archive/raspbian/7.0.3_ds0-1+rpi1^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=811ca6ac093a61613439da2bbefdd9f863e7dc01;p=juce.git

Refresh patches
---

diff --git a/debian/patches/debian_buildcmake.patch b/debian/patches/debian_buildcmake.patch
index e2f774b3..77d98eb8 100644
--- a/debian/patches/debian_buildcmake.patch
+++ b/debian/patches/debian_buildcmake.patch
@@ -20,10 +20,10 @@ Last-Update: 2022-11-10
      _juce_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl)
      _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0)
 +    _juce_create_pkgconfig_target(JUCE_IMG_LINUX_DEPS libpng libjpeg)
- elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-     find_program(JUCE_XCRUN xcrun)
+ endif()
  
-@@ -235,6 +236,8 @@
+ # We set up default/fallback copy dirs here. If you need different copy dirs, use
+@@ -168,6 +169,8 @@
          if(needs_browser)
              target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_BROWSER_LINUX_DEPS)
          endif()
@@ -34,7 +34,7 @@ Last-Update: 2022-11-10
  
 --- juce.orig/extras/Build/CMake/JUCEModuleSupport.cmake
 +++ juce/extras/Build/CMake/JUCEModuleSupport.cmake
-@@ -480,7 +480,7 @@
+@@ -483,7 +483,7 @@
      if(${module_name} STREQUAL "juce_core")
          _juce_add_standard_defs(${module_name})
  
diff --git a/debian/patches/debian_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch
index e205838c..f106d97f 100644
--- a/debian/patches/debian_link_systemlibs.patch
+++ b/debian/patches/debian_link_systemlibs.patch
@@ -11,7 +11,7 @@ ogg/vorbis), we must link against the system libraries.
 Last-Update: 2019-08-21
 --- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
 +++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
-@@ -695,6 +695,9 @@
+@@ -690,6 +690,9 @@
          StringArray result (linuxLibs);
  
          auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'");
@@ -23,7 +23,7 @@ Last-Update: 2019-08-21
          for (auto& lib : libraries)
 --- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
 +++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
-@@ -558,6 +558,39 @@
+@@ -566,6 +566,39 @@
      if (isCurlEnabled (project) && ! isLoadCurlSymbolsLazilyEnabled (project))
          packages.add ("libcurl");
  
@@ -75,7 +75,7 @@ Last-Update: 2019-08-21
          juce::juce_recommended_lto_flags
 --- juce.orig/extras/Projucer/CMakeLists.txt
 +++ juce/extras/Projucer/CMakeLists.txt
-@@ -163,6 +163,7 @@
+@@ -159,6 +159,7 @@
      ../Build/CMake/juce_runtime_arch_detection.cpp)
  
  target_link_libraries(Projucer PRIVATE