diff --git a/desktop/toolkit/qt5/qt5-base/actions.py b/desktop/toolkit/qt5/qt5-base/actions.py old mode 100644 new mode 100755 index ba17511b11..68a2b143c6 --- a/desktop/toolkit/qt5/qt5-base/actions.py +++ b/desktop/toolkit/qt5/qt5-base/actions.py @@ -18,7 +18,8 @@ qtbase = qt5.prefix absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir) #Temporary bindir to avoid qt4 conflicts -bindirQt5="/usr/lib/qt5/bin" +#bindirQt5="/usr/lib/qt5/bin" +bindirQt5="/usr/bin" def setup(): checkdeletepath="%s/qtbase/src/3rdparty" % absoluteWorkDir @@ -112,9 +113,9 @@ def install(): qt5.install("INSTALL_ROOT=%s" % get.installDIR()) #I hope qtchooser will manage this issue - for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()): - pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin) + #for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()): + #pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin) mkspecPath = "%s/mkspecs" % qt5.archdatadir - pisitools.dodoc("LGPL_EXCEPTION.txt", "LICENSE.*") + pisitools.dodoc("LICENSE.*") diff --git a/desktop/toolkit/qt5/qt5-base/files/4a04eea4.patch b/desktop/toolkit/qt5/qt5-base/files/4a04eea4.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/9395f35c.patch b/desktop/toolkit/qt5/qt5-base/files/9395f35c.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/add docs for QPlatformTheme.patch b/desktop/toolkit/qt5/qt5-base/files/add docs for QPlatformTheme.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/e4e87a2e.patch b/desktop/toolkit/qt5/qt5-base/files/e4e87a2e.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/fa091640.patch b/desktop/toolkit/qt5/qt5-base/files/fa091640.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/fix the JPEG EXIF reader.patch b/desktop/toolkit/qt5/qt5-base/files/fix the JPEG EXIF reader.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch b/desktop/toolkit/qt5/qt5-base/files/mkspecs.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qsettings_XDG_CONFIG_DIRS.patch b/desktop/toolkit/qt5/qt5-base/files/qsettings_XDG_CONFIG_DIRS.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qt5-base-firebird.patch b/desktop/toolkit/qt5/qt5-base/files/qt5-base-firebird.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qt5-base-hdpi-scale.patch b/desktop/toolkit/qt5/qt5-base/files/qt5-base-hdpi-scale.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qt5-base-libpng.patch b/desktop/toolkit/qt5/qt5-base/files/qt5-base-libpng.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qt5-base-stutter.patch b/desktop/toolkit/qt5/qt5-base/files/qt5-base-stutter.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qt5-qtbase-5.9.1-firebird.patch b/desktop/toolkit/qt5/qt5-base/files/qt5-qtbase-5.9.1-firebird.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbase-hidpi_scale_at_192.patch b/desktop/toolkit/qt5/qt5-base/files/qtbase-hidpi_scale_at_192.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbase-mariadb.patch b/desktop/toolkit/qt5/qt5-base/files/qtbase-mariadb.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch b/desktop/toolkit/qt5/qt5-base/files/qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbase-opensource-src-5.9.0-mysql.patch b/desktop/toolkit/qt5/qt5-base/files/qtbase-opensource-src-5.9.0-mysql.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbase-opensource-src-5.9.3-QTBUG-64742-out-of-bounds-in-qdnslookup_unix.patch b/desktop/toolkit/qt5/qt5-base/files/qtbase-opensource-src-5.9.3-QTBUG-64742-out-of-bounds-in-qdnslookup_unix.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/qtbug-65478.patch b/desktop/toolkit/qt5/qt5-base/files/qtbug-65478.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch b/desktop/toolkit/qt5/qt5-base/files/revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/files/xcberror_filter.patch b/desktop/toolkit/qt5/qt5-base/files/xcberror_filter.patch old mode 100644 new mode 100755 diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml old mode 100644 new mode 100755 index 725dc87579..e7fd8891d7 --- 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.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz + http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz at-spi2-core-devel cups-devel @@ -73,7 +73,7 @@ mkspecs.patch - qt5-base-stutter.patch + @@ -262,6 +262,13 @@ --> + + 2018-12-05 + 5.12.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-11-05 5.11.2 diff --git a/desktop/toolkit/qt5/qt5-base/translations.xml b/desktop/toolkit/qt5/qt5-base/translations.xml old mode 100644 new mode 100755