Date: Tuesday, July 21, 2020 @ 20:15:17 Author: felixonmars Revision: 664775
upgpkg: deepin-calculator 5.5.22-1 Modified: deepin-calculator/trunk/PKGBUILD Deleted: deepin-calculator/trunk/deepin-calculator-qt5.15.patch --------------------------------+ PKGBUILD | 12 ++++-------- deepin-calculator-qt5.15.patch | 36 ------------------------------------ 2 files changed, 4 insertions(+), 44 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-21 20:10:55 UTC (rev 664774) +++ PKGBUILD 2020-07-21 20:15:17 UTC (rev 664775) @@ -1,7 +1,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=deepin-calculator -pkgver=5.5.21 +pkgver=5.5.22 pkgrel=1 pkgdesc='An easy to use calculator for ordinary users' arch=('x86_64') @@ -10,16 +10,12 @@ depends=('deepin-qt5integration') makedepends=('cmake' 'ninja' 'qt5-tools') groups=('deepin-extra') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-calculator/archive/$pkgver.tar.gz"; - deepin-calculator-qt5.15.patch) -sha512sums=('74747e7cf6ae172d9adf0e9ab4ebe6506c6a5476f0bb9a6b89806a390b809798bac93571020f227be1d81f11d9571abf54f36ba98ea12f3ae777c00fbdc4cd29' - 'd38fed51d16655c4662bdea3a7e19cbcb27b2d04bccaad90e0089652068b6041b73a8512e717ff18c47426046dcfe188ba1535ef19fc21b74fae7dd4e4933e03') +source=("https://github.com/linuxdeepin/deepin-calculator/archive/$pkgver/$pkgname-$pkgver.tar.gz";) +sha512sums=('801a693809106546c1f681f07012e11d0d5d5f5b79209fed21c232c2457e470f5eee5e24c09054584fb3ad23174b62d358d741156f7bd59ec8b43432208a6baa') prepare() { cd deepin-calculator-$pkgver - sed -i '/<QList>/i #include <QObject>' src/core/session.h - - patch -p1 -i ../deepin-calculator-qt5.15.patch # Fix build with Qt 5.15 + sed -i '1i#include <QPainterPath>' src/modules/simplelistdelegate.cpp src/widgets/equalbutton.cpp } build() { Deleted: deepin-calculator-qt5.15.patch =================================================================== --- deepin-calculator-qt5.15.patch 2020-07-21 20:10:55 UTC (rev 664774) +++ deepin-calculator-qt5.15.patch 2020-07-21 20:15:17 UTC (rev 664775) @@ -1,36 +0,0 @@ -diff --git a/src/modules/simplelistdelegate.cpp b/src/modules/simplelistdelegate.cpp -index 40e30b3..ae1b028 100644 ---- a/src/modules/simplelistdelegate.cpp -+++ b/src/modules/simplelistdelegate.cpp -@@ -22,6 +22,7 @@ - #include <QEvent> - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include <DGuiApplicationHelper> - #include "dthememanager.h" - #include "simplelistmodel.h" -diff --git a/src/widgets/memorybutton.cpp b/src/widgets/memorybutton.cpp -index b316632..19ee0de 100644 ---- a/src/widgets/memorybutton.cpp -+++ b/src/widgets/memorybutton.cpp -@@ -2,6 +2,7 @@ - - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include <QTimer> - #include "dthememanager.h" - -diff --git a/src/widgets/textbutton.cpp b/src/widgets/textbutton.cpp -index 80a039d..0c8e37a 100644 ---- a/src/widgets/textbutton.cpp -+++ b/src/widgets/textbutton.cpp -@@ -20,6 +20,7 @@ - #include "textbutton.h" - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include <QTimer> - #include "dthememanager.h" -
