diff --git a/libs/qt5/qtbase/qstandardpaths-extra-dirs.patch b/libs/qt5/qtbase/qstandardpaths-extra-dirs.patch new file mode 100644 index 00000000..02a48d77 --- /dev/null +++ b/libs/qt5/qtbase/qstandardpaths-extra-dirs.patch @@ -0,0 +1,97 @@ +commit 0e86ee934b6587dc288e756eb980da002bcbd240 +Author: Alex Richardson +Date: Mon Sep 3 10:16:48 2018 +0100 + + MacOS: Add configure option for additional QStandardPaths data directories + + On MacOS QStandardPaths::GenericDataLocation only contains + "~/Library/Application Support" and "/Library/Application Support". + Package managers such as homebrew or KDE craft install into a custom + prefix and do not/cannot write to either of these directories. This makes + it impossible for them to share the generic data between different + applications. The current workaround used e.g. by homebrew-kde is to create + symlinks for every file/directory that is needed in /usr/local/share/ in + the users "~/Library/Application Support" directory. However, this causes + issues if you forget to create the appropriate link and makes it difficult + for the user to override a data file from the system-wide installation with + a file in the home directory. + + This commit introduces a new hidden ./configure option + `-macos-additional-datadirs`. This option is a colon-separated list of + additional directories that QStandardPaths searches before looking in + "/Library/Application Support". + + I also introduced a new environment variable QT_DATA_DIRS that can be + used to override this ./configure option. + TODO: should this be QT_MACOS_DATA_DIRS instead? + + Change-Id: I23b046fcc9520181286fe300827645cd608b0201 + +diff --git a/configure.json b/configure.json +index 1f45f2ccb2..f29e962a98 100644 +--- a/configure.json ++++ b/configure.json +@@ -90,6 +90,7 @@ + "incredibuild-xge": { "type": "boolean", "name": "incredibuild_xge" }, + "libudev": "boolean", + "ltcg": "boolean", ++ "macos-additional-datadirs": { "type": "string", "name": "macos_additional_datadirs" }, + "make": { "type": "addString", "values": [ "examples", "libs", "tests", "tools" ] }, + "make-tool": "string", + "mips_dsp": "boolean", +diff --git a/configure.pri b/configure.pri +index 03eacd3c07..9505a30da7 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -1190,6 +1190,15 @@ defineReplace(qtConfOutputPostProcess_publicHeader) { + !isEmpty(config.input.qt_libinfix): \ + output += "$${LITERAL_HASH}define QT_LIBINFIX \"$$eval(config.input.qt_libinfix)\"" + ++ # Add support for additional QStandardPaths::GenericDataLocation on MacOS (useful for homebrew, etc.) ++ macos { ++ !isEmpty(config.input.macos_additional_datadirs) { ++ output += "$${LITERAL_HASH}define QT_MACOS_ADDITIONAL_DATADIRS \"$$eval(config.input.macos_additional_datadirs)\"" ++ } else { ++ output += "// $${LITERAL_HASH}undef QT_MACOS_ADDITIONAL_DATADIRS" ++ } ++ } ++ + return($$output) + } + +diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm +index 11b5cc8c37..da91ec3ae5 100644 +--- a/src/corelib/io/qstandardpaths_mac.mm ++++ b/src/corelib/io/qstandardpaths_mac.mm +@@ -184,6 +184,31 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) + dirs << writableLocation(PicturesLocation) << QLatin1String("assets-library://"); + #endif + ++#if !defined(QT_BOOTSTRAPPED) && defined(Q_OS_MACOS) ++ if (type == AppDataLocation || type == AppLocalDataLocation || type == GenericDataLocation) { ++ QStringList extraDataDirs; ++ // Add the value of -macos-generic-datadirs configure argument to the list. ++ // This allows e.g. homebrew to use a Qt build that is configured to search ++ // for generic data in /usr/local/share instead of requiring it to be in ++ // /Library/Application Support which is not writable from the homebrew sandbox. ++#ifdef QT_MACOS_ADDITIONAL_DATADIRS ++ QString fromConfigure = QStringLiteral(QT_MACOS_ADDITIONAL_DATADIRS); ++ extraDataDirs = fromConfigure.split(QLatin1Char(':'), QString::SkipEmptyParts); ++#endif ++ // Also allow the environment variable QT_DATA_DIRS to override this default ++ QByteArray qtDataDirsEnv = qgetenv("QT_DATA_DIRS"); ++ if (!qtDataDirsEnv.isEmpty()) { ++ extraDataDirs = QFile::decodeName(qtDataDirsEnv).split(QLatin1Char(':'), QString::SkipEmptyParts); ++ } ++ if (type == AppDataLocation || type == AppLocalDataLocation) { ++ for (QString &dir : extraDataDirs) { ++ appendOrganizationAndApp(dir); ++ } ++ } ++ dirs << extraDataDirs; ++ } ++#endif ++ + if (type == GenericDataLocation || type == FontsLocation || type == ApplicationsLocation + || type == AppDataLocation || type == AppLocalDataLocation + || type == GenericCacheLocation || type == CacheLocation) { diff --git a/libs/qt5/qtbase/qtbase.py b/libs/qt5/qtbase/qtbase.py index 4d09d725..f06490a4 100644 --- a/libs/qt5/qtbase/qtbase.py +++ b/libs/qt5/qtbase/qtbase.py @@ -1,234 +1,246 @@ # -*- coding: utf-8 -*- import info from Package.Qt5CorePackageBase import * class subinfo(info.infoclass): 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.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.patchLevel["5.9.4"] = 3 self.patchLevel["5.11.0"] = 2 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): 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} -opensource -confirm-license -prefix {CraftStandardDirs.craftRoot()} -platform {self.platform} " command += "-headerdir %s " % os.path.join(CraftStandardDirs.craftRoot(), "include", "qt5") command += "-qt-libpng " command += "-qt-libjpeg " # can we drop that in general? version = CraftVersion(self.subinfo.buildTarget) if version <= CraftVersion("5.6"): command += "-c++11 " if version >= CraftVersion("5.8"): command += "-mp " else: command += "-qt-pcre " + if OsUtils.isMac() and version >= CraftVersion("5.10"): + command += f"-macos-additional-datadirs \"{CraftStandardDirs.craftRoot()}/share\" " + 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.buildType() == "RelWithDebInfo": command += "-force-debug-info " if self.buildType() == "Debug": command += "-debug " else: command += "-release " 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 += " -plugin-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")) if self.subinfo.options.isActive("libs/icu"): command += " -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.isMinGW() and self.qtVer < CraftVersion("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 utils.copyFile(os.path.join(self.buildDir(), "bin", "qt.conf"), os.path.join(self.imageDir(), "bin", "qt.conf")) # install msvc debug files if available if CraftCore.compiler.isMSVC(): srcdir = os.path.join(self.buildDir(), "lib") destdir = os.path.join(self.installDir(), "lib") filelist = os.listdir(srcdir) for file in filelist: if file.endswith(".pdb"): utils.copyFile(os.path.join(srcdir, file), os.path.join(destdir, file)) return True def postInstall(self): if OsUtils.isWin() and CraftCore.settings.getboolean("Packager", "UseCache"): if not utils.system(["qtbinpatcher", "--nobackup", f"--qt-dir={self.installDir()}", f"--new-dir={CraftStandardDirs.craftRoot()}"]): return False return True def getQtBaseEnv(self): envs = {} envs["PATH"] = os.pathsep.join([os.path.join(self.buildDir(), "bin"), os.environ["PATH"]]) if CraftVersion(self.subinfo.buildTarget) < CraftVersion("5.9"): # so that the mkspecs can be found, when -prefix is set envs["QMAKEPATH"] = self.sourceDir() if CraftVersion(self.subinfo.buildTarget) < CraftVersion("5.8"): envs["QMAKESPEC"] = os.path.join(self.sourceDir(), 'mkspecs', self.platform) else: envs["QMAKESPEC"] = None return utils.ScopedEnv(envs) class Package(Qt5CoreSdkPackageBase): def __init__(self): Qt5CoreSdkPackageBase.__init__(self, classA=QtPackage)