[neon/qt6/qt6-multimedia/Neon/release] debian/patches: drop patch that is in 6.8.1

Carlos De Maine null at kde.org
Sat Dec 7 21:18:54 GMT 2024


Git commit ba8a6c8c218cd65db61bb36f701e4a0223bdfd5c by Carlos De Maine.
Committed on 07/12/2024 at 21:18.
Pushed by carlosdem into branch 'Neon/release'.

drop patch that is in 6.8.1

D  +0    -15   debian/patches/fix_unity_build.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-multimedia/-/commit/ba8a6c8c218cd65db61bb36f701e4a0223bdfd5c

diff --git a/debian/patches/fix_unity_build.diff b/debian/patches/fix_unity_build.diff
deleted file mode 100644
index 23a62bb..0000000
--- a/debian/patches/fix_unity_build.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
-index 107000f9d..1981ea1b0 100644
---- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt
-+++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
-@@ -106,6 +106,10 @@ if (QT_FEATURE_pipewire)
-             qpipewirecapture.cpp qpipewirecapture_p.h
-             qpipewirecapturehelper.cpp qpipewirecapturehelper_p.h
-             symbolstubs/qffmpegsymbols-pipewire.cpp
-+
-+        NO_UNITY_BUILD_SOURCES
-+            # conflict with qffmpegsymbols-va.cpp: class SymbolsResolverImpl
-+            symbolstubs/qffmpegsymbols-pipewire.cpp
-         LIBRARIES
-             Qt::DBus
-     )
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0cb010b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_unity_build.diff


More information about the Neon-commits mailing list