Date: Friday, June 26, 2020 @ 12:57:27
Author: felixonmars
Revision: 654074
archrelease: copy trunk to community-x86_64
Added:
deepin-session-shell/repos/community-x86_64/PKGBUILD
(from rev 654073, deepin-session-shell/trunk/PKGBUILD)
deepin-session-shell/repos/community-x86_64/icon-size.patch
(from rev 654073, deepin-session-shell/trunk/icon-size.patch)
Deleted:
deepin-session-shell/repos/community-x86_64/PKGBUILD
deepin-session-shell/repos/community-x86_64/icon-size.patch
-----------------+
PKGBUILD | 89 +++++++++++++-------------
icon-size.patch | 184 +++++++++++++++++++++++++++---------------------------
2 files changed, 137 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-26 12:57:08 UTC (rev 654073)
+++ PKGBUILD 2020-06-26 12:57:27 UTC (rev 654074)
@@ -1,44 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-session-shell
-pkgver=5.1.0.4
-pkgrel=1
-pkgdesc='Deepin desktop-environment - session-shell module'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-session-shell";
-license=('GPL3')
-depends=('deepin-daemon' 'deepin-qt5integration' 'gsettings-qt'
'liblightdm-qt5' 'startdde')
-makedepends=('cmake' 'qt5-tools')
-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=('b96bc3eeea788b571207b9224fd9a49b33a1435bd91802c7a6882fc2e5287281b9890a797510db2add22ce67a99cebbd29257352be1a92af41d8ae296a8d68fb'
-
'bfd3b15a5dce361eea2f8ced63a240edbbc19096a372963dc788d45faa372f841db2b2a6f29cb87aebadc00c921d56a99b21cec951e595acf220c8fc687395b6')
-
-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 <darrowrectangle.h>/'
src/widgets/errortooltip.h
- sed -i '/#include <QFile>/a #include <QPainterPath>'
src/widgets/useravatar.cpp
-
- # We don't have common-auth on Arch
- sed -i 's/common-auth/system-login/' src/libdde-auth/authagent.cpp
-}
-
-build() {
- cd dde-session-shell-$pkgver
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd dde-session-shell-$pkgver
- make DESTDIR="$pkgdir" install
-
- chmod +x "$pkgdir"/usr/bin/deepin-greeter
-}
Copied: deepin-session-shell/repos/community-x86_64/PKGBUILD (from rev 654073,
deepin-session-shell/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-26 12:57:27 UTC (rev 654074)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-session-shell
+pkgver=5.1.0.5
+pkgrel=1
+pkgdesc='Deepin desktop-environment - session-shell module'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-session-shell";
+license=('GPL3')
+depends=('deepin-daemon' 'deepin-qt5integration' 'deepin-wallpapers'
'gsettings-qt' 'liblightdm-qt5'
+ 'startdde')
+makedepends=('cmake' 'qt5-tools')
+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=('550ecf5d5c1cf4e0a89abde8783383c3e4af0f60bb40f1dfe85f04cc5fd0839338bad07b3f00ff6451faf2672d291a7254077c83a56422bcd87dda3c6df64011'
+
'bfd3b15a5dce361eea2f8ced63a240edbbc19096a372963dc788d45faa372f841db2b2a6f29cb87aebadc00c921d56a99b21cec951e595acf220c8fc687395b6')
+
+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 <darrowrectangle.h>/'
src/widgets/errortooltip.h
+ sed -i '/#include <QFile>/a #include <QPainterPath>'
src/widgets/useravatar.cpp
+
+ # We don't have common-auth on Arch
+ sed -i 's/common-auth/system-login/' src/libdde-auth/authagent.cpp
+}
+
+build() {
+ cd dde-session-shell-$pkgver
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd dde-session-shell-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ chmod +x "$pkgdir"/usr/bin/deepin-greeter
+}
Deleted: icon-size.patch
===================================================================
--- icon-size.patch 2020-06-26 12:57:08 UTC (rev 654073)
+++ icon-size.patch 2020-06-26 12:57:27 UTC (rev 654074)
@@ -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)
Copied: deepin-session-shell/repos/community-x86_64/icon-size.patch (from rev
654073, deepin-session-shell/trunk/icon-size.patch)
===================================================================
--- icon-size.patch (rev 0)
+++ icon-size.patch 2020-06-26 12:57:27 UTC (rev 654074)
@@ -0,0 +1,92 @@
+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)
