From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fvogt@suse.de> Date: Wed, 7 Apr 2021 13:38:09 +0200 Subject: [PATCH] Remove invalid g_object declarations to fix build with glib >= 2.68 g_object_ref_sink is defined as a macro meanwhile and so the build fails. Just remove the declarations, glib.h is included anyway. --- Source/WTF/wtf/glib/GRefPtr.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h index 06133d82cb35..d9a1d2f145f5 100644 --- a/Source/WTF/wtf/glib/GRefPtr.h +++ b/Source/WTF/wtf/glib/GRefPtr.h @@ -29,9 +29,6 @@ #include <algorithm> #include <glib.h> -extern "C" void g_object_unref(gpointer); -extern "C" gpointer g_object_ref_sink(gpointer); - namespace WTF { enum GRefPtrAdoptType { GRefPtrAdopt }; --- qtwebkit-opensource-src-5.212/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp.old 2020-09-22 06:30:04.000000000 -0500 +++ qtwebkit-opensource-src-5.212/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2022-06-12 02:35:30.360000000 -0500 @@ -230,7 +230,7 @@ [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { return static_cast<AudioFileReader*>(userData)->handleSample(sink); }, - { nullptr } + nullptr }; gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);