From 97e361a99d850038f94022f3e9e0dbd1570b7866 Mon Sep 17 00:00:00 2001
From: Johann Garces <johannmg@fb.com>
Date: Thu, 8 Oct 2020 11:10:23 -0700
Subject: [PATCH] CI: Remove duplicate QtNetwork addition

---
 .github/workflows/main.yml   | 10 +---------
 CI/full-build-macos.sh       | 11 +----------
 CI/install/osx/packageApp.sh | 12 ------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bf3fbfb83a52dd..993d2486730b2e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -222,15 +222,7 @@ jobs:
             -x ./OBS.app/Contents/PlugIns/obs-outputs.so
 
           mv ./libobs-opengl/libobs-opengl.so ./OBS.app/Contents/Frameworks
-
-          cp -R /tmp/obsdeps/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks
-          chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework
-          rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers
-          rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/
-          chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist
-          install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
-          install_name_tool -change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
-
+          
           sudo cp -R "${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/
           sudo chown -R $(whoami) ./OBS.app/Contents/Frameworks/
 
diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh
index 5772bfe3282b3d..ec24576586fa75 100755
--- a/CI/full-build-macos.sh
+++ b/CI/full-build-macos.sh
@@ -313,15 +313,6 @@ bundle_dylibs() {
         -x ./OBS.app/Contents/PlugIns/obs-outputs.so
     step "Move libobs-opengl to final destination"
     cp ./libobs-opengl/libobs-opengl.so ./OBS.app/Contents/Frameworks
-
-    step "Copy QtNetwork for plugin support"
-    cp -R /tmp/obsdeps/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks
-    chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework
-    rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers
-    rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/
-    chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist
-    install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
-    install_name_tool -change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
 }
 
 install_frameworks() {
@@ -647,4 +638,4 @@ obs-build-main() {
     cleanup
 }
 
-obs-build-main $*
\ No newline at end of file
+obs-build-main $*
diff --git a/CI/install/osx/packageApp.sh b/CI/install/osx/packageApp.sh
index ba8fa6045e9716..89db0913e38b7b 100755
--- a/CI/install/osx/packageApp.sh
+++ b/CI/install/osx/packageApp.sh
@@ -48,18 +48,6 @@ cp ../CI/install/osx/Info.plist ./OBS.app/Contents
 
 mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks
 
-rm -f -r ./OBS.app/Contents/Frameworks/QtNetwork.framework
-
-# put qt network in here becasuse streamdeck uses it
-cp -R /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks
-chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework
-rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers
-rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/
-chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist
-install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
-install_name_tool -change /usr/local/Cellar/qt/5.14.1/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork
-
-
 # decklink ui qt
 install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so
 install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so