[arch-commits] Commit in deepin-qt5integration/repos/community-x86_64 (3 files)
Felix Yan
felixonmars at archlinux.org
Tue May 12 09:58:36 UTC 2020
Date: Tuesday, May 12, 2020 @ 09:58:35
Author: felixonmars
Revision: 626683
archrelease: copy trunk to community-x86_64
Added:
deepin-qt5integration/repos/community-x86_64/PKGBUILD
(from rev 626682, deepin-qt5integration/trunk/PKGBUILD)
Deleted:
deepin-qt5integration/repos/community-x86_64/PKGBUILD
deepin-qt5integration/repos/community-x86_64/deepin-qt5integration-qt5.14.patch
------------------------------------+
PKGBUILD | 64 ++++++++++++++---------------------
deepin-qt5integration-qt5.14.patch | 46 -------------------------
2 files changed, 27 insertions(+), 83 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-12 09:58:19 UTC (rev 626682)
+++ PKGBUILD 2020-05-12 09:58:35 UTC (rev 626683)
@@ -1,37 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=5.1.0
-pkgrel=1
-pkgdesc='Qt platform theme integration plugins for DDE'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/qt5integration"
-license=('GPL3')
-depends=('dtkwidget' 'libqtxdg' 'deepin-qt5dxcb-plugin')
-makedepends=('xcb-util-renderutil' 'deepin-file-manager')
-replaces=('qt5dxcb-plugin')
-conflicts=('qt5dxcb-plugin')
-groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz"
- deepin-qt5integration-qt5.14.patch)
-sha512sums=('a550021508f968ec7501595a031dd400633216de704a48cd294a9b00b2a5aae57d88a3b9322f945d5adc4d13eb98b5eef6621e5967508e2a1a7c316cf0592feb'
- 'd227f060b3dfd324c19a957e90a210256649c366645bb2e712dbdefb0b9287dc0ae97fa14e0252d168323b06e7ba526bc351600273a4afb7c3fa2b8d59e42aa0')
-
-prepare() {
- cd qt5integration-$pkgver
- patch -p1 -i ../deepin-qt5integration-qt5.14.patch # Fix build with Qt 5.14
-
- sed -i 's/^.*DPlatformWindowHandle.*$/Dtk::Widget::DPlatformWindowHandle handle((QWidget *)w);/' styleplugins/dstyleplugin/config.tests/dtkwidget/main.cpp
- sed -i 's/QSpinBox/DSpinBox/' styleplugins/chameleon/chameleonstyle.cpp
-}
-
-build() {
- cd qt5integration-$pkgver
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd qt5integration-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: deepin-qt5integration/repos/community-x86_64/PKGBUILD (from rev 626682, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-12 09:58:35 UTC (rev 626683)
@@ -0,0 +1,27 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=5.1.0.1
+pkgrel=1
+pkgdesc='Qt platform theme integration plugins for DDE'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/qt5integration"
+license=('GPL3')
+depends=('dtkwidget' 'libqtxdg' 'deepin-qt5dxcb-plugin')
+makedepends=('xcb-util-renderutil' 'deepin-file-manager')
+replaces=('qt5dxcb-plugin')
+conflicts=('qt5dxcb-plugin')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz")
+sha512sums=('a302e9177eca680f13a266a2297247ac35817af7811830e4974dfa207adf73617ac16f24cdba1bfccf419ab72cc9dd1d4b5d5109f544063a4c55a59c2b4abbcf')
+
+build() {
+ cd qt5integration-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd qt5integration-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: deepin-qt5integration-qt5.14.patch
===================================================================
--- deepin-qt5integration-qt5.14.patch 2020-05-12 09:58:19 UTC (rev 626682)
+++ deepin-qt5integration-qt5.14.patch 2020-05-12 09:58:35 UTC (rev 626683)
@@ -1,46 +0,0 @@
-diff --git a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp
-index e98487b..45e90bc 100644
---- a/platformthemeplugin/qdeepintheme.cpp
-+++ b/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;
- }
---- a/platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:45:47.396894045 +0800
-+++ b/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;
- }
-
More information about the arch-commits
mailing list