[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [flatpak-kde-runtime] /: Move to Qt 5.9
From: Aleix Pol <null () kde ! org>
Date: 2017-05-31 22:19:13
Message-ID: E1dGBxR-0007V6-OE () code ! kde ! org
[Download RAW message or body]
Git commit d05a1a92ede08c41175602494a25721eb8f54eed by Aleix Pol.
Committed on 31/05/2017 at 22:19.
Pushed by apol into branch 'master'.
Move to Qt 5.9
Had to remove QtWebEngine's patch because it doesn't apply anymore, David
Rosca could you please take a look again?
CCMAIL: nowrep@gmail.com
M +20 -21 org.kde.Sdk.json
D +0 -14 qtwebengine-no-udev.patch
https://commits.kde.org/flatpak-kde-runtime/d05a1a92ede08c41175602494a25721eb8f54eed
diff --git a/org.kde.Sdk.json b/org.kde.Sdk.json
index b0ba4bf..186103b 100644
--- a/org.kde.Sdk.json
+++ b/org.kde.Sdk.json
@@ -115,7 +115,7 @@
"-archdatadir", "/usr/lib/"
],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtbase.git", "branch": \
"v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtbase.git", "branch": "v5.9.0" }, {
"type": "shell",
"commands": [ "mv configure configure.qt" ]
@@ -134,7 +134,7 @@
"name": "qt5-qtdeclarative",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtdeclarative.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtdeclarative.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -151,7 +151,7 @@
"/bin/qtplugininfo", "/bin/qtdiag", "/bin/qdbusviewer"
],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qttools.git", "branch": \
"v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qttools.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -163,7 +163,7 @@
"name": "qt5-qtscript",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtscript.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtscript.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -176,7 +176,7 @@
"name": "qt5-webchannel",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtwebchannel.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtwebchannel.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -221,8 +221,7 @@
"name": "qt5-qtwebengine",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtwebengine.git", \
"branch": "v5.8.0" },
- { "type": "patch", "path": "qtwebengine-no-udev.patch" },
+ { "type": "git", "url": "git://code.qt.io/qt/qtwebengine.git", \
"branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -234,7 +233,7 @@
"name": "qt5-qtsvg",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtsvg.git", "branch": \
"v5.8.0" }, + { "type": "git", "url": "git://code.qt.io/qt/qtsvg.git", \
"branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -246,7 +245,7 @@
"name": "qt5-qtx11extras",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtx11extras.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtx11extras.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -258,7 +257,7 @@
"name": "qt5-qtmultimedia",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtmultimedia.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtmultimedia.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -270,7 +269,7 @@
"name": "qt5-qtsensors",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtsensors.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtsensors.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -282,7 +281,7 @@
"name": "qt5-qtquickcontrols",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtquickcontrols.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtquickcontrols.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -294,7 +293,7 @@
"name": "qt5-qtquickcontrols2",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtquickcontrols2.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtquickcontrols2.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -306,7 +305,7 @@
"name": "qt5-qtlocation",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": "git://code.qt.io/qt/qtlocation.git", \
"branch": "v5.8.0" }, + { "type": "git", "url": \
"git://code.qt.io/qt/qtlocation.git", "branch": "v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -318,7 +317,7 @@
"name": "qt5-qtgraphicaleffects",
"cleanup-platform": [ "/bin", "/mkspecs" ],
"sources": [
- { "type": "git", "url": \
"git://code.qt.io/qt/qtgraphicaleffects.git", "branch": "v5.8.0" }, + \
{ "type": "git", "url": "git://code.qt.io/qt/qtgraphicaleffects.git", "branch": \
"v5.9.0" }, {
"type": "script",
"commands": [ "qmake" ],
@@ -332,8 +331,8 @@
"sources": [
{
"type": "archive",
- "url": \
"http://download.qt.io/archive/qt/5.8/5.8.0/submodules/qtxmlpatterns-opensource-src-5.8.0.tar.xz",
- "sha256": \
"7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04" + \
"url": "http://download.qt.io/archive/qt/5.9/5.9.0/submodules/qtxmlpatterns-opensource-src-5.9.0.tar.xz",
+ "sha256": \
"41f8223b1d4cfc475ef66888a178847cc7191954ed52d047be90f0d68ea755b8" },
{
"type": "script",
@@ -349,7 +348,7 @@
{
"type": "git",
"url": "git://code.qt.io/qt/qtimageformats.git",
- "branch": "v5.8.0"
+ "branch": "v5.9.0"
},
{
"type": "script",
@@ -365,7 +364,7 @@
{
"type": "git",
"url": "git://code.qt.io/qt/qtconnectivity.git",
- "branch": "v5.8.0"
+ "branch": "v5.9.0"
},
{
"type": "script",
@@ -381,7 +380,7 @@
{
"type": "git",
"url": "git://code.qt.io/qt/qtwayland.git",
- "branch": "v5.8.0"
+ "branch": "v5.9.0"
},
{
"type": "script",
@@ -397,7 +396,7 @@
{
"type": "git",
"url": "git://code.qt.io/qt/qtvirtualkeyboard.git",
- "branch": "v5.8.0"
+ "branch": "v5.9.0"
},
{
"type": "script",
diff --git a/qtwebengine-no-udev.patch b/qtwebengine-no-udev.patch
deleted file mode 100644
index 3afaca0..0000000
--- a/qtwebengine-no-udev.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
-index c583845e..a65d5a29 100644
---- a/src/core/gyp_run.pro
-+++ b/src/core/gyp_run.pro
-@@ -144,6 +144,9 @@ contains(WEBENGINE_CONFIG, reduce_binary_size): GYP_CONFIG += \
release_optimize=s
- GYP_CONFIG += qt_install_translations=\"$$[QT_INSTALL_TRANSLATIONS/get]\"
- }
-
-+# Disable Udev
-+GYP_CONFIG += use_udev=0
-+
- # Append additional platform options defined in GYP_CONFIG
- for (config, GYP_CONFIG): GYP_ARGS += "-D $$config"
-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic