diff --git a/desktop/toolkit/qt5/qt5-base/actions.py b/desktop/toolkit/qt5/qt5-base/actions.py index ca01a5ee50..60abf44a4b 100755 --- a/desktop/toolkit/qt5/qt5-base/actions.py +++ b/desktop/toolkit/qt5/qt5-base/actions.py @@ -22,7 +22,7 @@ absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir) bindirQt5="/usr/bin" def setup(): - shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch") + #shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch") checkdeletepath="%s/qtbase/src/3rdparty" % absoluteWorkDir for dir in ('libjpeg', 'freetype', 'libpng', 'zlib', "xcb", "sqlite"): diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml index 997c59f017..bcf14b43b1 100755 --- a/desktop/toolkit/qt5/qt5-base/pspec.xml +++ b/desktop/toolkit/qt5/qt5-base/pspec.xml @@ -11,9 +11,9 @@ 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.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz + http://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtbase-everywhere-src-5.12.2.tar.xz - qt5-base-nouveau-freeze.patch + at-spi2-core-devel @@ -78,8 +78,8 @@ mkspecs.patch - qt-delayed-highlight.patch - qtbug-69310.patch + + @@ -262,6 +262,13 @@ --> + + 2019-04-14 + 5.12.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-02-23 5.12.1