16.6.r0: switch to aperezdc fork

3 files changed, 68 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbd6b7a2f8cb..18bf23459e77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,24 @@
 pkgbase = termite-git
 	pkgdesc = A simple VTE-based terminal
-	pkgver = 12.r20.g37309fd
+	pkgver = 16.6.r0.g86381ed
 	pkgrel = 1
-	url = https://github.com/thestinger/termite/
-	arch = i686
+	url = https://github.com/aperezdc/termite
 	arch = x86_64
 	license = LGPL
 	makedepends = git
-	makedepends = vte3-ng
-	makedepends = ncurses
-	source = git://github.com/thestinger/termite
-	source = git+https://github.com/thestinger/util
-	md5sums = SKIP
-	md5sums = SKIP
-
-pkgname = termite-git
-	pkgdesc = A simple VTE-based terminal
-	depends = vte3-ng
-	depends = termite-terminfo-git
+	makedepends = gperf
+	makedepends = meson
+	makedepends = ninja
+	depends = gnutls
+	depends = gtk3
+	depends = pcre2
+	depends = vte-common
+	provides = termite=16.6
 	conflicts = termite
 	backup = etc/xdg/termite/config
+	source = termite::git+https://github.com/aperezdc/termite.git
+	source = aperezdc.vte::git+https://github.com/aperezdc/vte.git#commit=22624df361d33446f8c78fea72eb4e112b68e599
+	sha256sums = SKIP
+	sha256sums = SKIP
 
-pkgname = termite-terminfo-git
-	pkgdesc = Terminfo for Termite, a simple VTE-based terminal
-	conflicts = termite-terminfo
-
+pkgname = termite-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index acee221b9761..d62fffaffb12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,59 @@
-pkgname=(termite-git termite-terminfo-git)
-pkgver=12.r20.g37309fd
-pkgrel=1
-
-pkgdesc="A simple VTE-based terminal"
-url="https://github.com/thestinger/termite/"
-arch=('i686' 'x86_64')
-license=('LGPL')
-
-makedepends=('git' 'vte3-ng' 'ncurses')
+# Maintainer:
 
-source=(git://github.com/thestinger/termite
-        git+https://github.com/thestinger/util)
-
-md5sums=(SKIP SKIP)
-
-pkgver() {
-  cd termite
-  git describe --long --always | sed 's/^v//; s/-/.r/; s/-/./'
-}
+_pkgname="termite"
+pkgname="$_pkgname-git"
+pkgver=16.6.r0.g86381ed
+pkgrel=1
+pkgdesc='A simple VTE-based terminal'
+url="https://github.com/aperezdc/termite"
+license=(LGPL)
+arch=(x86_64)
+
+depends=(
+  'gnutls'
+  'gtk3'
+  'pcre2'
+  'vte-common'
+)
+makedepends=(
+  'git'
+  'gperf'
+  'meson'
+  'ninja'
+)
+
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
+
+_vte_hash=22624df361d33446f8c78fea72eb4e112b68e599
+
+_pkgsrc="$_pkgname"
+source=(
+  "$_pkgsrc"::"git+$url.git"
+  "aperezdc.vte"::"git+https://github.com/aperezdc/vte.git#commit=$_vte_hash"
+)
+sha256sums=(
+  'SKIP'
+  'SKIP'
+)
+
+backup=(etc/xdg/termite/config)
 
 prepare() {
-  cd termite
-  git submodule init
-  git config submodule.util.url "$srcdir"/util
-  git submodule update
+  ln -s "$srcdir/aperezdc.vte" "$_pkgsrc/subprojects/vte"
 }
 
-build() {
-  cd termite
-  make
+pkgver() {
+  cd "$_pkgsrc"
+  git describe --long --tags --exclude='*[a-zA-Z][a-zA-Z]*' \
+    | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
-package_termite-git() {
-  pkgdesc="A simple VTE-based terminal"
-  depends=('vte3-ng' 'termite-terminfo-git')
-  conflicts=('termite')
-  backup=(etc/xdg/termite/config)
-
-  cd termite
-  make PREFIX=/usr DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir"/usr/share/terminfo
-  install -Dm644 config "$pkgdir"/etc/xdg/termite/config
+build () {
+  arch-meson build "$_pkgsrc"
+  meson compile -C build
 }
 
-package_termite-terminfo-git() {
-  pkgdesc='Terminfo for Termite, a simple VTE-based terminal'
-  conflicts=('termite-terminfo')
-
-  cd termite
-  install -d "$pkgdir"/usr/share/terminfo
-  tic -x termite.terminfo -o "$pkgdir"/usr/share/terminfo
+package () {
+  meson install -C build --skip-subprojects vte --destdir "${pkgdir}"
 }