[arch-commits] Commit in deepin-session-shell/trunk (PKGBUILD icon-size.patch)
Felix Yan
felixonmars at archlinux.org
Mon Aug 10 10:11:29 UTC 2020
Date: Monday, August 10, 2020 @ 10:11:29
Author: felixonmars
Revision: 673524
upgpkg: deepin-session-shell 5.3.0.3-1
Modified:
deepin-session-shell/trunk/PKGBUILD
Deleted:
deepin-session-shell/trunk/icon-size.patch
-----------------+
PKGBUILD | 9 +----
icon-size.patch | 92 ------------------------------------------------------
2 files changed, 3 insertions(+), 98 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-08-10 10:11:25 UTC (rev 673523)
+++ PKGBUILD 2020-08-10 10:11:29 UTC (rev 673524)
@@ -3,7 +3,7 @@
# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
pkgname=deepin-session-shell
-pkgver=5.1.0.12
+pkgver=5.3.0.3
pkgrel=1
pkgdesc='Deepin desktop-environment - session-shell module'
arch=('x86_64')
@@ -15,14 +15,11 @@
conflicts=('deepin-session-ui<5')
provides=('lightdm-deepin-greeter')
groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver.tar.gz"
- icon-size.patch)
-sha512sums=('9d863271e731a5cff37718acfa69e03f5e46814e848ea2decff56273f5b9f686d457d40c7cd0e86dd19fb2584e343d123a28acbde257848d77f5c3cb36c06afe'
- 'bfd3b15a5dce361eea2f8ced63a240edbbc19096a372963dc788d45faa372f841db2b2a6f29cb87aebadc00c921d56a99b21cec951e595acf220c8fc687395b6')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver.tar.gz")
+sha512sums=('d9a9a20a82a5fe62adff843e151ffb54198f8f900993398b71fda85d25d0d16dceb8f0964177b587fe285ef24f7b8a3528bf71342b4a576c0df6f68f368d4ad1')
prepare() {
cd dde-session-shell-$pkgver
- patch -p1 -i ../icon-size.patch
sed -i '/darrowrectangle/d' CMakeLists.txt src/widgets/widgets.pri
sed -i '1i#include <QPainterPath>' src/widgets/useravatar.cpp
Deleted: icon-size.patch
===================================================================
--- icon-size.patch 2020-08-10 10:11:25 UTC (rev 673523)
+++ icon-size.patch 2020-08-10 10:11:29 UTC (rev 673524)
@@ -1,92 +0,0 @@
-diff --git a/src/global_util/public_func.cpp b/src/global_util/public_func.cpp
-index 1875727..8d74073 100644
---- a/src/global_util/public_func.cpp
-+++ b/src/global_util/public_func.cpp
-@@ -27,7 +27,7 @@
- #include <QFile>
- #include "constants.h"
-
--QPixmap loadPixmap(const QString &file)
-+QPixmap loadPixmap(const QString &file, const QSize& size)
- {
-
- if(!QFile::exists(file)){
-@@ -39,11 +39,11 @@
-
- QPixmap pixmap;
-
-- if (!qFuzzyCompare(ratio, devicePixel)) {
-+ if (!qFuzzyCompare(ratio, devicePixel) || size.isValid()) {
- QImageReader reader;
- reader.setFileName(qt_findAtNxFile(file, devicePixel, &ratio));
- if (reader.canRead()) {
-- reader.setScaledSize(reader.size() * (devicePixel / ratio));
-+ reader.setScaledSize((size.isNull() ? reader.size() : reader.size().scaled(size, Qt::KeepAspectRatio)) * (devicePixel / ratio));
- pixmap = QPixmap::fromImage(reader.read());
- pixmap.setDevicePixelRatio(devicePixel);
- }
-diff --git a/src/global_util/public_func.h b/src/global_util/public_func.h
-index 93da78f..ee5751e 100644
---- a/src/global_util/public_func.h
-+++ b/src/global_util/public_func.h
-@@ -33,7 +33,7 @@
- #include <QSettings>
- #include <QString>
-
--QPixmap loadPixmap(const QString &file);
-+QPixmap loadPixmap(const QString &file, const QSize &size = QSize());
-
- template <typename T>
- T findValueByQSettings(const QStringList &configFiles,
-diff --git a/src/widgets/logowidget.cpp b/src/widgets/logowidget.cpp
-index 820dc3b..32b2a97 100644
---- a/src/widgets/logowidget.cpp
-+++ b/src/widgets/logowidget.cpp
-@@ -37,9 +37,12 @@
-
- DCORE_USE_NAMESPACE
-
--const QPixmap systemLogo()
-+#define PIXMAP_WIDTH 128
-+#define PIXMAP_HEIGHT 132 /* SessionBaseWindow */
-+
-+const QPixmap systemLogo(const QSize& size)
- {
-- return loadPixmap(DSysInfo::distributionOrgLogo(DSysInfo::Distribution, DSysInfo::Transparent, ":img/logo.svg"));
-+ return loadPixmap(DSysInfo::distributionOrgLogo(DSysInfo::Distribution, DSysInfo::Transparent, ":img/logo.svg"), size);
- }
-
- LogoWidget::LogoWidget(QWidget* parent)
-@@ -50,12 +53,16 @@ LogoWidget::LogoWidget(QWidget* parent)
- }
-
- void LogoWidget::initUI() {
--// setFixedSize(240, 40);
--
- m_logoLabel = new QLabel();
-- m_logoLabel->setPixmap(systemLogo());
-+ m_logoLabel->setPixmap(
-+ []() -> QPixmap {
-+ const QPixmap& p = systemLogo(QSize());
-+ const bool result = p.width() < PIXMAP_WIDTH && p.height() < PIXMAP_HEIGHT;
-+ return result
-+ ? p
-+ : systemLogo(QSize(PIXMAP_WIDTH, PIXMAP_HEIGHT));
-+ }());
- m_logoLabel->setObjectName("Logo");
-- m_logoLabel->setFixedSize(128, 48);
- //修复社区版deepin的显示不全的问题 2020/04/11
- m_logoLabel->setScaledContents(true);
-
-diff --git a/src/widgets/useravatar.cpp b/src/widgets/useravatar.cpp
-index d18f0d4..2566eba 100644
---- a/src/widgets/useravatar.cpp
-+++ b/src/widgets/useravatar.cpp
-@@ -27,6 +27,7 @@
- #include "dthememanager.h"
- #include <QUrl>
- #include <QFile>
-+#include <QPainterPath>
-
- UserAvatar::UserAvatar(QWidget *parent, bool deleteable) :
- QPushButton(parent), m_deleteable(deleteable)
More information about the arch-commits
mailing list