[krita/nimmy/opengl-patch] 3rdparty/ext_qt: Update the macdeploy-qt patch for Qt 5.7.0
Boudewijn Rempt
boud at valdyas.org
Sat Sep 3 14:21:36 UTC 2016
Git commit c37d2ffcbc26a43128ed98c058e875b738d351d5 by Boudewijn Rempt.
Committed on 03/09/2016 at 14:20.
Pushed by rempt into branch 'nimmy/opengl-patch'.
Update the macdeploy-qt patch for Qt 5.7.0
I really wish the Qt people would accept the patch...
CCMAIL:kde-mac at kde.org
M +3 -3 3rdparty/ext_qt/CMakeLists.txt
M +19 -26 3rdparty/ext_qt/macdeploy-qt.diff
http://commits.kde.org/krita/c37d2ffcbc26a43128ed98c058e875b738d351d5
diff --git a/3rdparty/ext_qt/CMakeLists.txt b/3rdparty/ext_qt/CMakeLists.txt
index de5451d..484a2c6 100644
--- a/3rdparty/ext_qt/CMakeLists.txt
+++ b/3rdparty/ext_qt/CMakeLists.txt
@@ -31,10 +31,10 @@ else()
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://download.qt.io/official_releases/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.tar.gz
URL_MD5 9a46cce61fc64c20c3ac0a0e0fa41b42
- PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff
- ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gerrit-166202.diff
+ PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gerrit-166202.diff
+ COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff
INSTALL_DIR ${EXTPREFIX_qt}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure -confirm-license -opensource -nomake examples -no-openssl -no-compile-examples -qt-freetype -qt-harfbuzz -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -prefix ${EXTPREFIX_qt}
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure -confirm-license -opensource -nomake examples -no-openssl -no-compile-examples -qt-freetype -qt-harfbuzz -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -prefix ${EXTPREFIX_qt}
BUILD_COMMAND make
INSTALL_COMMAND make install
UPDATE_COMMAND ""
diff --git a/3rdparty/ext_qt/macdeploy-qt.diff b/3rdparty/ext_qt/macdeploy-qt.diff
index ebad0e8..8b6ed78 100644
--- a/3rdparty/ext_qt/macdeploy-qt.diff
+++ b/3rdparty/ext_qt/macdeploy-qt.diff
@@ -1,8 +1,8 @@
diff --git a/qttools/src/macdeployqt/macdeployqt/main.cpp b/qttools/src/macdeployqt/macdeployqt/main.cpp
-index 81639f2..a7b28d1 100644
+index 2e6ad0c..a2c4865 100644
--- a/qttools/src/macdeployqt/macdeployqt/main.cpp
+++ b/qttools/src/macdeployqt/macdeployqt/main.cpp
-@@ -57,6 +57,7 @@ int main(int argc, char **argv)
+@@ -52,6 +52,7 @@ int main(int argc, char **argv)
qDebug() << " -always-overwrite : Copy files even if the target file exists";
qDebug() << " -codesign=<ident> : Run codesign with the given identity on all executables";
qDebug() << " -appstore-compliant: Skip deployment of components that use private API";
@@ -10,29 +10,22 @@ index 81639f2..a7b28d1 100644
qDebug() << "";
qDebug() << "macdeployqt takes an application bundle as input and makes it";
qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
-@@ -96,6 +97,7 @@ int main(int argc, char **argv)
- extern bool runCodesign;
- extern QString codesignIdentiy;
- extern bool appstoreCompliant;
-+ QStringList extraPluginDirectories;
-
- for (int i = 2; i < argc; ++i) {
- QByteArray argument = QByteArray(argv[i]);
-@@ -151,6 +153,13 @@ int main(int argc, char **argv)
- } else if (argument == QByteArray("-appstore-compliant")) {
+@@ -153,6 +154,14 @@ int main(int argc, char **argv)
LogDebug() << "Argument found:" << argument;
- appstoreCompliant = true;
-+ } else if (argument.startsWith(QByteArray("-extra-plugins"))) {
-+ LogDebug() << "Argument found:" << argument;
-+ int index = argument.indexOf('=');
-+ if (index == -1)
-+ LogError() << "Missing extra plugins directory";
-+ else
-+ extraPluginDirectories << argument.mid(index+1);
+ deployFramework = true;
+
++ } else if (argument.startsWith(QByteArray("-extra-plugins"))) {
++ LogDebug() << "Argument found:" << argument;
++ int index = argument.indexOf('=');
++ if (index == -1)
++ LogError() << "Missing extra plugins directory";
++ else
++ extraPluginDirectories << argument.mid(index+1);
++
} else if (argument.startsWith("-")) {
LogError() << "Unknown argument" << argument << "\n";
return 1;
-@@ -178,10 +187,13 @@ int main(int argc, char **argv)
+@@ -183,10 +192,13 @@ int main(int argc, char **argv)
deploymentInfo.deployedFrameworks = deploymentInfo.deployedFrameworks.toSet().toList();
}
@@ -49,10 +42,10 @@ index 81639f2..a7b28d1 100644
}
diff --git a/qttools/src/macdeployqt/shared/shared.cpp b/qttools/src/macdeployqt/shared/shared.cpp
-index d20b219..4a9aa1f 100644
+index 5577265..a590039 100644
--- a/qttools/src/macdeployqt/shared/shared.cpp
+++ b/qttools/src/macdeployqt/shared/shared.cpp
-@@ -1020,6 +1020,43 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
+@@ -1070,6 +1070,43 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
}
}
@@ -96,7 +89,7 @@ index d20b219..4a9aa1f 100644
void createQtConf(const QString &appBundlePath)
{
// Set Plugins and imports paths. These are relative to App.app/Contents.
-@@ -1061,6 +1098,16 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo,
+@@ -1111,6 +1148,16 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo,
deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs);
}
@@ -114,10 +107,10 @@ index d20b219..4a9aa1f 100644
{
QString importDestinationPath = appBundlePath + "/Contents/Resources/qml/" + importName;
diff --git a/qttools/src/macdeployqt/shared/shared.h b/qttools/src/macdeployqt/shared/shared.h
-index ea678c2..f10efd3 100644
+index c173846..cceac3a 100644
--- a/qttools/src/macdeployqt/shared/shared.h
+++ b/qttools/src/macdeployqt/shared/shared.h
-@@ -100,6 +100,7 @@ DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringLis
+@@ -116,6 +116,7 @@ DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringLis
DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs, bool useLoaderPath);
void createQtConf(const QString &appBundlePath);
void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs);
More information about the kde-mac
mailing list