[arch-commits] Commit in deepin-terminal-old/trunk (PKGBUILD)

[Felix Yan]

    Date: Wednesday, September 2, 2020 @ 17:58:40
  Author: felixonmars
Revision: 696715

upgpkg: deepin-terminal-old 5.0.4.2-1

Modified:
  deepin-terminal-old/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-02 17:58:38 UTC (rev 696714)
+++ PKGBUILD	2020-09-02 17:58:40 UTC (rev 696715)
@@ -3,34 +3,28 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-terminal-old
-pkgver=5.0.4.1
+pkgver=5.0.4.2
 pkgrel=1
 pkgdesc='Default terminal emulation application for Deepin, the old version'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-terminal-old"
 license=('GPL3')
-depends=('vte3' 'libsecret' 'libgee' 'libwnck3' 'expect' 'deepin-menu')
-makedepends=('vala' 'cmake')
-optdepends=('deepin-shortcut-viewer: for shortcut display'
+depends=('vte3' 'libsecret' 'libgee' 'libwnck3' 'expect')
+makedepends=('cmake' 'ninja' 'vala')
+optdepends=('deepin-menu: for native menu integration under DDE'
             'zssh: for remote management support')
 conflicts=('deepin-terminal')
 provides=('deepin-terminal')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-terminal-old/archive/$pkgver.tar.gz"
-        $pkgname-vte-fix.patch::https://github.com/linuxdeepin/deepin-terminal-old/commit/8d0a761873c2ef898c9977acc0192bf9ef9e7ca4.patch
-        $pkgname-vte-0.59.patch::https://github.com/linuxdeepin/deepin-terminal-old/commit/d38f972c8cb958524b326986c6dc72b24fa35dad.patch)
-sha512sums=('543d69cf0105596e47a943742b0024dcf1de15c99288ad3cf165dbba7ec3a78fe7cf3bea23b94d9af30e141f8e0619858ef6b145565944839325ebd42cdded9d'
-            '9bdeb82f54664f2c158d29cb7095b1c7fd0edf12ea20d1c738a79f68df820a5320070a31dcd5673dff3c412ca75bd7140e4293ee0ea986c8ba832455b8eb9662'
-            '44a6538138c0fed9938048229444d6cbf050af6b26307f09068ad86d6a256aef19ceca55c6149036e62c0a50e9c89f13f89f43412ec0d6d42db1256f5206957f')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-terminal-old/archive/$pkgver.tar.gz")
+sha512sums=('3cf80f56b74412228a4835a1a219f0fd8ac33e067c32f170ca8c090bfd15d86a4635cfc290370d77938f91993932fbf833d83a0d616aa0cf1648a8c2a2f8114a')
 
 prepare() {
-  patch -d deepin-terminal-old-$pkgver -Np1 -i ../$pkgname-vte-fix.patch
-  patch -d deepin-terminal-old-$pkgver -Np1 -i ../$pkgname-vte-0.59.patch
   mkdir -p build
 }
 
 build() {
   cd build
-  cmake \
+  cmake -GNinja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DTEST_BUILD=OFF \
@@ -37,10 +31,11 @@
     -DUSE_VENDOR_LIB=OFF \
     -DVERSION=$pkgver \
     ../deepin-terminal-old-$pkgver
-  make
+  ninja
 }
 
 package() {
-  make -C build DESTDIR="$pkgdir" install
+  cd build
+  DESTDIR="$pkgdir" ninja install
   ln -s deepin-terminal "$pkgdir"/usr/bin/x-terminal-emulator
 }