diff --git a/desktop/toolkit/qt5/qt5-base/actions.py b/desktop/toolkit/qt5/qt5-base/actions.py
index 46117fd5d0..e2fdff94b9 100755
--- a/desktop/toolkit/qt5/qt5-base/actions.py
+++ b/desktop/toolkit/qt5/qt5-base/actions.py
@@ -12,7 +12,8 @@ from pisi.actionsapi import get
import os
-WorkDir = "qtbase-everywhere-src-%s" % get.srcVERSION().replace('_','-').replace('pre1', 'tp')
+WorkDir = "qtbase-kde-5.15"
+#WorkDir = "qtbase-everywhere-src-%s" % get.srcVERSION().replace('_','-').replace('pre1', 'tp')
qtbase = qt5.prefix
absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
@@ -22,6 +23,9 @@ absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
bindirQt5="/usr/bin"
def setup():
+ shelltools.system("mkdir .git")
+ pisitools.dosed(".qmake.conf", "5.15.3", "5.15.2")
+
#shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch")
checkdeletepath="%s/qtbase/src/3rdparty" % absoluteWorkDir
diff --git a/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch b/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch
index 1bb0a51e33..336946155e 100755
--- a/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch
+++ b/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch
@@ -1,49 +1,47 @@
-diff -Nurp qtbase-opensource/mkspecs/common/g++-base.conf qtbase-opensourcey/mkspecs/common/g++-base.conf
---- qtbase-opensource/mkspecs/common/g++-base.conf 2015-10-13 07:35:32.000000000 +0300
-+++ mkspecs/common/g++-base.conf 2015-10-18 00:30:49.000000000 +0300
-@@ -10,15 +10,19 @@
+diff -Nuar a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf
+--- a/mkspecs/common/g++-base.conf 2021-11-15 00:00:01.000000000 +0200
++++ b/mkspecs/common/g++-base.conf 2021-11-15 22:49:20.969099951 +0200
+@@ -10,15 +10,17 @@
QMAKE_COMPILER = gcc
--QMAKE_CC = gcc
+-QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CC = PISILINUX_CC
- QMAKE_LINK_C = $$QMAKE_CC
- QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+-QMAKE_LINK_C = $$QMAKE_CC
+-QMAKE_LINK_C_SHLIB = $$QMAKE_CC
++QMAKE_LINK_C = PISILINUX_CC
++QMAKE_LINK_C_SHLIB = PISILINUX_CC
--QMAKE_CXX = g++
+-QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_CXX = PISILINUX_CXX
-QMAKE_LINK = $$QMAKE_CXX
-QMAKE_LINK_SHLIB = $$QMAKE_CXX
-+QMAKE_LINK = PISILINUX_CXX
-+QMAKE_LINK_SHLIB = PISILINUX_CXX
-+QMAKE_LINK_C = PISILINUX_CC
-+QMAKE_LINK_C_SHLIB = PISILINUX_CC
++QMAKE_LINK = PISILINUX_CXX
++QMAKE_LINK_SHLIB = PISILINUX_CXX
+
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_PCH_OUTPUT_EXT = .gch
-diff -Nurp qtbase-opensource/mkspecs/common/g++-unix.conf qtbase-opensourcey/mkspecs/common/g++-unix.conf
---- qtbase-opensource/mkspecs/common/g++-unix.conf 2015-10-13 07:35:32.000000000 +0300
-+++ mkspecs/common/g++-unix.conf 2015-10-18 00:31:47.000000000 +0300
+diff -Nuar a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
+--- a/mkspecs/common/g++-unix.conf 2021-11-15 00:00:01.000000000 +0200
++++ b/mkspecs/common/g++-unix.conf 2021-11-15 22:51:51.058450056 +0200
@@ -10,5 +10,5 @@
include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
-+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
++QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
-diff -Nurp qtbase-opensource/mkspecs/common/linux.conf qtbase-opensourcey/mkspecs/common/linux.conf
---- qtbase-opensource/mkspecs/common/linux.conf 2015-10-13 07:35:32.000000000 +0300
-+++ mkspecs/common/linux.conf 2015-10-18 00:33:07.000000000 +0300
-@@ -49,7 +49,7 @@ QMAKE_OBJCOPY = objcopy
+diff -Nuar a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+--- a/mkspecs/common/linux.conf 2021-11-15 00:00:01.000000000 +0200
++++ b/mkspecs/common/linux.conf 2021-11-15 22:52:35.802019704 +0200
+@@ -48,5 +48,5 @@
QMAKE_NM = nm -P
QMAKE_RANLIB =
-QMAKE_STRIP = strip
-+QMAKE_STRIP =
++QMAKE_STRIP =
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-
- include(unix.conf)
diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml
index 8fb5432bf8..53d252dff4 100755
--- a/desktop/toolkit/qt5/qt5-base/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-base/pspec.xml
@@ -11,7 +11,7 @@
Cross platform application and UI framework
Cross platform application and UI development framework
'GPL3' 'LGPL3' 'FDL' 'custom'
- http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz
+ https://invent.kde.org/qt/qt/qtbase/-/archive/kde/5.15/qtbase-kde-5.15.tar.bz2
@@ -84,8 +84,8 @@
- mkspecs2.patch
- qt_kde.patch
+ mkspecs3.patch
+
qt5-base-nostrip.patch
@@ -280,6 +280,13 @@
-->
+
+ 2021-11-15
+ 5.15.2
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2021-11-10
5.15.2