[arch-commits] Commit in alacritty/trunk (PKGBUILD)

[Jiachen Yang]

    Date: Thursday, February 6, 2020 @ 02:11:07
  Author: farseerfc
Revision: 563585

upgpkg: alacritty 0.4.1-2: alacritty stop splitting alacritty-terminfo as ncurses 6.1+20200118-1 now having them

Modified:
  alacritty/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-06 00:37:22 UTC (rev 563584)
+++ PKGBUILD	2020-02-06 02:11:07 UTC (rev 563585)
@@ -2,18 +2,18 @@
 # Maintainer: Jiachen YANG <farseerfc at archlinux.org>
 # Contributor: kpcyrd <git at rxv.cc>
 # Contributor: quininer <quininer at live.com>
-pkgbase='alacritty'
-pkgname=('alacritty' 'alacritty-terminfo')
+pkgname='alacritty'
 pkgdesc="A cross-platform, GPU-accelerated terminal emulator"
 _pkgver=0.4.1
 pkgver="$_pkgver"
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://github.com/jwilm/alacritty"
 license=('Apache')
 makedepends=('rust' 'cargo' 'cmake' 'fontconfig' 'ncurses' 'desktop-file-utils' 'gdb' 'libxcb')
+depends=('freetype2' 'fontconfig' 'libxi' 'libxcursor' 'libxrandr')
 checkdepends=('ttf-dejavu') # for monospace fontconfig test
-source=("${pkgbase}-${_pkgver}.tar.gz::https://github.com/jwilm/${pkgbase}/archive/v${_pkgver}.tar.gz")
+source=("${pkgname}-${_pkgver}.tar.gz::https://github.com/jwilm/${pkgname}/archive/v${_pkgver}.tar.gz")
 sha256sums=('ee807f03a4014e7f989cf649a7c8209c0c5f57297812a39f4b163f9580b9a539')
 
 build(){
@@ -26,13 +26,9 @@
   env CARGO_INCREMENTAL=0 cargo test --release
 }
 
-package_alacritty() {
-  depends=('freetype2' 'fontconfig' 'libxi' 'libxcursor' 'libxrandr')
-  optdepends=('alacritty-terminfo: terminfo for alacritty')
-
+package() {
   cd "$pkgbase-$_pkgver"
   desktop-file-install -m 644 --dir "$pkgdir/usr/share/applications/" "extra/linux/alacritty.desktop"
-
   install -D -m755 "target/release/alacritty" "$pkgdir/usr/bin/alacritty"
   install -D -m644 "extra/alacritty.man" "$pkgdir/usr/share/man/man1/alacritty.1"
   install -D -m644 "extra/linux/io.alacritty.Alacritty.appdata.xml" "$pkgdir/usr/share/appdata/io.alacritty.Alacritty.appdata.xml"
@@ -43,12 +39,3 @@
   install -D -m644 "extra/logo/alacritty-term.svg" "$pkgdir/usr/share/pixmaps/Alacritty.svg"
 }
 
-package_alacritty-terminfo() {
-  pkgdesc="Terminfo files for the alacritty terminal emulator"
-  depends=('ncurses')
-
-  cd "$pkgbase-$_pkgver"
-
-  install -dm 755 "$pkgdir/usr/share/terminfo/a/"
-  tic -o "$pkgdir/usr/share/terminfo" -xe alacritty,alacritty-direct extra/alacritty.info
-}