From a2b29931fe9d2d7ba52145cd16f8a94dd1f059c7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 11 Nov 2020 15:44:20 +0100 Subject: [PATCH] Remove package: qt5integration every update attempt of the deepin software stack resulted in some pain or some kind of breakage somewhere. Since nobody else seems to be intrested in updating it, remove it. --- srcpkgs/qt5integration/patches/qt5.13.patch | 9 ---- srcpkgs/qt5integration/patches/qt5.14.patch | 46 --------------------- srcpkgs/qt5integration/patches/qt5.15.patch | 40 ------------------ srcpkgs/qt5integration/template | 40 ------------------ 4 files changed, 135 deletions(-) delete mode 100644 srcpkgs/qt5integration/patches/qt5.13.patch delete mode 100644 srcpkgs/qt5integration/patches/qt5.14.patch delete mode 100644 srcpkgs/qt5integration/patches/qt5.15.patch delete mode 100644 srcpkgs/qt5integration/template diff --git a/srcpkgs/qt5integration/patches/qt5.13.patch b/srcpkgs/qt5integration/patches/qt5.13.patch deleted file mode 100644 index 8cb82dd8e10..00000000000 --- a/srcpkgs/qt5integration/patches/qt5.13.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- dstyleplugin/style.cpp 2019-06-01 04:49:41.000000000 +0000 -+++ - 2019-07-12 20:48:16.221885362 +0000 -@@ -1418,6 +1418,4 @@ - } - } - --#include "moc_style.cpp" -- - } diff --git a/srcpkgs/qt5integration/patches/qt5.14.patch b/srcpkgs/qt5integration/patches/qt5.14.patch deleted file mode 100644 index abe90b78c9c..00000000000 --- a/srcpkgs/qt5integration/patches/qt5.14.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/patches/qt5.15.patch b/srcpkgs/qt5integration/patches/qt5.15.patch deleted file mode 100644 index 991b6a3a615..00000000000 --- a/srcpkgs/qt5integration/patches/qt5.15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- dstyleplugin/painterhelper.cpp 2019-06-01 06:49:41.000000000 +0200 -+++ - 2020-06-13 19:53:12.351525353 +0200 -@@ -18,6 +18,7 @@ - #include "painterhelper.h" - - #include -+#include - #include - - namespace dstyle { ---- dstyleplugin/tabwidgethelper.cpp 2019-06-01 06:49:41.000000000 +0200 -+++ - 2020-06-13 19:55:48.688315440 +0200 -@@ -20,6 +20,7 @@ - #include "painterhelper.h" - - #include -+#include - #include - #include - ---- dstyleplugin/pushbuttonhelper.cpp 2019-06-01 06:49:41.000000000 +0200 -+++ - 2020-06-13 19:59:30.207650141 +0200 -@@ -29,6 +29,7 @@ - #endif - - #include -+#include - #include - - DWIDGET_USE_NAMESPACE ---- dstyleplugin/tabbarhelper.cpp 2019-06-01 06:49:41.000000000 +0200 -+++ - 2020-06-13 19:59:51.345283503 +0200 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template deleted file mode 100644 index f083e559d83..00000000000 --- a/srcpkgs/qt5integration/template +++ /dev/null @@ -1,40 +0,0 @@ -# Template file for 'qt5integration' -pkgname=qt5integration -version=5.0.0 -revision=7 -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-core>=5.15.1<5.15.2" -short_desc="Qt platform theme integration plugins for Deepin Desktop Environment" -maintainer="John " -license="GPL-3.0-or-later" -homepage="https://github.com/linuxdeepin/qt5integration" -changelog="https://github.com/linuxdeepin/qt5integration/blob/${version}/CHANGELOG.md" -distfiles="https://github.com/linuxdeepin/qt5integration/archive/${version}.tar.gz" -checksum=59eff73ea16ded0a54fe91a08168d53b96f6e7fe9a53b599ba37346b283d6a7c - -pre_configure() { - _qt5_dep_ver="${depends#*>=}" - _qt5_dep_ver="${_qt5_dep_ver%<*}" - _qt5_version="$(xbps-uhelper version qt5-core)" - - if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then - echo - msg_red "Qt5 version doesn't match version listed in \$depends\\n" - msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n" - exit 1 - fi -} - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-devel qt5-x11extras-devel" - pre_configure() { - _qtxdg_version=$(PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig\ - pkg-config --modversion Qt5XdgIconLoader) - echo $_qtxdg_version - sed -i -e "s%INCLUDEPATH +=.*%INCLUDEPATH += ${XBPS_CROSS_BASE}/usr/include/qt5xdgiconloader/${_qtxdg_version}%g"\ - platformthemeplugin/qt5deepintheme-plugin.pro - } -fi