From 5a82ae3f5f30538b33165deb1974582f8d07f0fd Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 9 Feb 2019 13:19:54 +0300 Subject: [PATCH] qt5-base:rebuild nouveau.patch --- desktop/toolkit/qt5/qt5-base/actions.py | 2 ++ desktop/toolkit/qt5/qt5-base/pspec.xml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop/toolkit/qt5/qt5-base/actions.py b/desktop/toolkit/qt5/qt5-base/actions.py index 68a2b143c6..ca01a5ee50 100755 --- a/desktop/toolkit/qt5/qt5-base/actions.py +++ b/desktop/toolkit/qt5/qt5-base/actions.py @@ -22,6 +22,8 @@ absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir) bindirQt5="/usr/bin" def setup(): + shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch") + checkdeletepath="%s/qtbase/src/3rdparty" % absoluteWorkDir for dir in ('libjpeg', 'freetype', 'libpng', 'zlib', "xcb", "sqlite"): if os.path.exists(checkdeletepath+dir): diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml index 78d126e25c..a97883eb19 100755 --- a/desktop/toolkit/qt5/qt5-base/pspec.xml +++ b/desktop/toolkit/qt5/qt5-base/pspec.xml @@ -12,6 +12,9 @@ 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 + + qt5-base-nouveau-freeze.patch + at-spi2-core-devel cups-devel @@ -77,7 +80,6 @@ mkspecs.patch qt-delayed-highlight.patch qtbug-69310.patch - qt5-base-nouveau-freeze.patch