diff --git a/devel/juce/Makefile b/devel/juce/Makefile index 575c39aa05a39..8db757f574378 100644 --- a/devel/juce/Makefile +++ b/devel/juce/Makefile @@ -1,6 +1,6 @@ PORTNAME= juce DISTVERSION= 7.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -19,9 +19,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 @@ -55,8 +55,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/juce/files/patch-extras_Build_CMake_JUCEUtils.cmake b/devel/juce/files/patch-extras_Build_CMake_JUCEUtils.cmake new file mode 100644 index 0000000000000..289e477d16137 --- /dev/null +++ b/devel/juce/files/patch-extras_Build_CMake_JUCEUtils.cmake @@ -0,0 +1,11 @@ +--- extras/Build/CMake/JUCEUtils.cmake.orig 2024-05-24 21:27:46 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/juce/files/patch-extras_Projucer_Source_ProjectSaving_jucer__ProjectExporter.cpp b/devel/juce/files/patch-extras_Projucer_Source_ProjectSaving_jucer__ProjectExporter.cpp new file mode 100644 index 0000000000000..d24df91494d4b --- /dev/null +++ b/devel/juce/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:26:57 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/devel/juce/files/patch-modules_juce__audio__processors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h b/devel/juce/files/patch-modules_juce__audio__processors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h index 010ec0eed47a5..5d29ff2b61876 100644 --- a/devel/juce/files/patch-modules_juce__audio__processors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h +++ b/devel/juce/files/patch-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-23 08:13:45 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/devel/juce/files/patch-modules_juce__gui__extra_native_juce__WebBrowserComponent__linux.cpp b/devel/juce/files/patch-modules_juce__gui__extra_native_juce__WebBrowserComponent__linux.cpp new file mode 100644 index 0000000000000..be25a2ed456bc --- /dev/null +++ b/devel/juce/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:25:25 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)