Title: [263088] trunk/Tools
Revision
263088
Author
[email protected]
Date
2020-06-16 07:58:23 -0700 (Tue, 16 Jun 2020)

Log Message

[Flatpak SDK] Update to Qt 5.15
https://bugs.webkit.org/show_bug.cgi?id=213192

Patch by Philippe Normand <[email protected]> on 2020-06-16
Reviewed by Sergio Villar Senin.

The new patch comes from the upstream KDE SDK: https://github.com/KDE/flatpak-kde-runtime/tree/qt5.15lts/patch

* buildstream/elements/qt5/qtbase.bst:
* buildstream/elements/qt5/qtdeclarative.bst:
* buildstream/elements/qt5/qtquickcontrols.bst:
* buildstream/elements/qt5/qtquickcontrols2.bst:
* buildstream/elements/qt5/qtwayland.bst:
* buildstream/elements/qt5/qtx11extras.bst:
* buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch: Added.
* buildstream/patches/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch: Removed.
* buildstream/project.conf:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Tools/ChangeLog (263087 => 263088)


--- trunk/Tools/ChangeLog	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/ChangeLog	2020-06-16 14:58:23 UTC (rev 263088)
@@ -1,3 +1,22 @@
+2020-06-16  Philippe Normand  <[email protected]>
+
+        [Flatpak SDK] Update to Qt 5.15
+        https://bugs.webkit.org/show_bug.cgi?id=213192
+
+        Reviewed by Sergio Villar Senin.
+
+        The new patch comes from the upstream KDE SDK: https://github.com/KDE/flatpak-kde-runtime/tree/qt5.15lts/patch
+        
+        * buildstream/elements/qt5/qtbase.bst:
+        * buildstream/elements/qt5/qtdeclarative.bst:
+        * buildstream/elements/qt5/qtquickcontrols.bst:
+        * buildstream/elements/qt5/qtquickcontrols2.bst:
+        * buildstream/elements/qt5/qtwayland.bst:
+        * buildstream/elements/qt5/qtx11extras.bst:
+        * buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch: Added.
+        * buildstream/patches/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch: Removed.
+        * buildstream/project.conf:
+
 2020-06-16  Carlos Garcia Campos  <[email protected]>
 
         [GTK][WPE] Add API to configure and enable resource load statistics

Modified: trunk/Tools/buildstream/elements/qt5/qtbase.bst (263087 => 263088)


--- trunk/Tools/buildstream/elements/qt5/qtbase.bst	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/elements/qt5/qtbase.bst	2020-06-16 14:58:23 UTC (rev 263088)
@@ -52,10 +52,6 @@
   - |
     make -j1 INSTALL_ROOT=%{install-root} install
 
-    #  - |
-    #    rm -f "%{install-root}%{libdir}"/*.a
-    #    rm -f "%{install-root}%{libdir}/lib"/*.la
-
 public:
   bst:
     split-rules:
@@ -65,8 +61,8 @@
 
 sources:
 - kind: tar
-  url: http://download.qt.io/archive/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
-  ref: d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
+  url: qt:5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
+  ref: 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
 - kind: patch
   path: patches/qtbase-avoid-hardcoding-kernel-version.patch
 - kind: patch
@@ -73,3 +69,5 @@
   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

Modified: trunk/Tools/buildstream/elements/qt5/qtdeclarative.bst (263087 => 263088)


--- trunk/Tools/buildstream/elements/qt5/qtdeclarative.bst	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/elements/qt5/qtdeclarative.bst	2020-06-16 14:58:23 UTC (rev 263088)
@@ -1,5 +1,4 @@
 kind: qmake
-description: json2bst conversion of qt5/qtdeclarative
 
 depends:
 - qt5/qtbase.bst
@@ -6,7 +5,7 @@
 
 sources:
 - kind: tar
-  url: http://download.qt.io/archive/qt/5.14/5.14.1/submodules/qtdeclarative-everywhere-src-5.14.1.tar.xz
-  ref: 762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a
+  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

Modified: trunk/Tools/buildstream/elements/qt5/qtquickcontrols.bst (263087 => 263088)


--- trunk/Tools/buildstream/elements/qt5/qtquickcontrols.bst	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/elements/qt5/qtquickcontrols.bst	2020-06-16 14:58:23 UTC (rev 263088)
@@ -1,5 +1,4 @@
 kind: qmake
-description: json2bst conversion of qt5/qtquickcontrols
 
 depends:
 - qt5/qtdeclarative.bst
@@ -6,5 +5,5 @@
 
 sources:
 - kind: tar
-  url: http://download.qt.io/archive/qt/5.14/5.14.1/submodules/qtquickcontrols-everywhere-src-5.14.1.tar.xz
-  ref: 54519e7c6748bb9af46435a7ba2ce1c53e4ad164a70e88915fe0e61277540a1a
+  url: qt:5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz
+  ref: 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee

Modified: trunk/Tools/buildstream/elements/qt5/qtquickcontrols2.bst (263087 => 263088)


--- trunk/Tools/buildstream/elements/qt5/qtquickcontrols2.bst	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/elements/qt5/qtquickcontrols2.bst	2020-06-16 14:58:23 UTC (rev 263088)
@@ -1,5 +1,4 @@
 kind: qmake
