diff --git a/srcpkgs/qt5integration/patches/qt5.14.patch b/srcpkgs/qt5integration/patches/qt5.14.patch new file mode 100644 index 00000000000..abe90b78c9c --- /dev/null +++ b/srcpkgs/qt5integration/patches/qt5.14.patch @@ -0,0 +1,46 @@ +diff --git a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp +index e98487b..45e90bc 100644 +--- platformthemeplugin/qdeepintheme.cpp ++++ platformthemeplugin/qdeepintheme.cpp +@@ -571,10 +571,18 @@ static bool updateScreenScaleFactors(DThemeSettings *s, const QByteArray &value, + } + + QHighDpiScaling::updateHighDpiScaling(); ++#if QT_VERSION < QT_VERSION_CHECK(5,14,0) + qDebug() << QHighDpiScaling::logicalDpi(); ++#else ++ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen()); ++#endif + updateScaleLogcailDpi(s->scaleLogicalDpi()); + ++#if QT_VERSION < QT_VERSION_CHECK(5,14,0) + qDebug() << QHighDpiScaling::logicalDpi(); ++#else ++ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen()); ++#endif + + return true; + } +--- platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:45:47.396894045 +0800 ++++ platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:46:28.436136243 +0800 +@@ -516,19 +516,7 @@ + static bool updateScaleLogcailDpi(const QPair &dpi) + { + bool ok = dpi.first >= 0 && dpi.second >= 0; +- +- if (dpi.first > 0) { +- QHighDpiScaling::m_logicalDpi.first = dpi.first; +- } else if (qIsNull(dpi.first)) { +- QHighDpiScaling::m_logicalDpi.first = qGuiApp->primaryScreen()->handle()->logicalDpi().first; +- } +- +- if (dpi.second > 0) { +- QHighDpiScaling::m_logicalDpi.second = dpi.second; +- } else if (qIsNull(dpi.second)) { +- QHighDpiScaling::m_logicalDpi.second = qGuiApp->primaryScreen()->handle()->logicalDpi().second; +- } +- ++ QHighDpiScaling::m_usePixelDensity = false; + return ok; + } + diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template index 87cdb911915..3366a15e15f 100644 --- a/srcpkgs/qt5integration/template +++ b/srcpkgs/qt5integration/template @@ -1,12 +1,12 @@ # Template file for 'qt5integration' pkgname=qt5integration version=5.0.0 -revision=3 +revision=4 build_style=qmake hostmakedepends="qt5-qmake pkg-config" makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel" -depends="qt5dxcb-plugin qt5-styleplugins qt5>=5.13.2<5.13.3" +depends="qt5dxcb-plugin qt5-styleplugins qt5-core>=5.14.2<5.14.3" short_desc="Qt platform theme integration plugins for Deepin Desktop Environment" maintainer="John " license="GPL-3.0-or-later" @@ -18,7 +18,7 @@ checksum=59eff73ea16ded0a54fe91a08168d53b96f6e7fe9a53b599ba37346b283d6a7c pre_configure() { _qt5_dep_ver="${depends#*>=}" _qt5_dep_ver="${_qt5_dep_ver%<*}" - _qt5_version="$(xbps-uhelper version qt5)" + _qt5_version="$(xbps-uhelper version qt5-core)" if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then echo