devel/juce706: update webkit2gtk3 API version to 4.1

- remove duplicate libsoup LILB_DEPENDS from DEMOS options, the library is already pulled in unconditionally Pull Request: freebsd#266
clausecker · May 24, 2024 · 9811f55 · 9811f55
1 parent b37139f
commit 9811f55
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 9 deletions.
diff --git a/devel/juce706/Makefile b/devel/juce706/Makefile
@@ -1,6 +1,6 @@
 PORTNAME= juce
 DISTVERSION= 7.0.6
-PORTREVISION= 1
+PORTREVISION= 2
 CATEGORIES= devel
 PKGNAMESUFFIX= 706
 
@@ -20,9 +20,9 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
  libcurl.so:ftp/curl \
  libfreetype.so:print/freetype2 \
  libharfbuzz.so:print/harfbuzz \
- libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \
+ libjavascriptcoregtk-4.1.so:www/webkit2-gtk3 \
  libpng16.so:graphics/png \
- libsoup-2.4.so:devel/libsoup \
+ libsoup-3.0.so:devel/libsoup3 \
  libsysinfo.so:devel/libsysinfo
 
 USES= cmake compiler:c++11-lang dos2unix gl gnome localbase:ldflags pkgconfig xorg
@@ -56,8 +56,7 @@ DEMOS_CMAKE_BOOL= JUCE_BUILD_EXAMPLES
 DEMOS_LDFLAGS= -lexecinfo
 DEMOS_USE= GNOME=atk,cairo,gdkpixbuf2,gtk30,pango
 DEMOS_LIB_DEPENDS= libcurl.so:ftp/curl \
- libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
- libsoup-2.4.so:devel/libsoup
+ libwebkit2gtk-4.1.so:www/webkit2-gtk3
 DEMO_FILES= \
  AnalyticsCollectionDemo AnimationAppDemo AnimationDemo AudioAppDemo AudioLatencyDemo AudioPlaybackDemo AudioPluginDemo AudioRecordingDemo AudioSettingsDemo AudioSynthesiserDemo \
  BlocksDrawingDemo BlocksMonitorDemo BlocksSynthDemo BouncingBallWavetableDemo Box2DDemo ChildProcessDemo CodeEditorDemo ComponentDemo ComponentTransformsDemo ConvolutionDemo \

diff --git a/devel/juce706/files/patch-extras_Build_CMake_JUCEUtils.cmake b/devel/juce706/files/patch-extras_Build_CMake_JUCEUtils.cmake
@@ -0,0 +1,11 @@
+--- extras/Build/CMake/JUCEUtils.cmake.orig 2024-05-24 21:30:27 UTC
++++ extras/Build/CMake/JUCEUtils.cmake
+@@ -86,7 +86,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYST
+
+ 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)
++ _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.1 gtk+-x11-3.0)
+ endif()
+
+ # We set up default/fallback copy dirs here. If you need different copy dirs, use
diff --git a/devel/juce706/files/patch-extras_Projucer_Source_ProjectSaving_jucer__ProjectExporter.cpp b/devel/juce706/files/patch-extras_Projucer_Source_ProjectSaving_jucer__ProjectExporter.cpp
@@ -0,0 +1,11 @@
+--- extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp.orig 2024-05-24 21:31:08 UTC
++++ extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
+@@ -607,7 +607,7 @@ StringArray ProjectExporter::getLinuxPackages (Package
+
+ if (isWebBrowserComponentEnabled (project) && type == PackageDependencyType::compile)
+ {
+- packages.add ("webkit2gtk-4.0");
++ packages.add ("webkit2gtk-4.1");
+ packages.add ("gtk+-x11-3.0");
+ }
+
diff --git a/...h-modules_juce__audio__processors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h b/...h-modules_juce__audio__processors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h
@@ -1,8 +1,8 @@
---- modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h.orig 2023-01-25 11:45:10 UTC
+--- modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h.orig 2023-08-03 10:07:31 UTC
 +++ modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h
-@@ -139,6 +139,43 @@
- #define SMTG_HAS_NOEXCEPT 1
- #endif
+@@ -188,6 +188,43 @@
+ #define SMTG_HAS_CPP14_CONSTEXPR SMTG_CPP14
+ #endif // __cplusplus
  //-----------------------------------------------------------------------------
 +// BSD
 +//-----------------------------------------------------------------------------

diff --git a/.../juce706/files/patch-modules_juce__gui__extra_native_juce__WebBrowserComponent__linux.cpp b/.../juce706/files/patch-modules_juce__gui__extra_native_juce__WebBrowserComponent__linux.cpp
@@ -0,0 +1,11 @@
+--- modules/juce_gui_extra/native/juce_WebBrowserComponent_linux.cpp.orig 2024-05-24 21:31:34 UTC
++++ modules/juce_gui_extra/native/juce_WebBrowserComponent_linux.cpp
+@@ -210,7 +210,7 @@ class WebKitSymbols : public DeletedAtShutdown (priv
+ }
+
+ //==============================================================================
+- DynamicLibrary gtkLib { "libgtk-3.so" }, webkitLib { "libwebkit2gtk-4.0.so" };
++ DynamicLibrary gtkLib { "libgtk-3.so" }, webkitLib { "libwebkit2gtk-4.1.so" };
+ const bool webKitIsAvailable = loadWebkitSymbols() && loadGtkSymbols();
+
+ JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (WebKitSymbols)