[Pkg-owncloud-commits] [owncloud-client] 267/484: macdeployqt: Hack to make Qt 5.5 work

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 00708353307e236db071b1421ffe1f0a1e3457ee
Author: Markus Goetz <markus at woboq.com>
Date:   Thu Nov 5 17:19:49 2015 +0100

    macdeployqt: Hack to make Qt 5.5 work
---
 admin/osx/macdeployqt.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py
index 3d3fe49..60ff4b9 100755
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -144,6 +144,10 @@ def FindFramework(path):
   search_pathes = FRAMEWORK_SEARCH_PATH
   search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
   for search_path in search_pathes:
+    # The following two lines are needed for a custom built Qt from version 5.5 on, possibly not for the one from the Qt SDK.
+    # Looks like the upstream macdeployqt also had an issue there https://bugreports.qt.io/browse/QTBUG-47868
+    if path.find( "\@rpath/"):
+      path = path.replace("@rpath/", "")
     abs_path = os.path.join(search_path, path)
     if os.path.exists(abs_path):
       return abs_path

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git