From 2cacd479ff9612c460ac052f219ca9ad7d46b6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Jun 2025 18:01:10 -0700 Subject: [PATCH] qt6Packages.qtwebengine: drop upstreamed patch --- .../qt-6/modules/qtwebengine/default.nix | 2 -- .../modules/qtwebengine/pipewire-1.4.patch | 20 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 76c6221cb664..710c53091de1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -111,8 +111,6 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ./locales-path.patch - # Fix build with Pipewire 1.4 - ./pipewire-1.4.patch # Reproducibility QTBUG-136068 ./gn-object-sorted.patch ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch deleted file mode 100644 index d034eee06b5f..000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, - .param = OnNodeParam, - }; - -- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); -+ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); - } - - // static -@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) { - uint32_t id = info->params[i].id; - if (id == SPA_PARAM_EnumFormat && - info->params[i].flags & SPA_PARAM_INFO_READ) { -- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); -+ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); - break; - } - }