Diff
Modified: trunk/Tools/buildstream/ChangeLog (280379 => 280380)
--- trunk/Tools/buildstream/ChangeLog 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/ChangeLog 2021-07-28 08:34:54 UTC (rev 280380)
@@ -1,3 +1,31 @@
+2021-07-28 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Dependencies update - July 2021 round
+ https://bugs.webkit.org/show_bug.cgi?id=228275
+
+ Reviewed by Adrian Perez de Castro.
+
+ * elements/freedesktop-sdk.bst: Update to latest 20.08 junction version.
+ * elements/qt5/qtbase.bst: Switch to KDE 5.15 branch.
+ * elements/qt5/qtdeclarative.bst: Ditto.
+ * elements/qt5/qtquickcontrols.bst: Ditto.
+ * elements/qt5/qtquickcontrols2.bst: Ditto.
+ * elements/qt5/qtwayland.bst: Ditto.
+ * elements/qt5/qtx11extras.bst: Ditto.
+ * elements/sdk-build-depends/rapidjson.bst: Update to latest git snapshot.
+ * elements/sdk-platform.bst: Add virtualenv, needed for WPT tests.
+ * elements/sdk/ccls.bst: Update to latest release.
+ * elements/sdk/clangd.bst: Bump to version 12.
+ * elements/sdk/ffmpeg.bst: Bump to version 4.4.
+ * elements/sdk/openjpeg.bst: Bump to version 2.4.
+ * elements/sdk/rr.bst: Update to latest git snapshot.
+ * elements/sdk/x264.bst: Ditto. Snapshot tarballs were discontinued years ago.
+ * patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch: Removed.
+ * patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch: Removed.
+ * patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch: Added.
+ * patches/qtdeclarative-use-python3.patch: Removed.
+ * project.conf:
+
2021-07-09 Carlos Garcia Campos <[email protected]>
[Flatpak SDK] Update to libsoup3 2.99.9
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -5,7 +5,7 @@
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
# Changed to track git commit from upstream bst
track: 'release/20.08'
- ref: freedesktop-sdk-20.08.13-29-g096698709baa9286c4d8a1143a1b094eca3ff844
+ ref: freedesktop-sdk-20.08.14-44-g58e021412f056f614a5f277c5852416fc3758edf
- kind: patch
path: patches/nettle-no-debug.diff
- kind: patch
Modified: trunk/Tools/buildstream/elements/qt5/qtbase.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/qt5/qtbase.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/qt5/qtbase.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -2,7 +2,7 @@
depends:
- sdk/gtk+-3.bst
-- freedesktop-sdk.bst:components/perl.bst
+- freedesktop-sdk.bst:components/perl.bst
# gtk3 seems to have all the so files that qtbase needs access to
# perl is listed as a recommended dependency on packages.debian.org
# plus, perl seems to be needed as a build-dep for almost everything that depends on qtbase
@@ -60,14 +60,13 @@
- "%{libdir}/*.so"
sources:
-- kind: tar
- url: qt:5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
- ref: 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
+- kind: git_tag
+ url: kde:qtbase
+ track: kde/5.15
+ ref: v5.15.0-870-g663d240a18f5acac82fd2bd0fd4a33c4f47b260a
- kind: patch
path: patches/qtbase-avoid-hardcoding-kernel-version.patch
- kind: patch
path: patches/qtbase-use-wayland-on-gnome.patch
- kind: patch
- path: patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch
-- kind: patch
- path: patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch
+ path: patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch
Modified: trunk/Tools/buildstream/elements/qt5/qtdeclarative.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/qt5/qtdeclarative.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/qt5/qtdeclarative.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -4,8 +4,7 @@
- qt5/qtbase.bst
sources:
-- kind: tar
- url: qt:5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz
- ref: 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
-- kind: patch
- path: patches/qtdeclarative-use-python3.patch
+- kind: git_tag
+ url: kde:qtdeclarative
+ track: kde/5.15
+ ref: v5.15.0-201-g6683c414c5cc6ab46197c41bb1361c518ca84d3e
Modified: trunk/Tools/buildstream/elements/qt5/qtquickcontrols.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/qt5/qtquickcontrols.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/qt5/qtquickcontrols.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -4,6 +4,7 @@
- qt5/qtdeclarative.bst
sources:
-- kind: tar
- url: qt:5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz
- ref: 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee
+- kind: git_tag
+ url: kde:qtquickcontrols
+ track: kde/5.15
+ ref: v5.15.0-14-gcf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420
Modified: trunk/Tools/buildstream/elements/qt5/qtquickcontrols2.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/qt5/qtquickcontrols2.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/qt5/qtquickcontrols2.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -4,6 +4,7 @@
- qt5/qtdeclarative.bst
sources:
-- kind: tar
- url: qt:5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz
- ref: 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f
+- kind: git_tag
+ url: kde:qtquickcontrols2
+ track: kde/5.15
+ ref: v5.15.0-57-ga2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3
Modified: trunk/Tools/buildstream/elements/qt5/qtwayland.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/qt5/qtwayland.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/qt5/qtwayland.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -5,6 +5,7 @@
- sdk/libdrm.bst
sources:
-- kind: tar
- url: qt:5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz
- ref: 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb
+- kind: git_tag
+ url: kde:qtwayland
+ track: kde/5.15
+ ref: v5.15.0-58-gd4c41797b61a5a8da47c5821711aca72e756dcbf
Modified: trunk/Tools/buildstream/elements/qt5/qtx11extras.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/qt5/qtx11extras.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/qt5/qtx11extras.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -4,6 +4,7 @@
- qt5/qtbase.bst
sources:
-- kind: tar
- url: qt:5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz
- ref: c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1
+- kind: git_tag
+ url: kde:qtx11extras
+ track: kde/5.15
+ ref: v5.15.0-7-g3898f5484fd4864b047729bfeda9a1222f32364f
Modified: trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk/adwaita-icon-theme.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -1,8 +1,8 @@
kind: autotools
sources:
- kind: tar
- url: gnome_downloads:adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz
- ref: ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a
+ url: gnome_downloads:adwaita-icon-theme/40/adwaita-icon-theme-40.1.1.tar.xz
+ ref: 0b6c436ed6ad9887a88ada1f72a0197b1eb73b020d8d344abab4c7fa7250f8f6
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
Modified: trunk/Tools/buildstream/elements/sdk/ccls.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk/ccls.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk/ccls.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -3,8 +3,8 @@
sources:
- kind: git_tag
url: github_com:MaskRay/ccls.git
- track: '0.20201025'
- ref: 0.20201025-0-g1fec76c804a386e57af543baf5a337779eb78e81
+ track: '0.20210330'
+ ref: 0.20210330-0-g0ada56ef3bb785b9b56eeebb70dff2aad60b3f39
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
Modified: trunk/Tools/buildstream/elements/sdk/clangd.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk/clangd.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk/clangd.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -1,8 +1,8 @@
kind: manual
sources:
- kind: zip
- url: github_files:clangd/clangd/releases/download/11.0.0/clangd-linux-11.0.0.zip
- ref: 10047e2f974cd35a145e672eb5747b6cb27902181ae78c148d6e697a9da562d8
+ url: github_files:clangd/clangd/releases/download/12.0.0/clangd-linux-12.0.0.zip
+ ref: f9d09eb9f4f34cde78bdbcf9283a887734828c9893943abebe014a5630bce4d3
depends:
- freedesktop-sdk.bst:bootstrap-import.bst
Modified: trunk/Tools/buildstream/elements/sdk/ffmpeg.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk/ffmpeg.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk/ffmpeg.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -151,5 +151,5 @@
sources:
- kind: git_tag
url: ffmpeg:ffmpeg.git
- track: release/4.2
- ref: n4.2.3-5-g221e490d42bc1c20c61aee385d5bfe003a1a8c87
+ track: release/4.4
+ ref: n4.4-79-gde1132a89113b131831d8edde75214372c983f32
Modified: trunk/Tools/buildstream/elements/sdk/openjpeg.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk/openjpeg.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk/openjpeg.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -1,8 +1,8 @@
kind: cmake
sources:
- kind: tar
- url: github_com:uclouvain/openjpeg/archive/v2.3.1.tar.gz
- ref: 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9
+ url: github_com:uclouvain/openjpeg/archive/v2.4.0.tar.gz
+ ref: 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
depends:
Modified: trunk/Tools/buildstream/elements/sdk/rr.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk/rr.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk/rr.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -16,4 +16,4 @@
- kind: git_tag
url: github_com:rr-debugger/rr
track: master
- ref: 5.4.0-19-g7a520b7beea74a051abb5bf020155148264857ab
+ ref: 5.4.0-293-g8a15f2acdd39d799001c98107e72c2bed4ec63e9
Modified: trunk/Tools/buildstream/elements/sdk/x264.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk/x264.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk/x264.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -7,9 +7,10 @@
- freedesktop-sdk.bst:bootstrap-import.bst
sources:
-- kind: tar
- url: http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20140212-2245-stable.tar.bz2
- ref: 5d98e9e4faf6dd55e7193ed379aff477b8acbda6777758956ef7e5f05067be18
+- kind: git_tag
+ url: vlc:videolan/x264
+ track: master
+ ref: ae03d92b52bb7581df2e75d571989cb1ecd19cbd
variables:
conf-local: >-
--enable-shared
Modified: trunk/Tools/buildstream/elements/sdk-build-depends/rapidjson.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk-build-depends/rapidjson.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk-build-depends/rapidjson.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -10,6 +10,6 @@
- kind: git_tag
url: github_com:Tencent/rapidjson
track: master
- ref: v1.1.0-565-gce81bc9edfe773667a7a4454ba81dac72ed4364c
+ ref: v1.1.0-654-g48fbd8cd202ca54031fe799db2ad44ffa8e77c13
- kind: patch
path: patches/rapidjson-0001-Fix-build-warnings-emitted-by-GCC-10-on-Aarch64.patch
Modified: trunk/Tools/buildstream/elements/sdk-platform.bst (280379 => 280380)
--- trunk/Tools/buildstream/elements/sdk-platform.bst 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/elements/sdk-platform.bst 2021-07-28 08:34:54 UTC (rev 280380)
@@ -198,6 +198,7 @@
- freedesktop-sdk.bst:components/python3-sitecustomize.bst
- freedesktop-sdk.bst:components/python3-six.bst
- freedesktop-sdk.bst:components/python3-usercustomize.bst
+- freedesktop-sdk.bst:components/python3-virtualenv.bst
- freedesktop-sdk.bst:components/python3.bst
- freedesktop-sdk.bst:components/sdl2-image.bst
- freedesktop-sdk.bst:components/sdl2-mixer.bst
Deleted: trunk/Tools/buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch (280379 => 280380)
--- trunk/Tools/buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch 2021-07-28 08:34:54 UTC (rev 280380)
@@ -1,26 +0,0 @@
-From 8f45a46e5969898497295608ad0ea93d55291bda Mon Sep 17 00:00:00 2001
-From: Jan Grulich <[email protected]>
-Date: Wed, 27 May 2020 13:34:37 +0200
-Subject: [PATCH] Make sure we correctly construct underlying base platform theme
-
-When the base platform theme is not set to a null pointer, then we might
-assume it has been already constructed and later on try to access an
-invalid address which will cause a crash.
-
-Change-Id: I1bd6b1f07087baefaa9738d4dd644bb649e3e5df
----
-
-diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
-index fb65f6d9..72fbb9be 100644
---- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
-+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
-@@ -59,7 +59,7 @@ public:
- delete baseTheme;
- }
-
-- QPlatformTheme *baseTheme;
-+ QPlatformTheme *baseTheme = nullptr;
- };
-
- QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
-
Deleted: trunk/Tools/buildstream/patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch (280379 => 280380)
--- trunk/Tools/buildstream/patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/patches/qtbase-revert-correct-handling-for-xdg-runtime-dir.patch 2021-07-28 08:34:54 UTC (rev 280380)
@@ -1,85 +0,0 @@
-diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp
-index 5f4955c53f..ba351acf77 100644
---- a/src/corelib/io/qstandardpaths_unix.cpp
-+++ b/src/corelib/io/qstandardpaths_unix.cpp
-@@ -142,58 +142,53 @@ QString QStandardPaths::writableLocation(StandardLocation type)
- }
- case RuntimeLocation:
- {
-- // http://standards.freedesktop.org/basedir-spec/latest/
- const uint myUid = uint(geteuid());
-- // since the current user is the owner, set both xxxUser and xxxOwner
-- const QFile::Permissions wantedPerms = QFile::ReadUser | QFile::WriteUser | QFile::ExeUser
-- | QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner;
-+ // http://standards.freedesktop.org/basedir-spec/latest/
- QFileInfo fileInfo;
- QString xdgRuntimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
- if (xdgRuntimeDir.isEmpty()) {
- const QString userName = QFileSystemEngine::resolveUserName(myUid);
- xdgRuntimeDir = QDir::tempPath() + QLatin1String("/runtime-") + userName;
- fileInfo.setFile(xdgRuntimeDir);
-+ if (!fileInfo.isDir()) {
-+ if (!QDir().mkdir(xdgRuntimeDir)) {
-+ qWarning("QStandardPaths: error creating runtime directory %s: %s", qPrintable(xdgRuntimeDir), qPrintable(qt_error_string(errno)));
-+ return QString();
-+ }
-+ }
- #ifndef Q_OS_WASM
- qWarning("QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '%ls'", qUtf16Printable(xdgRuntimeDir));
- #endif
- } else {
- fileInfo.setFile(xdgRuntimeDir);
-- }
-- if (fileInfo.exists()) {
-+ if (!fileInfo.exists()) {
-+ qWarning("QStandardPaths: XDG_RUNTIME_DIR points to non-existing path '%s', "
-+ "please create it with 0700 permissions.", qPrintable(xdgRuntimeDir));
-+ return QString();
-+ }
- if (!fileInfo.isDir()) {
- qWarning("QStandardPaths: XDG_RUNTIME_DIR points to '%ls' which is not a directory",
- qUtf16Printable(xdgRuntimeDir));
- return QString();
- }
-- } else {
-- QFileSystemEntry entry(xdgRuntimeDir);
-- if (!QFileSystemEngine::createDirectory(entry, false)) {
-- if (errno != EEXIST) {
-- qErrnoWarning("QStandardPaths: error creating runtime directory %ls",
-- qUtf16Printable(xdgRuntimeDir));
-- return QString();
-- }
-- } else {
-- QSystemError error;
-- if (!QFileSystemEngine::setPermissions(entry, wantedPerms, error)) {
-- qWarning("QStandardPaths: could not set correct permissions on runtime directory %ls: %ls",
-- qUtf16Printable(xdgRuntimeDir), qUtf16Printable(error.toString()));
-- return QString();
-- }
-- }
- }
- // "The directory MUST be owned by the user"
- if (fileInfo.ownerId() != myUid) {
-- qWarning("QStandardPaths: wrong ownership on runtime directory %ls, %d instead of %d",
-- qUtf16Printable(xdgRuntimeDir),
-+ qWarning("QStandardPaths: wrong ownership on runtime directory %s, %d instead of %d", qPrintable(xdgRuntimeDir),
- fileInfo.ownerId(), myUid);
- return QString();
- }
- // "and he MUST be the only one having read and write access to it. Its Unix access mode MUST be 0700."
-+ // since the current user is the owner, set both xxxUser and xxxOwner
-+ const QFile::Permissions wantedPerms = QFile::ReadUser | QFile::WriteUser | QFile::ExeUser
-+ | QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner;
- if (fileInfo.permissions() != wantedPerms) {
-- qWarning("QStandardPaths: wrong permissions on runtime directory %ls, %x instead of %x",
-- qUtf16Printable(xdgRuntimeDir), uint(fileInfo.permissions()), uint(wantedPerms));
-- return QString();
-+ QFile file(xdgRuntimeDir);
-+ if (!file.setPermissions(wantedPerms)) {
-+ qWarning("QStandardPaths: could not set correct permissions on runtime directory %s: %s",
-+ qPrintable(xdgRuntimeDir), qPrintable(file.errorString()));
-+ return QString();
-+ }
- }
-
- return xdgRuntimeDir;
Added: trunk/Tools/buildstream/patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch (0 => 280380)
--- trunk/Tools/buildstream/patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch (rev 0)
+++ trunk/Tools/buildstream/patches/qtbase-revert-qstandardpaths-dont-change-permissions-on-xdg-runtime-dir.patch 2021-07-28 08:34:54 UTC (rev 280380)
@@ -0,0 +1,117 @@
+From 689f77c63a4e9480ce2c8576fdbeb11ab30d206c Mon Sep 17 00:00:00 2001
+From: Jan Grulich <[email protected]>
+Date: Thu, 15 Apr 2021 09:09:10 +0200
+Subject: Revert "QStandardPaths: Don't change permissions of XDG_RUNTIME_DIR"
+
+This reverts commit 0fbb484d4aeb4eff50eb4aa312ab8ff41ce4e082.
+
+diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp
+index 4ebeefcedb..2e779bef66 100644
+--- a/src/corelib/io/qstandardpaths_unix.cpp
++++ b/src/corelib/io/qstandardpaths_unix.cpp
+@@ -94,30 +94,6 @@ static QLatin1String xdg_key_name(QStandardPaths::StandardLocation type)
+ }
+ #endif
+
+-static QByteArray unixPermissionsText(QFile::Permissions permissions)
+-{
+- mode_t perms = 0;
+- if (permissions & QFile::ReadOwner)
+- perms |= S_IRUSR;
+- if (permissions & QFile::WriteOwner)
+- perms |= S_IWUSR;
+- if (permissions & QFile::ExeOwner)
+- perms |= S_IXUSR;
+- if (permissions & QFile::ReadGroup)
+- perms |= S_IRGRP;
+- if (permissions & QFile::WriteGroup)
+- perms |= S_IWGRP;
+- if (permissions & QFile::ExeGroup)
+- perms |= S_IXGRP;
+- if (permissions & QFile::ReadOther)
+- perms |= S_IROTH;
+- if (permissions & QFile::WriteOther)
+- perms |= S_IWOTH;
+- if (permissions & QFile::ExeOther)
+- perms |= S_IXOTH;
+- return '0' + QByteArray::number(perms, 8);
+-}
+-
+ static bool checkXdgRuntimeDir(const QString &xdgRuntimeDir)
+ {
+ auto describeMetaData = [](const QFileSystemMetaData &metaData) -> QByteArray {
+@@ -137,7 +113,27 @@ static bool checkXdgRuntimeDir(const QString &xdgRuntimeDir)
+ else
+ description += "a block device";
+
+- description += " permissions " + unixPermissionsText(metaData.permissions());
++ // convert QFileSystemMetaData permissions back to Unix
++ mode_t perms = 0;
++ if (metaData.permissions() & QFile::ReadOwner)
++ perms |= S_IRUSR;
++ if (metaData.permissions() & QFile::WriteOwner)
++ perms |= S_IWUSR;
++ if (metaData.permissions() & QFile::ExeOwner)
++ perms |= S_IXUSR;
++ if (metaData.permissions() & QFile::ReadGroup)
++ perms |= S_IRGRP;
++ if (metaData.permissions() & QFile::WriteGroup)
++ perms |= S_IWGRP;
++ if (metaData.permissions() & QFile::ExeGroup)
++ perms |= S_IXGRP;
++ if (metaData.permissions() & QFile::ReadOther)
++ perms |= S_IROTH;
++ if (metaData.permissions() & QFile::WriteOther)
++ perms |= S_IWOTH;
++ if (metaData.permissions() & QFile::ExeOther)
++ perms |= S_IXOTH;
++ description += " permissions 0" + QByteArray::number(perms, 8);
+
+ return description
+ + " owned by UID " + QByteArray::number(metaData.userId())
+@@ -190,11 +186,14 @@ static bool checkXdgRuntimeDir(const QString &xdgRuntimeDir)
+
+ // "and he MUST be the only one having read and write access to it. Its Unix access mode MUST be 0700."
+ if (metaData.permissions() != wantedPerms) {
+- qWarning("QStandardPaths: wrong permissions on runtime directory %ls, %s instead of %s",
+- qUtf16Printable(xdgRuntimeDir),
+- unixPermissionsText(metaData.permissions()).constData(),
+- unixPermissionsText(wantedPerms).constData());
+- return false;
++ // attempt to correct:
++ QSystemError error;
++ if (!QFileSystemEngine::setPermissions(entry, wantedPerms, error)) {
++ qErrnoWarning("QStandardPaths: could not set correct permissions on runtime directory "
++ "'%ls', which is %s", qUtf16Printable(xdgRuntimeDir),
++ describeMetaData(metaData).constData());
++ return false;
++ }
+ }
+
+ return true;
+diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+index a0aefac268..afbd64c405 100644
+--- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
++++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+@@ -532,12 +532,7 @@ void tst_qstandardpaths::testCustomRuntimeDirectory_data()
+ d.mkdir("runtime");
+ QFile::setPermissions(p, QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner |
+ QFile::ExeGroup | QFile::ExeOther);
+- updateRuntimeDir(p);
+- QTest::ignoreMessage(QtWarningMsg,
+- QString("QStandardPaths: wrong permissions on runtime directory %1, "
+- "0711 instead of 0700")
+- .arg(p).toLatin1());
+- return fallbackXdgRuntimeDir();
++ return updateRuntimeDir(p);
+ });
+
+ addRow("environment:wrong-owner", [](QDir &) {
+@@ -602,7 +597,6 @@ void tst_qstandardpaths::testCustomRuntimeDirectory_data()
+ clearRuntimeDir();
+ QString p = fallbackXdgRuntimeDir();
+ d.mkdir(p); // probably has wrong permissions
+- QFile::setPermissions(p, QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner);
+ return p;
+ });
+
Deleted: trunk/Tools/buildstream/patches/qtdeclarative-use-python3.patch (280379 => 280380)
--- trunk/Tools/buildstream/patches/qtdeclarative-use-python3.patch 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/patches/qtdeclarative-use-python3.patch 2021-07-28 08:34:54 UTC (rev 280380)
@@ -1,55 +0,0 @@
-diff --git a/qtdeclarative.pro b/qtdeclarative.pro
-index 5b94da9b6..0e3496ce8 100644
---- a/qtdeclarative.pro
-+++ b/qtdeclarative.pro
-@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
- load(qt_parts)
-
- !python_available {
-- py_out = $$system('python -c "print(1)"')
-+ py_out = $$system('python3 -c "print(1)"')
- !equals(py_out, 1): error("Building QtQml requires Python.")
- tmp = python_available
- CONFIG += $$tmp
-diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
-index 0e63ac2ce..7a30ab64e 100644
---- a/src/3rdparty/masm/masm.pri
-+++ b/src/3rdparty/masm/masm.pri
-@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
- udis86.output = udis86_itab.h
- udis86.input = ITAB
- udis86.CONFIG += no_link
-- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-+ udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
- QMAKE_EXTRA_COMPILERS += udis86
-
- udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
-@@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
- retgen.script = $$PWD/yarr/create_regex_tables
- retgen.input = retgen.script
- retgen.CONFIG += no_link
--retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
-+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
- QMAKE_EXTRA_COMPILERS += retgen
-
- # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
-diff --git a/src/3rdparty/masm/yarr/create_regex_tables b/src/3rdparty/masm/yarr/create_regex_tables
-index 4c3dbbe3f..d13084d6c 100644
---- a/src/3rdparty/masm/yarr/create_regex_tables
-+++ b/src/3rdparty/masm/yarr/create_regex_tables
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- # Copyright (C) 2010, 2013-2017 Apple Inc. All rights reserved.
- #
-diff --git a/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode b/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode
-index a103bcdf1..20a358c1a 100644
---- a/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode
-+++ b/src/3rdparty/masm/yarr/generateYarrCanonicalizeUnicode
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python3
-
- # Copyright (C) 2016 Apple Inc. All rights reserved.
- #
Modified: trunk/Tools/buildstream/project.conf (280379 => 280380)
--- trunk/Tools/buildstream/project.conf 2021-07-28 08:29:44 UTC (rev 280379)
+++ trunk/Tools/buildstream/project.conf 2021-07-28 08:34:54 UTC (rev 280380)
@@ -51,8 +51,9 @@
gnome_downloads: https://download.gnome.org/sources/
gst_downloads: https://gstreamer.freedesktop.org/src/
ruby_gems: https://rubygems.org/downloads/
- qt: https://download.qt.io/archive/qt/
+ kde: https://invent.kde.org/qt/qt/
pypi: https://files.pythonhosted.org/packages/
+ vlc: https://code.videolan.org/
# Some overrides to the default sandbox execution environment
#
