Merge branch 'releases/1.8'

This commit is contained in:
Daniel Eklöf 2021-06-25 08:44:11 +02:00
commit 3d524746cd
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 9 additions and 9 deletions

View file

@ -1,6 +1,6 @@
# Changelog
* [Unreleased](#unreleased)
* [1.8.0](#1-8-0)
* [1.7.2](#1-7-2)
* [1.7.1](#1-7-1)
* [1.7.0](#1-7-0)
@ -26,7 +26,7 @@
* [1.2.0](#1-2-0)
## Unreleased
## 1.8.0
### Grapheme shaping
@ -257,7 +257,6 @@ supported.
* Window being incorrectly resized on CSD/SSD run-time changes.
### Security
### Contributors
* [r\_c\_f](https://codeberg.org/r_c_f)
* [craigbarnes](https://codeberg.org/craigbarnes)

View file

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

View file

@ -20,12 +20,13 @@ if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
new_version="${git_version} ($(env LC_TIME=C date "+%b %d %Y"), branch '${git_branch}')"
else
new_version="${default_version}"
extra=""
fi
major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\1/')
minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\2/')
patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\3/')
extra=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\5/')
major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1/')
minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\2/')
patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/')
extra=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?.*/\5/')
new_version="#define FOOT_VERSION \"${new_version}\"
#define FOOT_MAJOR ${major}

View file

@ -1,5 +1,5 @@
project('foot', 'c',
version: '1.7.2',
version: '1.8.0',
license: 'MIT',
meson_version: '>=0.53.0',
default_options: [