Date: Tuesday, May 26, 2020 @ 11:22:44
Author: arojas
Revision: 635027
Qt 5.15 rebuild
Added:
deepin-calculator/trunk/deepin-calculator-qt5.15.patch
Modified:
deepin-calculator/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 10 +++++++---
deepin-calculator-qt5.15.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-26 11:21:43 UTC (rev 635026)
+++ PKGBUILD 2020-05-26 11:22:44 UTC (rev 635027)
@@ -2,7 +2,7 @@
pkgname=deepin-calculator
pkgver=5.5.10
-pkgrel=1
+pkgrel=2
pkgdesc='An easy to use calculator for ordinary users'
arch=('x86_64')
url="https://github.com/linuxdeepin/deepin-calculator";
@@ -10,12 +10,16 @@
depends=('deepin-qt5integration')
makedepends=('qt5-tools' 'python')
groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-calculator/archive/$pkgver.tar.gz";)
-sha512sums=('aa9bfd63d204933d06fea414b06cac8f7fb1cf7a4f3e1bb0f936d1a0e49a93f89e9a30641e4188d7e7420ba9fd9b522d2e82b931eb2b37db204cbecbf9163172')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-calculator/archive/$pkgver.tar.gz";
+ deepin-calculator-qt5.15.patch)
+sha512sums=('aa9bfd63d204933d06fea414b06cac8f7fb1cf7a4f3e1bb0f936d1a0e49a93f89e9a30641e4188d7e7420ba9fd9b522d2e82b931eb2b37db204cbecbf9163172'
+
'09af5aca1fe25657fddfdc825583b4fa7941ea4bf3883a8c87629459e89ba44e0e311a17c5c759f8b309af69e44c18580ecffeeae5c710ab33ddbea1c7e97157')
prepare() {
cd deepin-calculator-$pkgver
sed -i '/<QList>/i #include <QObject>' core/session.h
+
+ patch -p1 -i ../deepin-calculator-qt5.15.patch # Fix build with Qt 5.15
}
build() {
Added: deepin-calculator-qt5.15.patch
===================================================================
--- deepin-calculator-qt5.15.patch (rev 0)
+++ deepin-calculator-qt5.15.patch 2020-05-26 11:22:44 UTC (rev 635027)
@@ -0,0 +1,36 @@
+diff --git a/modules/simplelistdelegate.cpp b/modules/simplelistdelegate.cpp
+index 40e30b3..ae1b028 100644
+--- a/modules/simplelistdelegate.cpp
++++ b/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/widgets/memorybutton.cpp b/widgets/memorybutton.cpp
+index b316632..19ee0de 100644
+--- a/widgets/memorybutton.cpp
++++ b/widgets/memorybutton.cpp
+@@ -2,6 +2,7 @@
+
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTimer>
+ #include "dthememanager.h"
+
+diff --git a/widgets/textbutton.cpp b/widgets/textbutton.cpp
+index 80a039d..0c8e37a 100644
+--- a/widgets/textbutton.cpp
++++ b/widgets/textbutton.cpp
+@@ -20,6 +20,7 @@
+ #include "textbutton.h"
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTimer>
+ #include "dthememanager.h"
+
