[arch-commits] Commit in deepin-calculator/trunk (2 files)

[Felix Yan]

    Date: Thursday, May 28, 2020 @ 13:49:35
  Author: felixonmars
Revision: 636317

upgpkg: deepin-calculator 5.5.11-1

Modified:
  deepin-calculator/trunk/PKGBUILD
  deepin-calculator/trunk/deepin-calculator-qt5.15.patch

--------------------------------+
 PKGBUILD                       |   19 +++++++++++--------
 deepin-calculator-qt5.15.patch |   18 +++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-28 13:43:09 UTC (rev 636316)
+++ PKGBUILD	2020-05-28 13:49:35 UTC (rev 636317)
@@ -1,23 +1,23 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-calculator
-pkgver=5.5.10
-pkgrel=2
+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=('qt5-tools' 'python')
+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=('aa9bfd63d204933d06fea414b06cac8f7fb1cf7a4f3e1bb0f936d1a0e49a93f89e9a30641e4188d7e7420ba9fd9b522d2e82b931eb2b37db204cbecbf9163172'
-            '09af5aca1fe25657fddfdc825583b4fa7941ea4bf3883a8c87629459e89ba44e0e311a17c5c759f8b309af69e44c18580ecffeeae5c710ab33ddbea1c7e97157')
+sha512sums=('abbfaa439efabdc8488d96b4249fa58a94f6a561e27f178324c2cd990588fba2ec627c1e4ad9d08190d2dbf766b19b75526c0eed8582177f9d9489e60778371c'
+            'd38fed51d16655c4662bdea3a7e19cbcb27b2d04bccaad90e0089652068b6041b73a8512e717ff18c47426046dcfe188ba1535ef19fc21b74fae7dd4e4933e03')
 
 prepare() {
   cd deepin-calculator-$pkgver
-  sed -i '/<QList>/i #include <QObject>' core/session.h
+  sed -i '/<QList>/i #include <QObject>' src/core/session.h
 
   patch -p1 -i ../deepin-calculator-qt5.15.patch # Fix build with Qt 5.15
 }
@@ -24,11 +24,14 @@
 
 build() {
   cd deepin-calculator-$pkgver
-  qmake-qt5 PREFIX=/usr
+  ./translate_generation.sh
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 
 package() {
   cd deepin-calculator-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
+  make DESTDIR="$pkgdir" install
+
+  chmod +x "$pkgdir"/usr/bin/deepin-calculator
 }

Modified: deepin-calculator-qt5.15.patch
===================================================================
--- deepin-calculator-qt5.15.patch	2020-05-28 13:43:09 UTC (rev 636316)
+++ deepin-calculator-qt5.15.patch	2020-05-28 13:49:35 UTC (rev 636317)
@@ -1,7 +1,7 @@
-diff --git a/modules/simplelistdelegate.cpp b/modules/simplelistdelegate.cpp
+diff --git a/src/modules/simplelistdelegate.cpp b/src/modules/simplelistdelegate.cpp
 index 40e30b3..ae1b028 100644
---- a/modules/simplelistdelegate.cpp
-+++ b/modules/simplelistdelegate.cpp
+--- a/src/modules/simplelistdelegate.cpp
++++ b/src/modules/simplelistdelegate.cpp
 @@ -22,6 +22,7 @@
  #include <QEvent>
  #include <QMouseEvent>
@@ -10,10 +10,10 @@
  #include <DGuiApplicationHelper>
  #include "dthememanager.h"
  #include "simplelistmodel.h"
-diff --git a/widgets/memorybutton.cpp b/widgets/memorybutton.cpp
+diff --git a/src/widgets/memorybutton.cpp b/src/widgets/memorybutton.cpp
 index b316632..19ee0de 100644
---- a/widgets/memorybutton.cpp
-+++ b/widgets/memorybutton.cpp
+--- a/src/widgets/memorybutton.cpp
++++ b/src/widgets/memorybutton.cpp
 @@ -2,6 +2,7 @@
  
  #include <QMouseEvent>
@@ -22,10 +22,10 @@
  #include <QTimer>
  #include "dthememanager.h"
  
-diff --git a/widgets/textbutton.cpp b/widgets/textbutton.cpp
+diff --git a/src/widgets/textbutton.cpp b/src/widgets/textbutton.cpp
 index 80a039d..0c8e37a 100644
---- a/widgets/textbutton.cpp
-+++ b/widgets/textbutton.cpp
+--- a/src/widgets/textbutton.cpp
++++ b/src/widgets/textbutton.cpp
 @@ -20,6 +20,7 @@
  #include "textbutton.h"
  #include <QMouseEvent>