Merge branch 'releases/1.2'

This commit is contained in:
Daniel Eklöf 2020-03-06 21:28:50 +01:00
commit c33c7e6607
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 8 additions and 3 deletions

View file

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

View file

@ -1,5 +1,5 @@
pkgname=('foot' 'foot-terminfo') pkgname=('foot' 'foot-terminfo')
pkgver=1.2.0 pkgver=1.2.1
pkgrel=1 pkgrel=1
arch=('x86_64') arch=('x86_64')
url=https://codeberg.org/dnkl/foot url=https://codeberg.org/dnkl/foot

View file

@ -10,7 +10,7 @@ out_file=${3}
# echo "source directory: ${src_dir}" # echo "source directory: ${src_dir}"
# echo "output file: ${out_file}" # 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) workdir=$(pwd)
cd "${src_dir}" cd "${src_dir}"
git_version=$(git describe --always --tags) git_version=$(git describe --always --tags)

View file

@ -1,5 +1,5 @@
project('foot', 'c', project('foot', 'c',
version: '1.2.0', version: '1.2.1',
license: 'MIT', license: 'MIT',
meson_version: '>=0.47.0', meson_version: '>=0.47.0',
default_options: [ default_options: [