pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

(www/webkit-gtk) avoid compile error {nullptr} issue



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By:	mef
Date:		Sun Jun 23 22:01:45 2024 +0900
Changeset:	b016de3bca6375e82e87b5ed6a147ee4f829ab4d

Modified Files:
	webkit-gtk/distinfo
Added Files:
	webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp
	webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioSourceProviderGStreamer.cpp
	webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_ImageDecoderGStreamer.cpp

Log Message:
(www/webkit-gtk)  avoid compile error {nullptr} issue

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b016de3bca6375e82e87b5ed6a147ee4f829ab4d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/distinfo                                     |  5 ++++-
 ...latform_audio_gstreamer_AudioFileReaderGStreamer.cpp | 16 ++++++++++++++++
 ...orm_audio_gstreamer_AudioSourceProviderGStreamer.cpp | 16 ++++++++++++++++
 ...latform_graphics_gstreamer_ImageDecoderGStreamer.cpp | 17 +++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diffs:
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index b9141edec8..a888b1d0b7 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.173 2022/10/23 07:33:51 mcf Exp $
+$NetBSD$
 
 BLAKE2s (webkitgtk-2.38.5.tar.xz) = 0fa33a5986b42eaeec189f75aeba652702bd7ce2e3db204f0a56ace5c7eec290
 SHA512 (webkitgtk-2.38.5.tar.xz) = 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
@@ -26,7 +26,10 @@ SHA1 (patch-Source_WebCore_css_calc_CSSCalcOperationNode.cpp) = 8c8e60692152a3bb
 SHA1 (patch-Source_WebCore_css_calc_CSSCalcOperationNode.h) = f9c7f117490e58bd8d58f57f6202f63aad6fc423
 SHA1 (patch-Source_WebCore_css_calc_CSSCalcValue.cpp) = c219e5c4ac9a5c9df042614e3d250fcb97efb10c
 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
+SHA1 (patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp) = 8ad3610d02671c08637926aa5c75eaf059ae5862
+SHA1 (patch-Source_WebCore_platform_audio_gstreamer_AudioSourceProviderGStreamer.cpp) = d398e26a13b3c28088396f1390581ce6d27f2c70
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 43f423af652533a64d0793ec6d15150b908da0f8
+SHA1 (patch-Source_WebCore_platform_graphics_gstreamer_ImageDecoderGStreamer.cpp) = 11ee606b7975c8d2e1318c19b49abc83cf6dc76e
 SHA1 (patch-Source_WebCore_platform_network_DNS.h) = dd9fb67aae0029c6a452e7d8f09eeed1235d5700
 SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = e43015aa76b38848079bc598ca8af9cfc585b99b
 SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
diff --git a/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp b/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp
new file mode 100644
index 0000000000..183bb7d1f9
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+ error: braces around scalar initializer for type  gboolean (*)(GstAppSink*, GstQuery*, gpointer)' {aka 'int (*)(_GstAppSink*, _GstQuery*, void*)'}
+     };
+     ^
+--- Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp.orig	2023-02-14 18:01:07.357508400 +0900
++++ Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp	2024-06-23 21:17:02.539869040 +0900
+@@ -287,7 +287,7 @@ void AudioFileReader::handleNewDeinterle
+         // new_event
+         nullptr,
+ #endif
+-        { nullptr }
++        nullptr
+     };
+     gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, nullptr);
+ 
diff --git a/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioSourceProviderGStreamer.cpp b/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioSourceProviderGStreamer.cpp
new file mode 100644
index 0000000000..af071e810c
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioSourceProviderGStreamer.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+ error: braces around scalar initializer for type 'gboolean (*)(GstAppSink*, GstQuery*, gpointer)' {aka 'int (*)(_GstAppSink*, _GstQuery*, void*)'}
+     };
+
+--- Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp.orig	2024-06-23 20:38:51.854577969 +0900
++++ Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp	2024-06-23 20:39:25.862340965 +0900
+@@ -363,7 +363,7 @@ void AudioSourceProviderGStreamer::handl
+         // new_event
+         nullptr,
+ #endif
+-        { nullptr }
++        nullptr
+     };
+     gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, nullptr);
+     // The provider client might request samples faster than the current clock speed, so this sink
diff --git a/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_ImageDecoderGStreamer.cpp b/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_ImageDecoderGStreamer.cpp
new file mode 100644
index 0000000000..61d2286fef
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_ImageDecoderGStreamer.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+error: braces around scalar initializer for type 'gboolean (*)(GstAppSink*, GstQuery*, gpointer)' {aka 'int (*)(_GstAppSink*, _GstQuery*, void*)'}
+     };
+     ^
+
+--- Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp.orig	2023-02-14 18:01:07.365508600 +0900
++++ Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp	2024-06-23 21:02:18.568537756 +0900
+@@ -274,7 +274,7 @@ void ImageDecoderGStreamer::InnerDecoder
+         // new_event
+         nullptr,
+ #endif
+-        { nullptr }
++        nullptr
+     };
+     gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, &m_decoder, nullptr);
+ 


Home | Main Index | Thread Index | Old Index