Merge branch 'releases/1.2'

CHANGELOG.md

@@ -8,6 +8,11 @@
 ### Fixed
 ### Security
 
+## 1.2.1
+
+### Fixed
+* Building AUR package
+
 
 ## 1.2.0
 

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

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)

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: [