[neon/extras/phonon/Neon/unstable] debian: Revert "Revert "drop patch""

[Carlos De Maine]

Git commit 828a2ffc6ce3be958fda372549bfb443aa334e99 by Carlos De Maine.
Committed on 19/08/2023 at 22:59.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Revert "drop patch""

This reverts commit a757e9855fbdb31934a01bee01c0dff9f72dc1ad.

D  +0    -29   debian/patches/either_or.diff
M  +0    -1    debian/patches/series
M  +1    -1    debian/rules

https://invent.kde.org/neon/extras/phonon/-/commit/828a2ffc6ce3be958fda372549bfb443aa334e99

diff --git a/debian/patches/either_or.diff b/debian/patches/either_or.diff
deleted file mode 100644
index 6bbee2b..0000000
--- a/debian/patches/either_or.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7cae88a35c7732932cbb7585db3f88e89a42f8fb..5c0c4ff840b3d047fb9a8a85af12ecaa1df10c24 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,9 @@ option(PHONON_BUILD_SETTINGS "Build the settings GUI" ON)
- 
- option(PHONON_NO_CAPTURE "Disable the capture capabilities")
- 
-+option(BUILD_QT5 "Build for Qt5" ON)
-+option(BUILD_QT6 "Build for Qt6" ON)
-+
- # Not set by ECM (yet)
- set(CMAKE_AUTOUIC TRUE)
- set(CMAKE_AUTORCC TRUE)
-@@ -33,7 +36,13 @@ include(ECMGeneratePkgConfigFile)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
- 
--set(VERSIONS "5;6")
-+if (${BUILD_QT6})
-+set(VERSIONS "6")
-+endif()
-+if (${BUILD_QT5})
-+set(VERSIONS "5")
-+endif()
-+
- # CI is stupid and doesn't allow us to set CMAKE options per build variant
- if ($ENV{CI_JOB_NAME_SLUG} MATCHES "qt5")
-     set(VERSIONS "5")
diff --git a/debian/patches/series b/debian/patches/series
index b58af05..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-either_or.diff
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index a1a6504..5663c32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 include /usr/share/dpkg/pkg-info.mk
 
-CMAKE_ARGS = -DBUILD_QT5=ON -DBUILD_QT6=OFF
+CMAKE_ARGS = -PHONON_BUILD_QT5
 
 %:
 	dh $@ --with kf5