[arch-commits] Commit in deepin-session-shell/trunk (PKGBUILD icon-size.patch)

2020-06-17 Thread Felix Yan via arch-commits 
Date: Wednesday, June 17, 2020 @ 08:01:31
  Author: felixonmars
Revision: 646320

upgpkg: deepin-session-shell 5.1.0.1-3: add patch from upstream to fix icon size

Added:
  deepin-session-shell/trunk/icon-size.patch
Modified:
  deepin-session-shell/trunk/PKGBUILD

-+
 PKGBUILD|9 +++--
 icon-size.patch |   91 ++
 2 files changed, 97 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-17 06:02:34 UTC (rev 646319)
+++ PKGBUILD2020-06-17 08:01:31 UTC (rev 646320)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-session-shell
 pkgver=5.1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Deepin desktop-environment - session-shell module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-session-shell";
@@ -14,11 +14,14 @@
 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";)
-sha512sums=('d328762fabb6ca491c618206adbfc1db651a229928eea1ca9e9b5e51d5432127725676c8e85da6837e5c82b959f5f5d403f80054425beab84a4830a84ca0fce1')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver.tar.gz";
+icon-size.patch)
+sha512sums=('d328762fabb6ca491c618206adbfc1db651a229928eea1ca9e9b5e51d5432127725676c8e85da6837e5c82b959f5f5d403f80054425beab84a4830a84ca0fce1'
+
'4e4c2a0d6ea124121fcad6377fb8ecd7a678667f1bab962cbce3a439fd5155172c897264a11b15667cc07b160de19c0b2e669af7b31bdabf3e04e134343aab39')
 
 prepare() {
   cd dde-session-shell-$pkgver
+  patch -p1 -i ../icon-size.patch
   sed -i '/darrowrectangle/d' CMakeLists.txt src/widgets/widgets.pri
   sed -i 's/include "darrowrectangle.h"/include /' 
src/widgets/errortooltip.h
   sed -i '/#include /a #include ' 
src/widgets/useravatar.cpp

Added: icon-size.patch
===
--- icon-size.patch (rev 0)
+++ icon-size.patch 2020-06-17 08:01:31 UTC (rev 646320)
@@ -0,0 +1,91 @@
+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
+@@ -25,18 +25,18 @@
+ 
+ #include "public_func.h"
+ 
+-QPixmap loadPixmap(const QString &file)
++QPixmap loadPixmap(const QString &file, const QSize& size)
+ {
+ qreal ratio = 1.0;
+ qreal devicePixel = qApp->devicePixelRatio();
+ 
+ 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 
+ #include 
+ 
+-QPixmap loadPixmap(const QString &file);
++QPixmap loadPixmap(const QString &file, const QSize &size = QSize());
+ 
+ template 
+ 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);
+

[arch-commits] Commit in deepin-session-shell/trunk (PKGBUILD icon-size.patch)

2020-06-18 Thread Felix Yan via arch-commits 
Date: Thursday, June 18, 2020 @ 07:36:55
  Author: felixonmars
Revision: 646795

upgpkg: deepin-session-shell 5.1.0.3-1

Modified:
  deepin-session-shell/trunk/PKGBUILD
  deepin-session-shell/trunk/icon-size.patch

-+
 PKGBUILD|8 
 icon-size.patch |   11 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-18 07:36:37 UTC (rev 646794)
+++ PKGBUILD2020-06-18 07:36:55 UTC (rev 646795)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng 
 
 pkgname=deepin-session-shell
-pkgver=5.1.0.1
-pkgrel=3
+pkgver=5.1.0.3
+pkgrel=1
 pkgdesc='Deepin desktop-environment - session-shell module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-session-shell";
@@ -16,8 +16,8 @@
 groups=('deepin')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-shell/archive/$pkgver.tar.gz";
 icon-size.patch)
-sha512sums=('d328762fabb6ca491c618206adbfc1db651a229928eea1ca9e9b5e51d5432127725676c8e85da6837e5c82b959f5f5d403f80054425beab84a4830a84ca0fce1'
-
'4e4c2a0d6ea124121fcad6377fb8ecd7a678667f1bab962cbce3a439fd5155172c897264a11b15667cc07b160de19c0b2e669af7b31bdabf3e04e134343aab39')
+sha512sums=('01bbbd661ce61c85f385e7c456b68226308b9f3da3d28edfa22db20effab3e0e719a00da1bbc16e0194c68f994d58d4ad12b8cc3f94d41057dcb271ff20e7f91'
+
'bfd3b15a5dce361eea2f8ced63a240edbbc19096a372963dc788d45faa372f841db2b2a6f29cb87aebadc00c921d56a99b21cec951e595acf220c8fc687395b6')
 
 prepare() {
   cd dde-session-shell-$pkgver

Modified: icon-size.patch
===
--- icon-size.patch 2020-06-18 07:36:37 UTC (rev 646794)
+++ icon-size.patch 2020-06-18 07:36:55 UTC (rev 646795)
@@ -2,16 +2,17 @@
 index 1875727..8d74073 100644
 --- a/src/global_util/public_func.cpp
 +++ b/src/global_util/public_func.cpp
-@@ -25,18 +25,18 @@
+@@ -27,7 +27,7 @@
+ #include 
+ #include "constants.h"
  
- #include "public_func.h"
- 
 -QPixmap loadPixmap(const QString &file)
 +QPixmap loadPixmap(const QString &file, const QSize& size)
  {
- qreal ratio = 1.0;
- qreal devicePixel = qApp->devicePixelRatio();
  
+if(!QFile::exists(file)){
+@@ -39,11 +39,11 @@
+ 
  QPixmap pixmap;
  
 -if (!qFuzzyCompare(ratio, devicePixel)) {

[arch-commits] Commit in deepin-session-shell/trunk (PKGBUILD icon-size.patch)

2020-08-10 Thread Felix Yan via arch-commits 
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
===
--- PKGBUILD2020-08-10 10:11:25 UTC (rev 673523)
+++ PKGBUILD2020-08-10 10:11:29 UTC (rev 673524)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng 
 
 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 ' 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 
- #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 
- #include 
- 
--QPixmap loadPixmap(const QString &file);
-+QPixmap loadPixmap(const QString &file, const QSize &size = QSize());
- 
- template 
- 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 d18f0d