From 8e60f33e65f9bb3800970259208533f25b2a3697 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Thu, 17 Nov 2016 16:22:45 +0000
Subject: [PATCH] Ensure the Mac Appbundle builds properly with QtWebEngine.

---
 pkg/mac/Info.plist-template_Qt5 | 44 ++++++++++++++++-----------------
 pkg/mac/codesign-bundle.sh      |  4 ++-
 pkg/mac/complete-bundle.sh      |  8 ++++++
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/pkg/mac/Info.plist-template_Qt5 b/pkg/mac/Info.plist-template_Qt5
index 54ee7a6c3..534c6fbb0 100644
--- a/pkg/mac/Info.plist-template_Qt5
+++ b/pkg/mac/Info.plist-template_Qt5
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>__SHORT_VERSION__</string>
-	<key>CFBundleVersion</key>
-	<string>__FULL_VERSION__</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleExecutable</key>
-	<string>__FRAMEWORK_NAME__</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.qt-project.__FRAMEWORK_NAME__</string>
-	<key>NOTE</key>
-	<string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>__SHORT_VERSION__</string>
+	<key>CFBundleVersion</key>
+	<string>__FULL_VERSION__</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>__FRAMEWORK_NAME__</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.qt-project.Qt.__FRAMEWORK_NAME__</string>
+	<key>NOTE</key>
+	<string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
+</dict>
+</plist>
diff --git a/pkg/mac/codesign-bundle.sh b/pkg/mac/codesign-bundle.sh
index 4dda0a81e..360c25364 100755
--- a/pkg/mac/codesign-bundle.sh
+++ b/pkg/mac/codesign-bundle.sh
@@ -24,7 +24,9 @@ find "${BUNDLE}/Contents/Frameworks"/*framework -type d -name "Versions" | while
   ln -s $VERSION_NUMBER Current
 
   # Create "Resources" subdirectory
-  mkdir Current/Resources
+  if [ ! -d Current/Resources ]; then
+    mkdir Current/Resources
+  fi
 
   cd "${MYDIR}"
 done
diff --git a/pkg/mac/complete-bundle.sh b/pkg/mac/complete-bundle.sh
index f954d1154..a476f30c4 100755
--- a/pkg/mac/complete-bundle.sh
+++ b/pkg/mac/complete-bundle.sh
@@ -84,7 +84,15 @@ function CompleteSingleApp() {
 					# Copy the QT and Python framework
 					if echo $lib | grep Qt > /dev/null ; then
 						test -d $lib_loc || mkdir -p $lib_loc
+						echo Copying -R $QTDIR/lib/$qtfw_path/$lib_bn to $lib_loc/
 						cp $QTDIR/lib/$qtfw_path/$lib_bn $lib_loc/
+
+						if [ "$lib_bn" = "QtWebEngineCore" ]; then
+						    # QtWebEngineCore has some required resources
+						    cp -R $QTDIR/lib/$qtfw_path/Resources $lib_loc/
+						    cp -R $QTDIR/lib/$qtfw_path/Helpers $lib_loc/
+						    ln -s Versions/Current/Helpers "$bundle/Contents/Frameworks/QtWebEngineCore.Framework/Helpers"
+						fi
 					elif echo $lib | grep Python > /dev/null ; then
 						test -d $lib_loc || mkdir -p $lib_loc
 						cp -R "$lib" "$lib_loc/$lib_bn"