[arch-commits] Commit in deepin-calculator/repos/community-x86_64 (4 files)

[Felix Yan]

    Date: Wednesday, June 24, 2020 @ 13:24:13
  Author: felixonmars
Revision: 652417

archrelease: copy trunk to community-x86_64

Added:
  deepin-calculator/repos/community-x86_64/PKGBUILD
    (from rev 652415, deepin-calculator/trunk/PKGBUILD)
  deepin-calculator/repos/community-x86_64/deepin-calculator-qt5.15.patch
    (from rev 652415, deepin-calculator/trunk/deepin-calculator-qt5.15.patch)
Deleted:
  deepin-calculator/repos/community-x86_64/PKGBUILD
  deepin-calculator/repos/community-x86_64/deepin-calculator-qt5.15.patch

--------------------------------+
 PKGBUILD                       |   73 +++++++++++++++++++--------------------
 deepin-calculator-qt5.15.patch |   72 +++++++++++++++++++-------------------
 2 files changed, 73 insertions(+), 72 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-24 13:24:11 UTC (rev 652416)
+++ PKGBUILD	2020-06-24 13:24:13 UTC (rev 652417)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-calculator
-pkgver=5.5.18
-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=('6afa9ed59cddcd0d4b1ec1b3b0a159366f49ec5468d6cbc3a73b3a347da844c3aeb4c03524329087a7a19e5b966ff9e96470f121bff9ab7cbe25c35c2449d3fd'
-            '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
-  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/PKGBUILD (from rev 652415, deepin-calculator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-24 13:24:13 UTC (rev 652417)
@@ -0,0 +1,37 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-calculator
+pkgver=5.5.18
+pkgrel=2
+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"
+        $pkgname-file-installation.patch::https://github.com/linuxdeepin/deepin-calculator/pull/38.patch
+        deepin-calculator-qt5.15.patch)
+sha512sums=('6afa9ed59cddcd0d4b1ec1b3b0a159366f49ec5468d6cbc3a73b3a347da844c3aeb4c03524329087a7a19e5b966ff9e96470f121bff9ab7cbe25c35c2449d3fd'
+            '5fd4ceae86467bdc61c3ea5ef0788f920a0715ce0030e110d79126354fa8122e4bcfff9dc80edf233fc2f956a2f992a765c3c585d6f3eef61aa1c1d12ff68c3a'
+            'd38fed51d16655c4662bdea3a7e19cbcb27b2d04bccaad90e0089652068b6041b73a8512e717ff18c47426046dcfe188ba1535ef19fc21b74fae7dd4e4933e03')
+
+prepare() {
+  cd deepin-calculator-$pkgver
+  sed -i '/<QList>/i #include <QObject>' src/core/session.h
+
+  patch -p1 -i ../$pkgname-file-installation.patch
+  patch -p1 -i ../deepin-calculator-qt5.15.patch # Fix build with Qt 5.15
+}
+
+build() {
+  cd deepin-calculator-$pkgver
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  make
+}
+
+package() {
+  cd deepin-calculator-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: deepin-calculator-qt5.15.patch
===================================================================
--- deepin-calculator-qt5.15.patch	2020-06-24 13:24:11 UTC (rev 652416)
+++ deepin-calculator-qt5.15.patch	2020-06-24 13:24:13 UTC (rev 652417)
@@ -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"
- 

Copied: deepin-calculator/repos/community-x86_64/deepin-calculator-qt5.15.patch (from rev 652415, deepin-calculator/trunk/deepin-calculator-qt5.15.patch)
===================================================================
--- deepin-calculator-qt5.15.patch	                        (rev 0)
+++ deepin-calculator-qt5.15.patch	2020-06-24 13:24:13 UTC (rev 652417)
@@ -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"
+