From f5ceb958cd51418998100bcd6f69964d95807246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 6 Mar 2020 21:18:31 +0100
Subject: [PATCH 1/2] generate-version: check for .git directory in *src* dir

Instead of trying to run `git --rev-parse --is-inside-work-tree`,
check if there's a .git directory under the source directory.

This should fix an issue where we incorrectly decided we where in a
foot git clone when we're just a subdirectory under another
repository.
---
 generate-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generate-version.sh b/generate-version.sh
index 89e1fa20..ecd0306f 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -10,7 +10,7 @@ out_file=${3}
 # echo "source directory: ${src_dir}"
 # echo "output file:      ${out_file}"
 
-if command -v git > /dev/null && git rev-parse --is-inside-work-tree > /dev/null 2>&1 ; then
+if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
     workdir=$(pwd)
     cd "${src_dir}"
     git_version=$(git describe --always --tags)

From 07002bb941b0263aab9538ea3197ea971144aa96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 6 Mar 2020 21:21:34 +0100
Subject: [PATCH 2/2] meson/PKGBUILD/changelog: bump to 1.2.1

---
 CHANGELOG.md | 5 +++++
 PKGBUILD     | 2 +-
 meson.build  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12666f5a..0e52a01f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,11 @@
 ### Fixed
 ### Security
 
+## 1.2.1
+
+### Fixed
+* Building AUR package
+
 
 ## 1.2.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 527a8a38..44eeab8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=('foot' 'foot-terminfo')
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 arch=('x86_64')
 url=https://codeberg.org/dnkl/foot
diff --git a/meson.build b/meson.build
index 9de1bd88..8070bb04 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('foot', 'c',
-        version: '1.2.0',
+        version: '1.2.1',
         license: 'MIT',
         meson_version: '>=0.47.0',
         default_options: [