Date: Monday, July 27, 2020 @ 13:20:22 Author: felixonmars Revision: 665458
archrelease: copy trunk to community-x86_64 Added: deepin-session-ui/repos/community-x86_64/PKGBUILD (from rev 665457, deepin-session-ui/trunk/PKGBUILD) deepin-session-ui/repos/community-x86_64/deepin-session-ui-qt5.15.patch (from rev 665457, deepin-session-ui/trunk/deepin-session-ui-qt5.15.patch) Deleted: deepin-session-ui/repos/community-x86_64/PKGBUILD deepin-session-ui/repos/community-x86_64/deepin-session-ui-qt5.15.patch --------------------------------+ PKGBUILD | 84 +++++++++++++++++++-------------------- deepin-session-ui-qt5.15.patch | 48 +++++++++++----------- 2 files changed, 66 insertions(+), 66 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-27 13:20:03 UTC (rev 665457) +++ PKGBUILD 2020-07-27 13:20:22 UTC (rev 665458) @@ -1,42 +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-ui -pkgver=5.2.0.14 -pkgrel=1 -pkgdesc='Deepin desktop-environment - Session UI module' -arch=('x86_64') -url="https://github.com/linuxdeepin/dde-session-ui" -license=('GPL3') -groups=('deepin') -depends=('gsettings-qt' 'deepin-qt5integration' 'liblightdm-qt5' 'qt5-svg' 'deepin-daemon' - 'deepin-control-center' 'deepin-wallpapers') -makedepends=('deepin-gettext-tools' 'qt5-tools') -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" - deepin-session-ui-qt5.15.patch) -sha512sums=('dfb8f3e2c03dedd06e7fbf765cabb2a314800abc6f04f0aa8d4741121d41cfd0378be9b66ece98b3bd0b8ff394da55fc922d8749d9292426b8897d9307a8ebee' - '846726964cac5005b0ac3a5043e5df914ff83faff68f98d2513d86494a9718a85ae4268776fd08ffe852e28ac0ae5878353d3c65db84fbd1509b2325e70fe8d6') - -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 <QPainter>/a #include <QPainterPath>' dde-notification-plugin/notifications/notificationswidget.cpp - - patch -p1 -i ../deepin-session-ui-qt5.15.patch # Fix build with Qt 5.15 -} - -build() { - cd dde-session-ui-$pkgver - qmake-qt5 PREFIX=/usr - make -} - -package() { - cd dde-session-ui-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-session-ui/repos/community-x86_64/PKGBUILD (from rev 665457, deepin-session-ui/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-27 13:20:22 UTC (rev 665458) @@ -0,0 +1,42 @@ +# 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-ui +pkgver=5.2.0.15 +pkgrel=1 +pkgdesc='Deepin desktop-environment - Session UI module' +arch=('x86_64') +url="https://github.com/linuxdeepin/dde-session-ui" +license=('GPL3') +groups=('deepin') +depends=('gsettings-qt' 'deepin-qt5integration' 'liblightdm-qt5' 'qt5-svg' 'deepin-daemon' + 'deepin-control-center' 'deepin-wallpapers') +makedepends=('deepin-gettext-tools' 'qt5-tools') +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" + deepin-session-ui-qt5.15.patch) +sha512sums=('966a537f4232f2bb02b27684d9e434c0ed67a39ca524a9e195c66cce105d38a3ce68bbac77eb6b9c2db14284e1b7db63f80e1a5406e1a75931c91984d7dae94e' + '846726964cac5005b0ac3a5043e5df914ff83faff68f98d2513d86494a9718a85ae4268776fd08ffe852e28ac0ae5878353d3c65db84fbd1509b2325e70fe8d6') + +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 <QPainter>/a #include <QPainterPath>' dde-notification-plugin/notifications/notificationswidget.cpp + + patch -p1 -i ../deepin-session-ui-qt5.15.patch # Fix build with Qt 5.15 +} + +build() { + cd dde-session-ui-$pkgver + qmake-qt5 PREFIX=/usr + make +} + +package() { + cd dde-session-ui-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Deleted: deepin-session-ui-qt5.15.patch =================================================================== --- deepin-session-ui-qt5.15.patch 2020-07-27 13:20:03 UTC (rev 665457) +++ deepin-session-ui-qt5.15.patch 2020-07-27 13:20:22 UTC (rev 665458) @@ -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 <QSvgRenderer> -+#include <QPainterPath> - - 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 <QPainterPath> - - #include <QTimer> - #include <QKeyEvent> Copied: deepin-session-ui/repos/community-x86_64/deepin-session-ui-qt5.15.patch (from rev 665457, deepin-session-ui/trunk/deepin-session-ui-qt5.15.patch) =================================================================== --- deepin-session-ui-qt5.15.patch (rev 0) +++ deepin-session-ui-qt5.15.patch 2020-07-27 13:20:22 UTC (rev 665458) @@ -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 <QSvgRenderer> ++#include <QPainterPath> + + 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 <QPainterPath> + + #include <QTimer> + #include <QKeyEvent>