From 59d91cff1edadc002826d82e02052b957790a470 Mon Sep 17 00:00:00 2001
From: Anthony Nicholls <anthony@juce.com>
Date: Fri, 22 Sep 2023 14:05:17 +0100
Subject: [PATCH] Xcode15: Allow older llvm versions when compiling with Xcode
 15

---
 examples/DemoRunner/Source/Demos/DemoPIPs2.cpp            | 2 ++
 examples/GUI/WebBrowserDemo.h                             | 4 ++++
 .../juce_audio_basics/utilities/juce_AudioWorkgroup.cpp   | 8 ++++++--
 modules/juce_gui_basics/juce_gui_basics.cpp               | 1 -
 modules/juce_gui_extra/juce_gui_extra.cpp                 | 8 ++++++--
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp b/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp
index 992b4a63b3..f22ad98883 100644
--- a/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp
+++ b/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp
@@ -104,7 +104,9 @@ void registerDemos_Two() noexcept
    #if ! (JUCE_LINUX || JUCE_BSD)
     REGISTER_DEMO (VideoDemo,                 GUI, true)
    #endif
+   #if JUCE_WEB_BROWSER
     REGISTER_DEMO (WebBrowserDemo,            GUI, true)
+   #endif
     REGISTER_DEMO (WidgetsDemo,               GUI, false)
     REGISTER_DEMO (WindowsDemo,               GUI, false)
 }
diff --git a/examples/GUI/WebBrowserDemo.h b/examples/GUI/WebBrowserDemo.h
index 73c55e53f0..0148c95cf2 100644
--- a/examples/GUI/WebBrowserDemo.h
+++ b/examples/GUI/WebBrowserDemo.h
@@ -46,6 +46,8 @@
 
 #pragma once
 
+#if JUCE_WEB_BROWSER
+
 #include "../Assets/DemoUtilities.h"
 
 //==============================================================================
@@ -148,3 +150,5 @@ private:
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (WebBrowserDemo)
 };
+
+#endif
diff --git a/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp b/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp
index d92f8a5824..58d93cccfe 100644
--- a/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp
+++ b/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp
@@ -101,7 +101,11 @@ public:
 
     WorkgroupProvider clone() const
     {
-        return WorkgroupProvider { handle != nullptr ? os_retain (handle.get()) : nullptr };
+        if (handle == nullptr)
+            return WorkgroupProvider { nullptr };
+
+        os_retain (handle.get());
+        return WorkgroupProvider { handle.get() };
     }
 
     void join (WorkgroupToken& token) const
@@ -200,4 +204,4 @@ AudioWorkgroup makeRealAudioWorkgroup (os_workgroup_t handle)
 
 #endif
 
-} // namespace juce
\ No newline at end of file
+} // namespace juce
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index 380fe88cad..62580d7640 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -49,7 +49,6 @@
 
 //==============================================================================
 #if JUCE_MAC
- #import <WebKit/WebKit.h>
  #import <IOKit/pwr_mgt/IOPMLib.h>
  #import <MetalKit/MetalKit.h>
 
diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp
index f417b6d9e7..f1a08c6604 100644
--- a/modules/juce_gui_extra/juce_gui_extra.cpp
+++ b/modules/juce_gui_extra/juce_gui_extra.cpp
@@ -49,7 +49,9 @@
 
 //==============================================================================
 #if JUCE_MAC
- #import <WebKit/WebKit.h>
+ #if JUCE_WEB_BROWSER
+  #import <WebKit/WebKit.h>
+ #endif
  #import <IOKit/IOKitLib.h>
  #import <IOKit/IOCFPlugIn.h>
  #import <IOKit/hid/IOHIDLib.h>
@@ -64,7 +66,9 @@
 
 //==============================================================================
 #elif JUCE_IOS
- #import <WebKit/WebKit.h>
+ #if JUCE_WEB_BROWSER
+  #import <WebKit/WebKit.h>
+ #endif
 
  #if JUCE_PUSH_NOTIFICATIONS
   #import <UserNotifications/UserNotifications.h>