Update to build from a more recent version

4 files changed, 53 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9905561abacd..67628e6ce1e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wezterm-git
 	pkgdesc = A terminal emulator implemented in Rust, using OpenGL ES 2 for rendering.
-	pkgver = 0.1.0.696.gab0c5a8
+	pkgver = 20200517.122836.92c201c6.105.g5d508350
 	pkgrel = 1
 	url = https://github.com/wez/wezterm
 	arch = x86_64
@@ -10,16 +10,16 @@ pkgbase = wezterm-git
 	makedepends = cargo
 	makedepends = cmake
 	makedepends = git
-	makedepends = ragel
-	depends = freetype2
+	makedepends = pkgconf
+	depends = dbus
 	depends = fontconfig
-	depends = libegl
-	depends = harfbuzz
-	depends = xcb-util-wm
-	depends = xcb-util-keysyms
-	depends = python
+	depends = hicolor-icon-theme
+	depends = libx11
 	depends = libxkbcommon-x11
-	source = wezterm::git+https://github.com/wez/wezterm.git
+	depends = wayland
+	depends = xcb-util-keysyms
+	depends = xcb-util-wm
+	source = git+https://github.com/wez/wezterm.git
 	sha256sums = SKIP
 
 pkgname = wezterm-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..39a4dc46e432
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+LICENSE
+src
+pkg
+wezterm*
+squashfs-root
diff --git a/PKGBUILD b/PKGBUILD
index 86812e7b31ae..e8441e8fb977 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,50 @@
+# Maintainer:  Wez Furlong <wez at wezfurlong dot org>
+
 pkgname=('wezterm-git')
-_pkgname="wezterm"
 pkgdesc="A terminal emulator implemented in Rust, using OpenGL ES 2 for rendering."
-pkgver=0.1.0.696.gab0c5a8
+pkgver=20200517.122836.92c201c6.105.g5d508350
 pkgrel=1
 arch=('x86_64' 'i686')
 url="https://github.com/wez/wezterm"
 license=('MIT')
-depends=('freetype2' 'fontconfig' 'libegl' 'harfbuzz' 'xcb-util-wm' 'xcb-util-keysyms' 'python' 'libxkbcommon-x11')
-makedepends=('rust' 'cargo' 'cmake' 'git' 'ragel')
-source=("$_pkgname::git+https://github.com/wez/wezterm.git")
+depends=(
+  'dbus'
+  'fontconfig'
+  'hicolor-icon-theme'
+  'libx11'
+  'libxkbcommon-x11'
+  'wayland'
+  'xcb-util-keysyms'
+  'xcb-util-wm'
+)
+makedepends=('rust' 'cargo' 'cmake' 'git' 'pkgconf')
+source=("git+https://github.com/wez/wezterm.git")
 sha256sums=('SKIP')
+conflicts=('wezterm-bin' 'wezterm-nightly-bin')
+
+prepare() {
+  cd $srcdir/wezterm
+  git submodule update --init --recursive
+}
 
 pkgver() {
-	cd $_pkgname
-	echo "$(grep '^version =' Cargo.toml|head -n1|cut -d\" -f2).$(git rev-list --count HEAD).g$(git describe --always)"
+  cd $srcdir/wezterm
+  git describe --tags | tr - .
 }
 
 build() {
-	cd $_pkgname
+  cd $srcdir/wezterm
 	cargo build --release
 }
 
 package() {
-	cd $_pkgname
-	install -D -m755 "$srcdir/$_pkgname/target/release/wezterm" "$pkgdir/usr/bin/wezterm"
+	cd $srcdir/wezterm
+  install -Dsm755 target/release/wezterm $pkgdir/usr/bin/wezterm
+  install -Dsm755 target/release/strip-ansi-escapes $pkgdir/usr/bin/strip-ansi-escapes
+  install -Dm644 assets/icon/terminal.png $pkgdir/usr/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
+  install -Dm644 -t $pkgdir/usr/share/wezterm/colors assets/colors/*
+  install -Dm644 assets/wezterm.desktop $pkgdir/usr/share/applications/org.wezfurlong.wezterm.desktop
+  install -Dm644 assets/wezterm.appdata.xml $pkgdir/usr/share/metainfo/org.wezfurlong.wezterm.appdata.xml
+  install -Dm644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000000..ba0a0c4e6b70
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+set -x
+makepkg --force --syncdeps --noconfirm
+makepkg --printsrcinfo > .SRCINFO
+namcap PKGBUILD
+namcap wezterm*.pkg.tar.xz