From 23fa14cb117ea1cee2213f7f1e278dbb33eee61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20B=C3=B6hning?=
 <1497707+bohning@users.noreply.github.com>
Date: Sun, 5 May 2024 08:47:17 +0200
Subject: [PATCH] Improve linker directives to avoid fixing rpaths.

---
 .github/workflows/main.yml | 16 +---------------
 src/UltraStar-Manager.pro  |  4 ++--
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5533fe0..78c2a65 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -110,22 +110,8 @@ jobs:
         run: |
           brew install qt
           brew install taglib
-          brew install mediainfo;
+          brew install libmediainfo
           brew install create-dmg
-      - name: Fix Qt lib rpaths # see: https://github.com/orgs/Homebrew/discussions/2823#discussioncomment-2010340)
-        run: |
-          install_name_tool -id '@rpath/QtCore.framework/Versions/A/QtCore' /usr/local/lib/QtCore.framework/Versions/A/QtCore
-          install_name_tool -id '@rpath/QtGui.framework/Versions/A/QtGui' /usr/local/lib/QtGui.framework/Versions/A/QtGui
-          install_name_tool -id '@rpath/QtNetwork.framework/Versions/A/QtNetwork' /usr/local/lib/QtNetwork.framework/Versions/A/QtNetwork
-          install_name_tool -id '@rpath/QtWidgets.framework/Versions/A/QtWidgets' /usr/local/lib/QtWidgets.framework/Versions/A/QtWidgets
-          install_name_tool -id '@rpath/QtPdf.framework/Versions/A/QtPdf' /usr/local/lib/QtPdf.framework/Versions/A/QtPdf
-          install_name_tool -id '@rpath/QtSvg.framework/Versions/A/QtSvg' /usr/local/lib/QtSvg.framework/Versions/A/QtSvg
-          install_name_tool -id '@rpath/QtVirtualKeyboard.framework/Versions/A/QtVirtualKeyboard' /usr/local/lib/QtVirtualKeyboard.framework/Versions/A/QtVirtualKeyboard
-          install_name_tool -id '@rpath/QtQuick.framework/Versions/A/QtQuick' /usr/local/lib/QtQuick.framework/Versions/A/QtQuick
-          install_name_tool -id '@rpath/QtQmlModels.framework/Versions/A/QtQmlModels' /usr/local/lib/QtQmlModels.framework/Versions/A/QtQmlModels
-          install_name_tool -id '@rpath/QtQml.framework/Versions/A/QtQml' /usr/local/lib/QtQml.framework/Versions/A/QtQml
-          install_name_tool -id '@rpath/QtOpenGL.framework/Versions/A/QtOpenGL' /usr/local/lib/QtOpenGL.framework/Versions/A/QtOpenGL
-          install_name_tool -id '@rpath/QtMultimedia.framework/Versions/A/QtMultimedia' /usr/local/lib/QtMultimedia.framework/Versions/A/QtMultimedia
       - name: Build plugins
         run: |
           cd src/plugins/audiotag/
diff --git a/src/UltraStar-Manager.pro b/src/UltraStar-Manager.pro
index 3dfd0d3..b21fc09 100644
--- a/src/UltraStar-Manager.pro
+++ b/src/UltraStar-Manager.pro
@@ -265,14 +265,14 @@ macx {
 	LIBS += -L"../lib/MacOS" \
 		-lcld2
 
-	PKG_CONFIG = /usr/local/bin/pkg-config
+	PKG_CONFIG = $$system(brew --prefix)/bin/pkg-config
 	CONFIG += link_pkgconfig
 	PKGCONFIG += taglib
 	PKGCONFIG += libmediainfo
 
 	CONFIG += app_bundle
 	#QMAKE_RPATHDIR += @executable_path/../Frameworks
-	QMAKE_LFLAGS += -Wl,-rpath,@executable_path/../Frameworks/
+	#QMAKE_LFLAGS += -Wl,-rpath,@executable_path/../Frameworks/
 	
 	QMAKE_MACOSX_DEPLOYMENT_TARGET = 12.0