[rpms/obs-studio] epel9-next: Drop unused patch on obs-websocket

[rpms/obs-studio] epel9-next: Drop unused patch on obs-websocket

[Neal Gompa]

            A new commit has been pushed.

            Repo   : rpms/obs-studio
            Branch : epel9-next
            Commit : b943bad8e273f1a537413d907461bf27d63809e9
            Author : Neal Gompa <ngompa@fedoraproject.org>
            Date   : 2023-09-13T07:37:01-04:00
            Stats  : +0/-109 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/obs-studio/c/b943bad8e273f1a537413d907461bf27d63809e9?branch=epel9-next

            Log:
            Drop unused patch on obs-websocket

Upstream solved this problem differently.

---
diff --git a/obs-studio-websocket-use-system-qrcodegencpp.patch b/obs-studio-websocket-use-system-qrcodegencpp.patch
deleted file mode 100644
index 736a77c..0000000
--- a/obs-studio-websocket-use-system-qrcodegencpp.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 1e2fc3ade587a7a7c24e4238996ca382c4c0f719 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa@fedoraproject.org>
-Date: Tue, 27 Dec 2022 09:15:08 -0500
-Subject: [PATCH] CMake: Use the system version of QRCodeGenCPP dependency
-
----
- CMakeLists.txt            |  9 +++++++--
- cmake/legacy.cmake        | 12 ++++++++----
- src/forms/ConnectInfo.cpp |  2 +-
- 3 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/obs-websocket/CMakeLists.txt b/plugins/obs-websocket/CMakeLists.txt
-index 871f92b..288cc87 100644
---- a/plugins/obs-websocket/CMakeLists.txt
-+++ b/plugins/obs-websocket/CMakeLists.txt
-@@ -13,7 +13,7 @@ endif()
- 
- # Submodule deps check
- if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp")
--  message(FATAL_ERROR "obs-websocket submodule deps not available.")
-+  message(INFO "obs-websocket submodule deps not available.")
- endif()
- 
- # Find Qt
-@@ -22,6 +22,9 @@ find_qt(COMPONENTS Core Widgets Svg Network)
- # Find nlohmann JSON
- find_package(nlohmann_json 3 REQUIRED)
- 
-+# Find qrcodegencpp
-+find_package(qrcodegencpp REQUIRED)
-+
- # Find WebSocket++
- find_package(Websocketpp 0.8 REQUIRED)
- 
-@@ -157,7 +160,9 @@ target_link_libraries(
-           Qt::Network
-           nlohmann_json::nlohmann_json
-           Websocketpp::Websocketpp
--          Asio::Asio)
-+          Asio::Asio
-+          qrcodegencpp
-+          )
- 
- set_target_properties_obs(
-   obs-websocket
-diff --git a/plugins/obs-websocket/cmake/legacy.cmake b/plugins/obs-websocket/cmake/legacy.cmake
-index ab25ec7..98ca704 100644
---- a/plugins/obs-websocket/cmake/legacy.cmake
-+++ b/plugins/obs-websocket/cmake/legacy.cmake
-@@ -10,7 +10,7 @@ endif()
- 
- # Submodule deps check
- if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp)
--  obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
-+  obs_status(INFO "obs-websocket submodule deps not available.")
- endif()
- 
- # Plugin tests flag
-@@ -22,6 +22,9 @@ find_qt(COMPONENTS Core Widgets Svg Network)
- # Find nlohmann JSON
- find_package(nlohmann_json 3 REQUIRED)
- 
-+# Find qrcodegencpp
-+find_package(qrcodegencpp REQUIRED)
-+
- # Find WebSocket++
- find_package(Websocketpp 0.8 REQUIRED)
- 
-@@ -129,8 +132,7 @@ target_sources(
-           src/utils/Compat.cpp
-           src/utils/Compat.h
-           src/utils/Utils.h
--          deps/qr/cpp/QrCode.cpp
--          deps/qr/cpp/QrCode.hpp)
-+          )
- 
- target_link_libraries(
-   obs-websocket
-@@ -142,7 +144,9 @@ target_link_libraries(
-           Qt::Network
-           nlohmann_json::nlohmann_json
-           Websocketpp::Websocketpp
--          Asio::Asio)
-+          Asio::Asio
-+          qrcodegencpp
-+          )
- 
- target_compile_features(obs-websocket PRIVATE cxx_std_17)
- 
-diff --git a/plugins/obs-websocket/src/forms/ConnectInfo.cpp b/plugins/obs-websocket/src/forms/ConnectInfo.cpp
-index ddb979d..89a04c4 100644
---- a/plugins/obs-websocket/src/forms/ConnectInfo.cpp
-+++ b/plugins/obs-websocket/src/forms/ConnectInfo.cpp
-@@ -21,9 +21,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
- #include <QPainter>
- #include <QUrl>
- #include <obs-module.h>
-+#include <qrcodegencpp/QrCode.hpp>
- 
- #include "ConnectInfo.h"
--#include "../../deps/qr/cpp/QrCode.hpp"
- #include "../obs-websocket.h"
- #include "../Config.h"
- #include "../utils/Platform.h"
--- 
-2.39.2
-

diff --git a/obs-studio.spec b/obs-studio.spec
index 6fad5bd..b176fa7 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -61,8 +61,6 @@ Patch0204:      0204-obs-qsv11-Add-license-declaration-file.patch
 
 
 # Downstream Fedora patches
-## Use system qrcodegencpp
-#Patch1001:      obs-studio-websocket-use-system-qrcodegencpp.patch
 ## Use fdk-aac by default
 Patch1002:      obs-studio-UI-use-fdk-aac-by-default.patch