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.
This commit is contained in:
John 2020-11-11 15:44:20 +01:00 committed by John Zimmermann
parent c3805e11b6
commit a2b29931fe
4 changed files with 0 additions and 135 deletions

View file

@ -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"
-
}

View file

@ -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<qreal, qreal> &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;
}

View file

@ -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 <QPainter>
+#include <QPainterPath>
#include <QDebug>
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 <QPainter>
+#include <QPainterPath>
#include <QTabWidget>
#include <QDebug>
--- 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 <QDebug>
+#include <QPainterPath>
#include <QStyleOptionButton>
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 <QStyleOptionTabBarBase>
#include <QStyleOptionToolButton>
#include <QPainter>
+#include <QPainterPath>
#include <QToolButton>
#include <QLinearGradient>
#include <QDebug>

View file

@ -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 <me@johnnynator.dev>"
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