diff --git a/dev-utils/_windows/dbgview/dbgview.py b/dev-utils/_windows/dbgview/dbgview.py index 34a81661..52f439de 100644 --- a/dev-utils/_windows/dbgview/dbgview.py +++ b/dev-utils/_windows/dbgview/dbgview.py @@ -1,18 +1,17 @@ import info class subinfo(info.infoclass): def setTargets(self): - self.targets['4.81'] = 'http://download.sysinternals.com/files/DebugView.zip' - self.targetInstallPath['4.81'] = "dev-utils/bin" - self.targetDigests['4.81'] = ( - ['98edbe8d5e10d8c81f91c1d79668df8dd3924abd6bb64e3450613c43bf0c60f6'], CraftHash.HashAlgorithm.SHA256) - self.defaultTarget = '4.81' + self.targets['4.90'] = 'http://download.sysinternals.com/files/DebugView.zip' + self.targetInstallPath['4.90'] = "dev-utils/bin" + self.targetDigests['4.90'] = (['9ccac2978ef0ad16611dfeb15f0fb5f3c554882e1b193c8eebd16ce58a2fed4b'], CraftHash.HashAlgorithm.SHA256) + self.defaultTarget = '4.90' from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__(self): BinaryPackageBase.__init__(self) diff --git a/libs/qt5/qtbase/do-not-spawn-console-qprocess-startdetached.patch b/libs/qt5/qtbase/do-not-spawn-console-qprocess-startdetached.patch deleted file mode 100644 index 65b71ff9..00000000 --- a/libs/qt5/qtbase/do-not-spawn-console-qprocess-startdetached.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp -index 592bee5..de1a259 100644 ---- a/src/corelib/io/qprocess_win.cpp -+++ b/src/corelib/io/qprocess_win.cpp -@@ -858,16 +858,17 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a - bool success = false; - PROCESS_INFORMATION pinfo; - -+ DWORD dwCreationFlags = (GetConsoleWindow() ? 0 : CREATE_NO_WINDOW); -+ dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT; - STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0, - (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, - (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - success = CreateProcess(0, (wchar_t*)args.utf16(), -- 0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0, -+ 0, 0, FALSE, dwCreationFlags, 0, - workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(), - &startupInfo, &pinfo); -- - if (success) { - CloseHandle(pinfo.hThread); - CloseHandle(pinfo.hProcess); diff --git a/libs/qt5/qtbase/fix-angle-mingw-5.6.2-20161027.diff b/libs/qt5/qtbase/fix-angle-mingw-5.6.2-20161027.diff deleted file mode 100644 index 10879683..00000000 --- a/libs/qt5/qtbase/fix-angle-mingw-5.6.2-20161027.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x'*\.o' qtbase-opensource-src-5.6.2.orig/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp qtbase-opensource-src-5.6.2/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp ---- qtbase-opensource-src-5.6.2.orig/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp 2016-09-16 07:49:42.000000000 +0200 -+++ qtbase-opensource-src-5.6.2/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp 2016-10-27 10:01:35.665229000 +0200 -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/d3d11/Blit11.h" - - #include -+#include - - #include "libANGLE/renderer/d3d/d3d11/Renderer11.h" - #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h" - diff --git a/libs/qt5/qtbase/hack-fix-syncqt.patch b/libs/qt5/qtbase/hack-fix-syncqt.patch deleted file mode 100644 index c70e5f65..00000000 --- a/libs/qt5/qtbase/hack-fix-syncqt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/syncqt.pl b/bin/syncqt.pl -index 372aa2b331..bcb0562d26 100755 ---- a/bin/syncqt.pl -+++ b/bin/syncqt.pl -@@ -781,7 +781,7 @@ while ( @ARGV ) { - $val = shift @ARGV; - } elsif($arg eq "-minimal") { - $var = "minimal"; -- $val = "yes"; -+ $val = "no"; - } elsif($arg eq "-private") { - $var = "create_private_headers"; - $val = "yes"; diff --git a/libs/qt5/qtbase/qmake-fix-install-root.patch b/libs/qt5/qtbase/qmake-fix-install-root.patch deleted file mode 100644 index 966c60e1..00000000 --- a/libs/qt5/qtbase/qmake-fix-install-root.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index a596474..b5e26f3 100644 ---- a/qmake/generators/makefile.cpp -+++ b/qmake/generators/makefile.cpp -@@ -1183,7 +1183,7 @@ MakefileGenerator::filePrefixRoot(const QString &root, const QString &path) - { - QString ret(path); - if(path.length() > 2 && path[1] == ':') //c:\foo -- ret.insert(2, root); -+ ret.replace(0, 2, root); - else - ret.prepend(root); - while (ret.endsWith('\\')) diff --git a/libs/qt5/qtbase/qtbase-5.6.patch b/libs/qt5/qtbase/qtbase-5.6.patch deleted file mode 100644 index c08f32ea..00000000 --- a/libs/qt5/qtbase/qtbase-5.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mkspecs/features/qt_build_extra.prf b/mkspecs/features/qt_build_extra.prf -index 378f5bb..4e53f8c 100644 ---- a/mkspecs/features/qt_build_extra.prf -+++ b/mkspecs/features/qt_build_extra.prf -@@ -13,7 +13,7 @@ equals(TEMPLATE, subdirs): return() - - # It's likely that these extra flags will be wrong for host builds, - # and the bootstrapped tools usually don't need them anyway. --host_build:force_bootstrap: return() -+# host_build:force_bootstrap: return() - - # The headersclean check needs defines and includes even for - # header-only modules. diff --git a/libs/qt5/qtbase/qtbase-5.7.patch b/libs/qt5/qtbase/qtbase-5.7.patch deleted file mode 100644 index 20e847bb..00000000 --- a/libs/qt5/qtbase/qtbase-5.7.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index d356ada..2058fa0 100644 ---- a/qmake/generators/makefile.cpp -+++ b/qmake/generators/makefile.cpp -@@ -1182,7 +1182,7 @@ MakefileGenerator::filePrefixRoot(const QString &root, const QString &path) - { - QString ret(path); - if(path.length() > 2 && path[1] == ':') //c:\foo -- ret.insert(2, root); -+ ret.replace(0, 2, root); - else - ret.prepend(root); - while (ret.endsWith('\\')) -diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp -index 96b39ef..2f58427 100644 ---- a/src/corelib/io/qprocess_win.cpp -+++ b/src/corelib/io/qprocess_win.cpp -@@ -867,16 +867,17 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a - bool success = false; - PROCESS_INFORMATION pinfo; - -+ DWORD dwCreationFlags = (GetConsoleWindow() ? 0 : CREATE_NO_WINDOW); -+ dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT; - STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0, - (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, - (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - success = CreateProcess(0, (wchar_t*)args.utf16(), -- 0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0, -+ 0, 0, FALSE, dwCreationFlags, 0, - workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(), - &startupInfo, &pinfo); -- - if (success) { - CloseHandle(pinfo.hThread); - CloseHandle(pinfo.hProcess); diff --git a/libs/qt5/qtbase/qtbase-5.8.patch b/libs/qt5/qtbase/qtbase-5.8.patch deleted file mode 100644 index d15cee21..00000000 --- a/libs/qt5/qtbase/qtbase-5.8.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 5d7700e..e718aca 100644 ---- a/qmake/generators/makefile.cpp -+++ b/qmake/generators/makefile.cpp -@@ -1183,7 +1183,7 @@ MakefileGenerator::filePrefixRoot(const QString &root, const QString &path) - { - QString ret(path); - if(path.length() > 2 && path[1] == ':') //c:\foo -- ret.insert(2, root); -+ ret.replace(0, 2, root); - else - ret.prepend(root); - while (ret.endsWith('\\')) diff --git a/libs/qt5/qtbase/qtbase.py b/libs/qt5/qtbase/qtbase.py index 568158c5..02030994 100644 --- a/libs/qt5/qtbase/qtbase.py +++ b/libs/qt5/qtbase/qtbase.py @@ -1,306 +1,241 @@ # -*- coding: utf-8 -*- import info from Package.Qt5CorePackageBase import * class subinfo(info.infoclass): def registerOptions(self): self.options.dynamic.registerOption("buildCommercial", False) self.options.dynamic.registerOption("buildReleaseAndDebug", False) self.options.dynamic.registerOption("buildDoc", True) self.options.dynamic.registerOption("libInfix", "") def setTargets(self): self.versionInfo.setDefaultValues() for ver in self.versionInfo.tarballs() + self.versionInfo.branches() + self.versionInfo.tags(): qtVer = CraftVersion(ver) if ver == "dev": self.patchToApply[ver] = [] elif qtVer >= CraftVersion("5.12.4"): self.patchToApply[ver] = [ ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 ("workaround-mingw-egl.diff", 1), ("fix_GenericDataLocation_mac.patch", 1), ("qstandardpaths-extra-dirs.patch", 1), ] elif qtVer >= CraftVersion("5.12.1"): self.patchToApply[ver] = [ ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 ("workaround-mingw-egl.diff", 1), ("fix_GenericDataLocation_mac.patch", 1), ("qstandardpaths-extra-dirs.patch", 1), ("qtbase-5.12.3-macos-debug.diff", 1) # https://codereview.qt-project.org/c/qt/qtbase/+/260917 ] elif qtVer >= CraftVersion("5.12.0"): self.patchToApply[ver] = [ ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 ("workaround-mingw-egl.diff", 1), ("fix_GenericDataLocation_mac.patch", 1), ("qstandardpaths-extra-dirs.patch", 1), ("0001-QComboBox-WindowVistaStyle-restore-focus-rect.patch", 1), # https://codereview.qt-project.org/#/c/248945/ (".qt-5.12.0", 1) ] elif qtVer >= CraftVersion("5.11.1"): self.patchToApply[ver] = [ ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 ("workaround-mingw-egl.diff", 1), ("fix_GenericDataLocation_mac.patch", 1), ("qstandardpaths-extra-dirs.patch", 1), ] elif qtVer >= CraftVersion("5.11"): self.patchToApply[ver] = [ ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 ("0001-Fix-private-headers.patch", 1), # https://bugreports.qt.io/browse/QTBUG-37417 ("workaround-mingw-egl.diff", 1), ("fix_GenericDataLocation_mac.patch", 1), ("qstandardpaths-extra-dirs.patch", 1), ] elif qtVer >= CraftVersion("5.10"): self.patchToApply[ver] = [ ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 ("0001-Fix-private-headers.patch", 1), # https://bugreports.qt.io/browse/QTBUG-37417 ("workaround-mingw-egl.diff", 1), ("fix_AppDataLocation_mac.patch", 1), #https://bugreports.qt.io/browse/QTBUG-61159 ("fix_GenericDataLocation_mac.patch", 1), ("qstandardpaths-extra-dirs.patch", 1), ] - elif qtVer >= CraftVersion("5.9.4") or qtVer == CraftVersion("5.9"): - self.patchToApply[ver] = [ - ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 - ("0001-Fix-private-headers.patch", 1), # https://bugreports.qt.io/browse/QTBUG-37417 - ("workaround-mingw-egl-qt5.9.4.diff", 1), - ("0001-Add-APPDIR-data-APPNAME-5.9.4.patch", 1), # https://codereview.qt-project.org/#/c/197855/ - ] - elif qtVer >= CraftVersion("5.9.3"): - self.patchToApply[ver] = [ - ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 - ("0001-Fix-private-headers.patch", 1), # https://bugreports.qt.io/browse/QTBUG-37417 - ("0001-Add-APPDIR-data-APPNAME-to-the-non-Generic-paths-on-.patch", 1)] # https://codereview.qt-project.org/#/c/197855/ - elif qtVer >= CraftVersion("5.9"): - self.patchToApply[ver] = [ - ("fix-angle-mingw.patch", 1), - ("qtbase-5.8.patch", 1), # https://codereview.qt-project.org/#/c/149550/ - ("qdbus-manager-quit-5.7.patch", 1), # https://phabricator.kde.org/D2545#69186 - ("hack-fix-syncqt.patch", 1), - ("0001-Fix-private-headers.patch", 1), # https://bugreports.qt.io/browse/QTBUG-37417 - ("0001-Add-APPDIR-data-APPNAME-to-the-non-Generic-paths-on-.patch", 1)] # https://codereview.qt-project.org/#/c/197855/ - elif qtVer >= CraftVersion("5.8"): - self.patchToApply[ver] = [ - ("fix-angle-mingw.patch", 1), - ("qtbase-5.8.patch", 1), # https://codereview.qt-project.org/#/c/141254/ - # https://codereview.qt-project.org/#/c/149550/ - ("qdbus-manager-quit-5.7.patch", 1) # https://phabricator.kde.org/D2545#69186 - ] - elif qtVer >= CraftVersion("5.7"): - self.patchToApply[ver] = [ - ("fix-angle-mingw.patch", 1), - ("qtbase-5.7.patch", 1), # https://codereview.qt-project.org/#/c/141254/ - # https://codereview.qt-project.org/#/c/149550/ - ("do-not-spawn-console-qprocess-startdetached.patch", 1), - # https://codereview.qt-project.org/#/c/162585/ - ("qdbus-manager-quit-5.7.patch", 1) # https://phabricator.kde.org/D2545#69186 - ] - else: - self.patchToApply[ver] = [ - ("qmake-fix-install-root.patch", 1), - ("qtbase-5.6.patch", 1), # https://codereview.qt-project.org/#/c/141254/ - # https://codereview.qt-project.org/#/c/149550/ - ("do-not-spawn-console-qprocess-startdetached.patch", 1), - # https://codereview.qt-project.org/#/c/162585/ - ("fix-angle-mingw-5.6.2-20161027.diff", 1), - ("qdbus-manager-quit-5.7.patch", 1) # https://phabricator.kde.org/D2545#69186 - ] + self.patchToApply["5.11.2"] += [ ("0001-Export-qt_open64-from-QtCore.patch", 1), # fix 32 bit unix builds, backport of 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 ] - self.patchLevel["5.9.4"] = 3 self.patchLevel["5.11.0"] = 2 self.patchLevel["5.11.2"] = 3 self.patchLevel["5.12.0"] = 2 self.patchLevel["5.12.1"] = 2 self.patchLevel["5.12.3"] = 1 self.description = "a cross-platform application framework" def setDependencies(self): if CraftCore.settings.getboolean("Packager", "UseCache") and not CraftCore.settings.getboolean("QtSDK", "Enabled", False): self.buildDependencies["dev-utils/qtbinpatcher"] = None self.runtimeDependencies["virtual/base"] = None self.buildDependencies["dev-utils/perl"] = None self.buildDependencies["dev-utils/flexbison"] = None if not self.options.buildStatic: - if CraftVersion(self.buildTarget) < CraftVersion("5.10") or CraftCore.settings.getboolean("QtSDK", "Enabled", False): + if CraftCore.settings.getboolean("QtSDK", "Enabled", False): self.runtimeDependencies["libs/openssl"] = None else: self.runtimeDependencies["libs/openssl"] = "1.1" self.runtimeDependencies["libs/dbus"] = None self.runtimeDependencies["binary/mysql"] = None self.runtimeDependencies["libs/icu"] = None self.runtimeDependencies["libs/zlib"] = None class QtPackage(Qt5CorePackageBase): def __init__(self, **args): Qt5CorePackageBase.__init__(self) def configure(self, unused1=None, unused2=""): with self.getQtBaseEnv(): if CraftCore.compiler.isMinGW() and "DXSDK_DIR" not in os.environ: CraftCore.log.critical("Failed to detec a DirectX SDK") CraftCore.log.critical( "Please visite https://community.kde.org/Guidelines_and_HOWTOs/Build_from_source/Windows#Direct_X_SDK for instructions") return False self.enterBuildDir() if OsUtils.isWin(): configure = OsUtils.toUnixPath(os.path.join(self.sourceDir(), "configure.bat")) - if self.qtVer < CraftVersion("5.10"): - # not needed anymore as we don't patch configure anymore - if not os.path.exists(os.path.join(self.sourceDir(), ".gitignore")): # force bootstrap of configure.exe - with open(os.path.join(self.sourceDir(), ".gitignore"), "wt+") as bootstrap: - bootstrap.write("Force Bootstrap") - if os.path.exists(os.path.join(self.sourceDir(), "configure.exe")): - os.remove(os.path.join(self.sourceDir(), "configure.exe")) elif OsUtils.isUnix(): configure = os.path.join(self.sourceDir(), "configure") command = f"{configure} -confirm-license -prefix {CraftStandardDirs.craftRoot()} -platform {self.platform} " command += "-opensource " if not self.subinfo.options.dynamic.buildCommercial else "-commercial " if self.subinfo.options.dynamic.libInfix: command += f"-qtlibinfix {self.subinfo.options.dynamic.libInfix} " command += f"-headerdir {os.path.join(CraftStandardDirs.craftRoot(), 'include', 'qt5')} " command += "-qt-libpng " command += "-qt-libjpeg " - # can we drop that in general? - if self.qtVer <= "5.6": - command += "-c++11 " - if self.qtVer >= "5.8": - command += "-mp " - else: - command += "-qt-pcre " + command += "-mp " - if CraftCore.compiler.isMacOS and self.qtVer >= "5.10": + if CraftCore.compiler.isMacOS: command += f"-macos-additional-datadirs \"{CraftCore.standardDirs.locations.data}\" " if OsUtils.isWin(): command += "-opengl dynamic " command += "-plugin-sql-odbc " # if not (OsUtils.isFreeBSD() or compiler.isMinGW()):#currently breaks unmaintained modules like qtscript and webkit # command += "-ltcg " if self.subinfo.options.dynamic.buildReleaseAndDebug: command += "-debug-and-release " elif self.buildType() == "Debug": command += "-debug " else: command += "-release " if self.buildType() == "RelWithDebInfo": command += "-force-debug-info " if not self.subinfo.options.dynamic.buildReleaseAndDebug: if self.buildType() == "Debug" and CraftCore.compiler.isMacOS: command += "-no-framework " if not self.subinfo.options.buildStatic: command += "-I \"%s\" -L \"%s\" " % ( os.path.join(CraftStandardDirs.craftRoot(), "include"), os.path.join(CraftStandardDirs.craftRoot(), "lib")) if self.subinfo.options.isActive("libs/openssl"): command += " -openssl-linked " if self.qtVer >= CraftVersion("5.10"): opensslIncDir = os.path.join(CraftCore.standardDirs.craftRoot(), "include", "openssl") command += f" OPENSSL_INCDIR=\"{opensslIncDir}\"" if CraftCore.compiler.isWindows: command += f" OPENSSL_LIBS=\"-llibssl -llibcrypto\" " else: command += f" OPENSSL_LIBS=\"-lssl -lcrypto\" " if self.subinfo.options.isActive("binary/mysql"): command += " -sql-mysql " if self.subinfo.options.isActive("libs/dbus"): command += " -qdbus -dbus-runtime -I \"%s\" -I \"%s\" " % ( os.path.join(CraftStandardDirs.craftRoot(), "include", "dbus-1.0"), os.path.join(CraftStandardDirs.craftRoot(), "lib", "dbus-1.0", "include")) else: command += " -no-dbus " if self.subinfo.options.isActive("libs/icu"): command += " -icu " else: command += " -no-icu " if self.subinfo.options.isActive("libs/zlib"): command += " -system-zlib " if CraftCore.compiler.isMSVC(): command += " ZLIB_LIBS=zlib.lib " else: command += " -static -static-runtime " command += "-nomake examples " command += "-nomake tests " if (CraftCore.compiler.isMSVC() and CraftCore.compiler.isClang()) or OsUtils.isUnix() or self.supportsCCACHE: command += "-no-pch " if CraftCore.compiler.isLinux: command += """-R "../lib" """ if CraftCore.compiler.isMinGW() and self.qtVer < "5.10": command += """ "QMAKE_CXXFLAGS += -Wa,-mbig-obj" """ return utils.system(command) def make(self): with self.getQtBaseEnv(): return super().make() def install(self): with self.getQtBaseEnv(): if not Qt5CorePackageBase.install(self): return False parser = configparser.ConfigParser() parser.optionxform = str parser.read(os.path.join(self.buildDir(), "bin", "qt.conf")) parser.remove_section("EffectiveSourcePaths") with open(os.path.join(self.imageDir(), "bin", "qt.conf"), "wt") as out: parser.write(out) return True def postInstall(self): if CraftCore.compiler.isWindows and CraftCore.settings.getboolean("Packager", "UseCache"): return utils.system(["qtbinpatcher", "--nobackup", f"--qt-dir={self.installDir()}", f"--new-dir={CraftStandardDirs.craftRoot()}"]) else: if not self.patchInstallPrefix([os.path.join(self.installDir(), "bin", "qt.conf")], self.subinfo.buildPrefix, CraftCore.standardDirs.craftRoot()): return False # try to normalize the auto-detected paths during Qt build for non-debian distros if CraftCore.compiler.isLinux: files = utils.filterDirectoryContent(self.installDir(), whitelist=lambda x, root: Path(x).suffix in {".cmake", ".prl", ".pri"}, blacklist=lambda x, root: True) if not self.patchInstallPrefix(files, "/usr/lib/x86_64-linux-gnu/", ""): return False return True def getQtBaseEnv(self): envs = {} envs["PATH"] = os.pathsep.join([os.path.join(self.buildDir(), "bin"), os.environ["PATH"]]) - if self.qtVer < "5.9": - # so that the mkspecs can be found, when -prefix is set - envs["QMAKEPATH"] = self.sourceDir() - if self.qtVer < "5.8": - envs["QMAKESPEC"] = os.path.join(self.sourceDir(), 'mkspecs', self.platform) - else: - envs["QMAKESPEC"] = None + envs["QMAKESPEC"] = None return utils.ScopedEnv(envs) class Package(Qt5CoreSdkPackageBase): def __init__(self): Qt5CoreSdkPackageBase.__init__(self, classA=QtPackage) diff --git a/libs/qt5/qtbase/workaround-mingw-egl-qt5.9.4.diff b/libs/qt5/qtbase/workaround-mingw-egl-qt5.9.4.diff deleted file mode 100644 index 5b23b4e4..00000000 --- a/libs/qt5/qtbase/workaround-mingw-egl-qt5.9.4.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x'*\.o' -x '*\.pyc' qtbase-opensource-src-5.9.4.orig/src/gui/gui.pro qtbase-opensource-src-5.9.4/src/gui/gui.pro ---- qtbase-opensource-src-5.9.4.orig/src/gui/gui.pro 2018-01-16 07:53:43.000000000 +0100 -+++ qtbase-opensource-src-5.9.4/src/gui/gui.pro 2018-02-14 17:57:24.715193300 +0100 -@@ -56,15 +56,17 @@ - win32: CMAKE_WINDOWS_BUILD = True - - qtConfig(angle) { -+ ANGLE_IMPORTLIB_PREFIX= -+ mingw:ANGLE_IMPORTLIB_PREFIX=lib - CMAKE_GL_INCDIRS = $$CMAKE_INCLUDE_DIR - CMAKE_ANGLE_EGL_DLL_RELEASE = libEGL.dll -- CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.$${QMAKE_EXTENSION_STATICLIB} -+ CMAKE_ANGLE_EGL_IMPLIB_RELEASE = $${ANGLE_IMPORTLIB_PREFIX}libEGL.$${QMAKE_EXTENSION_STATICLIB} - CMAKE_ANGLE_GLES2_DLL_RELEASE = libGLESv2.dll -- CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.$${QMAKE_EXTENSION_STATICLIB} -+ CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = $${ANGLE_IMPORTLIB_PREFIX}libGLESv2.$${QMAKE_EXTENSION_STATICLIB} - CMAKE_ANGLE_EGL_DLL_DEBUG = libEGLd.dll -- CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.$${QMAKE_EXTENSION_STATICLIB} -+ CMAKE_ANGLE_EGL_IMPLIB_DEBUG = $${ANGLE_IMPORTLIB_PREFIX}libEGLd.$${QMAKE_EXTENSION_STATICLIB} - CMAKE_ANGLE_GLES2_DLL_DEBUG = libGLESv2d.dll -- CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.$${QMAKE_EXTENSION_STATICLIB} -+ CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = $${ANGLE_IMPORTLIB_PREFIX}libGLESv2d.$${QMAKE_EXTENSION_STATICLIB} - - CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2 - } else {