[arch-commits] Commit in deepin-session-ui/trunk (2 files)

2020-08-14 Thread Felix Yan via arch-commits 
Date: Friday, August 14, 2020 @ 12:47:24
  Author: felixonmars
Revision: 679130

upgpkg: deepin-session-ui 5.3.0.1-1

Modified:
  deepin-session-ui/trunk/PKGBUILD
Deleted:
  deepin-session-ui/trunk/deepin-session-ui-qt5.15.patch

+
 PKGBUILD   |   12 +---
 deepin-session-ui-qt5.15.patch |   24 
 2 files changed, 5 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-14 12:38:30 UTC (rev 679129)
+++ PKGBUILD2020-08-14 12:47:24 UTC (rev 679130)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng 
 
 pkgname=deepin-session-ui
-pkgver=5.2.0.16
+pkgver=5.3.0.1
 pkgrel=1
 pkgdesc='Deepin desktop-environment - Session UI module'
 arch=('x86_64')
@@ -17,17 +17,15 @@
 conflicts=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
 replaces=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz";
- deepin-session-ui-qt5.15.patch)
-sha512sums=('f28b14b4a720e2d43d54ff6836a6e636d87e185fa7a4361d6ce265fff4c36033e49f0dec4136c21a82462921d3dc057c47debb16c9a65e8c2e0974f57f5c9b4f'
-
'846726964cac5005b0ac3a5043e5df914ff83faff68f98d2513d86494a9718a85ae4268776fd08ffe852e28ac0ae5878353d3c65db84fbd1509b2325e70fe8d6')
+ 
deepin-session-ui-qt5.15-reborn.patch::https://github.com/linuxdeepin/dde-session-ui/commit/926744b8111f30f8b40b9a8cfb4b3309babdf863.patch)
+sha512sums=('b12055fe9a0d66e175419d6cebf10986182c100755c56bab31e8d03b1ec8ec9224c749a121db5168b57f94864e54f9c3487328daede7f4593b8982cb828de0fc'
+
'181e2b27795450a420aed2229bdbdd0f0d47d1c80fdb016c08acc44120147aa0ea1bafc3c303a6f8918164bde764ad309ed54b5aa6082e3b1b420bf2d992231e')
 
 prepare() {
   cd dde-session-ui-$pkgver
   sed -i 
's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|'
 widgets/*.cpp
 
-  sed -i '/include /a #include ' 
dde-notification-plugin/notifications/notificationswidget.cpp
-
-  patch -p1 -i ../deepin-session-ui-qt5.15.patch # Fix build with Qt 5.15
+  patch -p1 -i ../deepin-session-ui-qt5.15-reborn.patch # Fix build with Qt 
5.15 again
 }
 
 build() {

Deleted: deepin-session-ui-qt5.15.patch
===
--- deepin-session-ui-qt5.15.patch  2020-08-14 12:38:30 UTC (rev 679129)
+++ deepin-session-ui-qt5.15.patch  2020-08-14 12:47:24 UTC (rev 679130)
@@ -1,24 +0,0 @@
-diff --git a/dde-osd/common.cpp b/dde-osd/common.cpp
-index 0505ac60..ffa55e84 100644
 a/dde-osd/common.cpp
-+++ b/dde-osd/common.cpp
-@@ -25,6 +25,7 @@
- 
- #include "common.h"
- #include 
-+#include 
- 
- void DrawHelper::DrawImage(QPainter *painter, const QStyleOptionViewItem 
&option, const QString &pix, bool withText, bool withProgress)
- {
-diff --git a/dde-osd/notification-center/overlapwidet.cpp 
b/dde-osd/notification-center/overlapwidet.cpp
-index d2aee64e..a89f0bd1 100644
 a/dde-osd/notification-center/overlapwidet.cpp
-+++ b/dde-osd/notification-center/overlapwidet.cpp
-@@ -25,6 +25,7 @@
- #include "../notification/constants.h"
- #include "notification/constants.h"
- #include "notifymodel.h"
-+#include 
- 
- #include 
- #include

[arch-commits] Commit in deepin-session-ui/trunk (2 files)

2020-06-03 Thread Felix Yan via arch-commits 
Date: Wednesday, June 3, 2020 @ 16:28:53
  Author: felixonmars
Revision: 638271

upgpkg: deepin-session-ui 5.2.0.0-1

Modified:
  deepin-session-ui/trunk/PKGBUILD
  deepin-session-ui/trunk/deepin-session-ui-qt5.15.patch

+
 PKGBUILD   |   17 +
 deepin-session-ui-qt5.15.patch |   12 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-03 16:25:29 UTC (rev 638270)
+++ PKGBUILD2020-06-03 16:28:53 UTC (rev 638271)
@@ -3,8 +3,9 @@
 # Contributor: Xu Fasheng 
 
 pkgname=deepin-session-ui
-pkgver=5.1.0101.0
-pkgrel=2
+pkgver=5.2.0.0
+_tag=5.2.0.0-1
+pkgrel=1
 pkgdesc='Deepin desktop-environment - Session UI module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-session-ui";
@@ -16,13 +17,13 @@
 provides=('deepin-notifications')
 conflicts=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
 replaces=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz";
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$_tag.tar.gz";
  deepin-session-ui-qt5.15.patch)
-sha512sums=('764d0a47320ab4dd3d8ce8ed22d2094e100f720ce552339746edfd123ec081f766ab1874c2b4b9620b6a6f4e82495cf4e7e2e1128e5bbb8a22eac3440b0017a9'
-
'421b100161ad9db234ece920e2c2784e1fbca0cd04e1a9a067311f3fdb13cc0ef7d58f7b33af151fabc7637b793d1479011966a741d854d745bcab3b79a9cdfd')
+sha512sums=('4bd87efdbf27a231e6db9f64e159c7ad69bcdacda881969805e1f4d58240f8eb7cdafa76720679fb688836e28552da0405a65ffb1e32bd33d3d1bdb9180f57f2'
+
'846726964cac5005b0ac3a5043e5df914ff83faff68f98d2513d86494a9718a85ae4268776fd08ffe852e28ac0ae5878353d3c65db84fbd1509b2325e70fe8d6')
 
 prepare() {
-  cd dde-session-ui-$pkgver
+  cd dde-session-ui-$_tag
   sed -i 
's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|'
 widgets/*.cpp
 
   patch -p1 -i ../deepin-session-ui-qt5.15.patch # Fix build with Qt 5.15
@@ -29,12 +30,12 @@
 }
 
 build() {
-  cd dde-session-ui-$pkgver
+  cd dde-session-ui-$_tag
   qmake-qt5 PREFIX=/usr
   make
 }
 
 package() {
-  cd dde-session-ui-$pkgver
+  cd dde-session-ui-$_tag
   make INSTALL_ROOT="$pkgdir" install
 }

Modified: deepin-session-ui-qt5.15.patch
===
--- deepin-session-ui-qt5.15.patch  2020-06-03 16:25:29 UTC (rev 638270)
+++ deepin-session-ui-qt5.15.patch  2020-06-03 16:28:53 UTC (rev 638271)
@@ -10,15 +10,15 @@
  
  void DrawHelper::DrawImage(QPainter *painter, const QStyleOptionViewItem 
&option, const QString &pix, bool withText, bool withProgress)
  {
-diff --git a/dde-osd/notification-center/bubbleoverlapwidget.cpp 
b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+diff --git a/dde-osd/notification-center/overlapwidet.cpp 
b/dde-osd/notification-center/overlapwidet.cpp
 index d2aee64e..a89f0bd1 100644
 a/dde-osd/notification-center/bubbleoverlapwidget.cpp
-+++ b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+--- a/dde-osd/notification-center/overlapwidet.cpp
 b/dde-osd/notification-center/overlapwidet.cpp
 @@ -25,6 +25,7 @@
+ #include "../notification/constants.h"
  #include "notification/constants.h"
  #include "notifymodel.h"
- #include 
 +#include 
  
- HalfRoundedRectWidget::HalfRoundedRectWidget(QWidget *parent)
- : AlphaWidget(parent)
+ #include 
+ #include

[arch-commits] Commit in deepin-session-ui/trunk (2 files)

2020-05-26 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 26, 2020 @ 15:55:48
  Author: arojas
Revision: 635113

Qt 5.15 rebuild

Added:
  deepin-session-ui/trunk/deepin-session-ui-qt5.15.patch
Modified:
  deepin-session-ui/trunk/PKGBUILD

+
 PKGBUILD   |   10 +++---
 deepin-session-ui-qt5.15.patch |   24 
 2 files changed, 31 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-26 15:17:13 UTC (rev 635112)
+++ PKGBUILD2020-05-26 15:55:48 UTC (rev 635113)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-session-ui
 pkgver=5.1.0101.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Deepin desktop-environment - Session UI module'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-session-ui";
@@ -16,12 +16,16 @@
 provides=('deepin-notifications')
 conflicts=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
 replaces=('dde-workspace' 'dde-session-ui' 'deepin-notifications')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz";)
-sha512sums=('764d0a47320ab4dd3d8ce8ed22d2094e100f720ce552339746edfd123ec081f766ab1874c2b4b9620b6a6f4e82495cf4e7e2e1128e5bbb8a22eac3440b0017a9')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-session-ui/archive/$pkgver.tar.gz";
+ deepin-session-ui-qt5.15.patch)
+sha512sums=('764d0a47320ab4dd3d8ce8ed22d2094e100f720ce552339746edfd123ec081f766ab1874c2b4b9620b6a6f4e82495cf4e7e2e1128e5bbb8a22eac3440b0017a9'
+
'421b100161ad9db234ece920e2c2784e1fbca0cd04e1a9a067311f3fdb13cc0ef7d58f7b33af151fabc7637b793d1479011966a741d854d745bcab3b79a9cdfd')
 
 prepare() {
   cd dde-session-ui-$pkgver
   sed -i 
's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|'
 widgets/*.cpp
+
+  patch -p1 -i ../deepin-session-ui-qt5.15.patch # Fix build with Qt 5.15
 }
 
 build() {

Added: deepin-session-ui-qt5.15.patch
===
--- deepin-session-ui-qt5.15.patch  (rev 0)
+++ deepin-session-ui-qt5.15.patch  2020-05-26 15:55:48 UTC (rev 635113)
@@ -0,0 +1,24 @@
+diff --git a/dde-osd/common.cpp b/dde-osd/common.cpp
+index 0505ac60..ffa55e84 100644
+--- a/dde-osd/common.cpp
 b/dde-osd/common.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include "common.h"
+ #include 
++#include 
+ 
+ void DrawHelper::DrawImage(QPainter *painter, const QStyleOptionViewItem 
&option, const QString &pix, bool withText, bool withProgress)
+ {
+diff --git a/dde-osd/notification-center/bubbleoverlapwidget.cpp 
b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+index d2aee64e..a89f0bd1 100644
+--- a/dde-osd/notification-center/bubbleoverlapwidget.cpp
 b/dde-osd/notification-center/bubbleoverlapwidget.cpp
+@@ -25,6 +25,7 @@
+ #include "notification/constants.h"
+ #include "notifymodel.h"
+ #include 
++#include 
+ 
+ HalfRoundedRectWidget::HalfRoundedRectWidget(QWidget *parent)
+ : AlphaWidget(parent)