Date: Thursday, May 28, 2020 @ 13:50:02
Author: felixonmars
Revision: 636318
archrelease: copy trunk to community-x86_64
Added:
deepin-calculator/repos/community-x86_64/PKGBUILD
(from rev 636317, deepin-calculator/trunk/PKGBUILD)
deepin-calculator/repos/community-x86_64/deepin-calculator-qt5.15.patch
(from rev 636317, deepin-calculator/trunk/deepin-calculator-qt5.15.patch)
Deleted:
deepin-calculator/repos/community-x86_64/PKGBUILD
--------------------------------+
PKGBUILD | 67 +++++++++++++++++++++------------------
deepin-calculator-qt5.15.patch | 36 ++++++++++++++++++++
2 files changed, 73 insertions(+), 30 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-28 13:49:35 UTC (rev 636317)
+++ PKGBUILD 2020-05-28 13:50:02 UTC (rev 636318)
@@ -1,30 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-
-pkgname=deepin-calculator
-pkgver=5.5.10
-pkgrel=1
-pkgdesc='An easy to use calculator for ordinary users'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/deepin-calculator";
-license=('GPL3')
-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')
-
-prepare() {
- cd deepin-calculator-$pkgver
- sed -i '/<QList>/i #include <QObject>' core/session.h
-}
-
-build() {
- cd deepin-calculator-$pkgver
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd deepin-calculator-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: deepin-calculator/repos/community-x86_64/PKGBUILD (from rev 636317,
deepin-calculator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-28 13:50:02 UTC (rev 636318)
@@ -0,0 +1,37 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+
+pkgname=deepin-calculator
+pkgver=5.5.11
+pkgrel=1
+pkgdesc='An easy to use calculator for ordinary users'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-calculator";
+license=('GPL3')
+depends=('deepin-qt5integration')
+makedepends=('cmake' '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=('abbfaa439efabdc8488d96b4249fa58a94f6a561e27f178324c2cd990588fba2ec627c1e4ad9d08190d2dbf766b19b75526c0eed8582177f9d9489e60778371c'
+
'd38fed51d16655c4662bdea3a7e19cbcb27b2d04bccaad90e0089652068b6041b73a8512e717ff18c47426046dcfe188ba1535ef19fc21b74fae7dd4e4933e03')
+
+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
+}
+
+build() {
+ cd deepin-calculator-$pkgver
+ ./translate_generation.sh
+ cmake -DCMAKE_INSTALL_PREFIX=/usr .
+ make
+}
+
+package() {
+ cd deepin-calculator-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ chmod +x "$pkgdir"/usr/bin/deepin-calculator
+}
Copied: deepin-calculator/repos/community-x86_64/deepin-calculator-qt5.15.patch
(from rev 636317, deepin-calculator/trunk/deepin-calculator-qt5.15.patch)
===================================================================
--- deepin-calculator-qt5.15.patch (rev 0)
+++ deepin-calculator-qt5.15.patch 2020-05-28 13:50:02 UTC (rev 636318)
@@ -0,0 +1,36 @@
+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"
+
