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

[Frederik Schwan]

    Date: Wednesday, October 7, 2020 @ 19:39:10
  Author: freswa
Revision: 720905

upgpkg: termite 15-3

switch to signed git tags (thx @mysta)

Modified:
  termite/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-07 19:33:38 UTC (rev 720904)
+++ PKGBUILD	2020-10-07 19:39:10 UTC (rev 720905)
@@ -1,20 +1,24 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Maintainer: Frederik Schwan <freswa at archlinux.org>
+# Contributor: Jelle van der Waa <jelle at archlinux.org>
 # Contributor: Daniel Micay <danielmicay at gmail.com>
 
 pkgbase=termite
 pkgname=('termite' 'termite-terminfo')
 pkgver=15
-pkgrel=2
-pkgdesc="A simple VTE-based terminal"
-url="https://github.com/thestinger/termite/"
+pkgrel=3
+_vtever='0.56.2.a'
+_commit='409b8449ab51fccf51057621168c9c15c54d4807'
+pkgdesc='A simple VTE-based terminal'
+url='https://github.com/thestinger/termite/'
 license=('LGPL')
 arch=('x86_64')
 depends=('gtk3' 'pcre2' 'gnutls' 'vte-common')
 makedepends=('git' 'ncurses' 'intltool' 'gperf' 'gtk-doc')
-_vtever=0.56.2.a
-source=("git+https://github.com/thestinger/termite#tag=v$pkgver"
-        "git+https://github.com/thestinger/vte-ng#tag=$_vtever"
-        "termite-util::git+https://github.com/thestinger/util")
+source=("git+https://github.com/thestinger/termite.git#tag=v${pkgver}?signed"
+        "git+https://github.com/thestinger/vte-ng.git#tag=${_vtever}"
+        "termite-util::git+https://github.com/thestinger/util.git#tag=${_commit}")
+validpgpkeys=('E499C79F53C96A54E572FEE1C06086337C50773E'  # Jelle van der Waa
+              '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A') # Daniel Micay
 sha256sums=('SKIP'
             'SKIP'
             'SKIP')
@@ -24,9 +28,9 @@
   echo 'sources: $(BUILT_SOURCES)' >> src/Makefile.am 
   NOCONFIGURE=1 ./autogen.sh
 
-  cd ../$pkgbase
+  cd ../termite
   git submodule init
-  git config --local submodule.util.url "$srcdir/termite-util"
+  git config --local submodule.util.url "${srcdir}"/termite-util
   git submodule update
 }
 
@@ -33,8 +37,8 @@
 build() {
   cd vte-ng
   ./configure \
-    --prefix="$srcdir/vte-static" \
-    --localedir="/usr/share/$pkgbase/locale" \
+    --prefix="${srcdir}"/vte-static \
+    --localedir=/usr/share/termite/locale \
     --enable-static \
     --disable-shared \
     enable_introspection=no \
@@ -44,8 +48,8 @@
   make -C src sources install-exec install-data -j 1 # makefile bug does not allow -j
   make install-pkgconfigDATA
 
-  cd ../$pkgbase
-  export PKG_CONFIG_PATH="$srcdir/vte-static/lib/pkgconfig"
+  cd ../termite
+  export PKG_CONFIG_PATH="${srcdir}"/vte-static/lib/pkgconfig
   make
 }
 
@@ -53,9 +57,9 @@
   depends+=('termite-terminfo')
   backup=(etc/xdg/termite/config)
 
-  make -C vte-ng/po DESTDIR="$pkgdir" install-data
-  make -C $pkgbase DESTDIR="$pkgdir" PREFIX=/usr install
-  rm -r "$pkgdir/usr/share/terminfo"
+  make -C vte-ng/po DESTDIR="${pkgdir}" install-data
+  make -C termite DESTDIR="${pkgdir}" PREFIX=/usr install
+  rm -r "${pkgdir}"/usr/share/terminfo
 }
 
 package_termite-terminfo() {
@@ -62,6 +66,6 @@
   pkgdesc='Terminfo for Termite, a simple VTE-based terminal'
   depends=('ncurses')
 
-  mkdir -p "$pkgdir/usr/share/terminfo"
-  tic -x -o "$pkgdir/usr/share/terminfo" $pkgbase/termite.terminfo
+  mkdir -p "${pkgdir}"/usr/share/terminfo
+  tic -x -o "${pkgdir}"/usr/share/terminfo termite/termite.terminfo
 }