[arch-commits] Commit in deepin-qt5integration/repos/community-testing-x86_64 (6 files)
Felix Yan
felixonmars at archlinux.org
Sat Apr 25 15:07:34 UTC 2020
Date: Saturday, April 25, 2020 @ 15:07:32
Author: felixonmars
Revision: 620858
archrelease: copy trunk to community-testing-x86_64
Added:
deepin-qt5integration/repos/community-testing-x86_64/PKGBUILD
(from rev 620857, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-testing-x86_64/deepin-qt5integration-qt5.13.patch
(from rev 620857, deepin-qt5integration/trunk/deepin-qt5integration-qt5.13.patch)
deepin-qt5integration/repos/community-testing-x86_64/deepin-qt5integration-qt5.14.patch
(from rev 620857, deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch)
Deleted:
deepin-qt5integration/repos/community-testing-x86_64/PKGBUILD
deepin-qt5integration/repos/community-testing-x86_64/deepin-qt5integration-qt5.13.patch
deepin-qt5integration/repos/community-testing-x86_64/deepin-qt5integration-qt5.14.patch
------------------------------------+
PKGBUILD | 74 ++++++++++++++--------------
deepin-qt5integration-qt5.13.patch | 22 ++++----
deepin-qt5integration-qt5.14.patch | 92 +++++++++++++++++------------------
3 files changed, 94 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-25 15:07:19 UTC (rev 620857)
+++ PKGBUILD 2020-04-25 15:07:32 UTC (rev 620858)
@@ -1,37 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=5.0.0
-pkgrel=9
-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.13.patch
- deepin-qt5integration-qt5.14.patch)
-sha512sums=('bfaa0cf1ca1422da1e645e86275b290c186cb2e26264b3844afd77f31cdc2d1e4ac1b54bcc58a46b336534146865a0310b802f2477f7505f666aed76a2788f00'
- '345590b7fa94c84adc0c894df8c70931a46769f7af40edf1e5d3623a5327b344be48e17db10791c8f75bf626874f2f031ef221c1218c6b0d889eca3b883c0764'
- 'd227f060b3dfd324c19a957e90a210256649c366645bb2e712dbdefb0b9287dc0ae97fa14e0252d168323b06e7ba526bc351600273a4afb7c3fa2b8d59e42aa0')
-
-prepare() {
- cd qt5integration-$pkgver
- patch -p1 -i ../deepin-qt5integration-qt5.13.patch # Fix build with Qt 5.13
- patch -p1 -i ../deepin-qt5integration-qt5.14.patch # Fix build with Qt 5.14
-}
-
-build() {
- cd qt5integration-$pkgver
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd qt5integration-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: deepin-qt5integration/repos/community-testing-x86_64/PKGBUILD (from rev 620857, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-25 15:07:32 UTC (rev 620858)
@@ -0,0 +1,37 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=5.0.0
+pkgrel=10
+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.13.patch
+ deepin-qt5integration-qt5.14.patch)
+sha512sums=('bfaa0cf1ca1422da1e645e86275b290c186cb2e26264b3844afd77f31cdc2d1e4ac1b54bcc58a46b336534146865a0310b802f2477f7505f666aed76a2788f00'
+ '345590b7fa94c84adc0c894df8c70931a46769f7af40edf1e5d3623a5327b344be48e17db10791c8f75bf626874f2f031ef221c1218c6b0d889eca3b883c0764'
+ 'd227f060b3dfd324c19a957e90a210256649c366645bb2e712dbdefb0b9287dc0ae97fa14e0252d168323b06e7ba526bc351600273a4afb7c3fa2b8d59e42aa0')
+
+prepare() {
+ cd qt5integration-$pkgver
+ patch -p1 -i ../deepin-qt5integration-qt5.13.patch # Fix build with Qt 5.13
+ patch -p1 -i ../deepin-qt5integration-qt5.14.patch # Fix build with Qt 5.14
+}
+
+build() {
+ cd qt5integration-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd qt5integration-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: deepin-qt5integration-qt5.13.patch
===================================================================
--- deepin-qt5integration-qt5.13.patch 2020-04-25 15:07:19 UTC (rev 620857)
+++ deepin-qt5integration-qt5.13.patch 2020-04-25 15:07:32 UTC (rev 620858)
@@ -1,11 +0,0 @@
-diff --git a/dstyleplugin/style.cpp b/dstyleplugin/style.cpp
-index 04e03fe..65be15f 100644
---- a/dstyleplugin/style.cpp
-+++ b/dstyleplugin/style.cpp
-@@ -1418,6 +1418,4 @@ void Style::fillBrush(QPainter *p, const QRect &rect, const QBrush &brush, qreal
- }
- }
-
--#include "moc_style.cpp"
--
- }
Copied: deepin-qt5integration/repos/community-testing-x86_64/deepin-qt5integration-qt5.13.patch (from rev 620857, deepin-qt5integration/trunk/deepin-qt5integration-qt5.13.patch)
===================================================================
--- deepin-qt5integration-qt5.13.patch (rev 0)
+++ deepin-qt5integration-qt5.13.patch 2020-04-25 15:07:32 UTC (rev 620858)
@@ -0,0 +1,11 @@
+diff --git a/dstyleplugin/style.cpp b/dstyleplugin/style.cpp
+index 04e03fe..65be15f 100644
+--- a/dstyleplugin/style.cpp
++++ b/dstyleplugin/style.cpp
+@@ -1418,6 +1418,4 @@ void Style::fillBrush(QPainter *p, const QRect &rect, const QBrush &brush, qreal
+ }
+ }
+
+-#include "moc_style.cpp"
+-
+ }
Deleted: deepin-qt5integration-qt5.14.patch
===================================================================
--- deepin-qt5integration-qt5.14.patch 2020-04-25 15:07:19 UTC (rev 620857)
+++ deepin-qt5integration-qt5.14.patch 2020-04-25 15:07:32 UTC (rev 620858)
@@ -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;
- }
-
Copied: deepin-qt5integration/repos/community-testing-x86_64/deepin-qt5integration-qt5.14.patch (from rev 620857, deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch)
===================================================================
--- deepin-qt5integration-qt5.14.patch (rev 0)
+++ deepin-qt5integration-qt5.14.patch 2020-04-25 15:07:32 UTC (rev 620858)
@@ -0,0 +1,46 @@
+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