-description: json2bst conversion of qt5/qtquickcontrols2
 
 depends:
 - qt5/qtdeclarative.bst
@@ -6,5 +5,5 @@
 
 sources:
 - kind: tar
-  url: http://download.qt.io/archive/qt/5.14/5.14.1/submodules/qtquickcontrols2-everywhere-src-5.14.1.tar.xz
-  ref: 52d652c48933cc8416a91138eb6fb4c31625734265671f286b6c0d3e27d120ae
+  url: qt:5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz
+  ref: 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f

Modified: trunk/Tools/buildstream/elements/qt5/qtwayland.bst (263087 => 263088)


--- trunk/Tools/buildstream/elements/qt5/qtwayland.bst	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/elements/qt5/qtwayland.bst	2020-06-16 14:58:23 UTC (rev 263088)
@@ -6,7 +6,5 @@
 
 sources:
 - kind: tar
-  url: http://ftp1.nluug.nl/languages/qt/archive/qt/5.14/5.14.1/submodules/qtwayland-everywhere-src-5.14.1.tar.xz
-  ref: 2a03b9f554e88c5824ef237c814b3dd45844c022e97be0e091f4a502ca4c9520
-- kind: patch
-  path: patches/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch
+  url: qt:5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz
+  ref: 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb

Modified: trunk/Tools/buildstream/elements/qt5/qtx11extras.bst (263087 => 263088)


--- trunk/Tools/buildstream/elements/qt5/qtx11extras.bst	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/elements/qt5/qtx11extras.bst	2020-06-16 14:58:23 UTC (rev 263088)
@@ -1,5 +1,4 @@
 kind: qmake
-description: json2bst conversion of qt5/qtx11extras
 
 depends:
 - qt5/qtbase.bst
@@ -6,5 +5,5 @@
 
 sources:
 - kind: tar
-  url: http://download.qt.io/archive/qt/5.14/5.14.1/submodules/qtx11extras-everywhere-src-5.14.1.tar.xz
-  ref: b268907deb06570671c1f584feb1508e7fded129209a268183decc122bfac181
+  url: qt:5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz
+  ref: c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1

Added: trunk/Tools/buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch (0 => 263088)


--- trunk/Tools/buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch	                        (rev 0)
+++ trunk/Tools/buildstream/patches/qtbase-make-sure-to-correctly-construct-base-platform-theme.patch	2020-06-16 14:58:23 UTC (rev 263088)
@@ -0,0 +1,26 @@
+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/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch (263087 => 263088)


--- trunk/Tools/buildstream/patches/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/patches/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch	2020-06-16 14:58:23 UTC (rev 263088)
@@ -1,39 +0,0 @@
-diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
-index 97e0203c..5bee160a 100644
---- a/src/client/qwaylandintegration.cpp
-+++ b/src/client/qwaylandintegration.cpp
-@@ -99,20 +99,26 @@ public:
- 
-         if (QGuiApplication::desktopSettingsAware()) {
-             const QByteArray desktopEnvironment = QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment();
--
-+            QList<QByteArray> gtkBasedEnvironments;
-+            gtkBasedEnvironments << "GNOME"
-+                                 << "X-CINNAMON"
-+                                 << "UNITY"
-+                                 << "MATE"
-+                                 << "XFCE"
-+                                 << "LXDE";
-             if (desktopEnvironment == QByteArrayLiteral("KDE")) {
- #if QT_CONFIG(settings)
-                 result.push_back(QStringLiteral("kde"));
- #endif
--            } else if (!desktopEnvironment.isEmpty() &&
--                desktopEnvironment != QByteArrayLiteral("UNKNOWN") &&
--                desktopEnvironment != QByteArrayLiteral("GNOME") &&
--                desktopEnvironment != QByteArrayLiteral("UNITY") &&
--                desktopEnvironment != QByteArrayLiteral("MATE") &&
--                desktopEnvironment != QByteArrayLiteral("XFCE") &&
--                desktopEnvironment != QByteArrayLiteral("LXDE"))
-+            } else if (gtkBasedEnvironments.contains(desktopEnvironment)) {
-+                // prefer the GTK3 theme implementation with native dialogs etc.
-+                result.push_back(QStringLiteral("gtk3"));
-+                // fallback to the generic Gnome theme if loading the GTK3 theme fails
-+                result.push_back(QLatin1String(QGnomeTheme::name));
-+            } else if (!desktopEnvironment.isEmpty() && desktopEnvironment != QByteArrayLiteral("UNKNOWN")) {
-                 // Ignore X11 desktop environments
-                 result.push_back(QString::fromLocal8Bit(desktopEnvironment.toLower()));
-+            }
-         }
- 
-         if (result.isEmpty())

Modified: trunk/Tools/buildstream/project.conf (263087 => 263088)


--- trunk/Tools/buildstream/project.conf	2020-06-16 14:57:23 UTC (rev 263087)
+++ trunk/Tools/buildstream/project.conf	2020-06-16 14:58:23 UTC (rev 263088)
@@ -49,6 +49,7 @@
   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/
 
 # Some overrides to the default sandbox execution environment
 #
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to