[neon/neon-packaging/kpipewire/Neon/stable_jammy] debian/patches: Revert "add kpipewire patches to stop breakage on old ubuntu pipewire"

[Jonathan Riddell]

Git commit 30799664bc0989d6c2285b82750f0af3f42ef660 by Jonathan Riddell.
Committed on 08/10/2024 at 09:31.
Pushed by jriddell into branch 'Neon/stable_jammy'.

Revert "add kpipewire patches to stop breakage on old ubuntu pipewire"

This reverts commit aff2d865b666ed496b6bd8cd764cadd58e880c13.

D  +0    -14   debian/patches/pipewire1.diff
D  +0    -24   debian/patches/pipewire2.diff
D  +0    -2    debian/patches/series

https://invent.kde.org/neon/neon-packaging/kpipewire/-/commit/30799664bc0989d6c2285b82750f0af3f42ef660

diff --git a/debian/patches/pipewire1.diff b/debian/patches/pipewire1.diff
deleted file mode 100644
index 7982076..0000000
--- a/debian/patches/pipewire1.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/pipewiresourcestream.cpp b/src/pipewiresourcestream.cpp
-index 3da6c2a..6f8242a 100644
---- a/src/pipewiresourcestream.cpp
-+++ b/src/pipewiresourcestream.cpp
-@@ -515,9 +515,6 @@ QList<const spa_pod *> PipeWireSourceStream::createFormatsParams(spa_pod_builder
- 
-         params += buildFormat(&podBuilder, it.key(), {}, withDontFixate, d->maxFramerate);
-     }
--
--    // BUG 492400: Workaround for pipewire < 0.3.49 https://github.com/PipeWire/pipewire/commit/8646117374df6fa3b73f63f9b35cda78a6aaa2f4
--    params.removeAll(nullptr);
-     return params;
- }
- 
diff --git a/debian/patches/pipewire2.diff b/debian/patches/pipewire2.diff
deleted file mode 100644
index 2f51bde..0000000
--- a/debian/patches/pipewire2.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/pipewirecore.cpp b/src/pipewirecore.cpp
-index f9d70e7..82c3e18 100644
---- a/src/pipewirecore.cpp
-+++ b/src/pipewirecore.cpp
-@@ -16,8 +16,6 @@
- 
- #include "logging.h"
- 
--using namespace Qt::StringLiterals;
--
- pw_core_events PipeWireCore::s_pwCoreEvents = {
-     .version = PW_VERSION_CORE_EVENTS,
-     .info = &PipeWireCore::onCoreInfo,
-@@ -85,10 +83,6 @@ PipeWireCore::~PipeWireCore()
- bool PipeWireCore::init(int fd)
- {
-     m_pwMainLoop = pw_loop_new(nullptr);
--    if (!m_pwMainLoop) {
--        m_error = u"Invalid PipeWire installation. See https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3296 for more details."_s;
--        return false;
--    }
-     pw_loop_enter(m_pwMainLoop);
- 
-     QSocketNotifier *notifier = new QSocketNotifier(pw_loop_get_fd(m_pwMainLoop), QSocketNotifier::Read, this);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 036157c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-pipewire1.diff
-pipewire2.diff