aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-25 06:44:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-25 06:44:11 +0000
commit3d524746cd293a5299b2eb299120647352367a91 (patch)
tree2fa2ebffdae12f558a3e6de0a2830978cb839e9a
parentwayland: regression: properly instantiate CSDs when there’s no decoration manager (diff)
parentgenerate-version: fix regression where a tagged version was parsed wrong (diff)
Merge branch 'releases/1.8'
-rw-r--r--CHANGELOG.md5
-rw-r--r--PKGBUILD2
-rwxr-xr-xgenerate-version.sh9
-rw-r--r--meson.build2
4 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e92a8875..b4a1152c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
diff --git a/PKGBUILD b/PKGBUILD
index d049479a..63771840 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
diff --git a/generate-version.sh b/generate-version.sh
index b539ce42..e088170b 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -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}
diff --git a/meson.build b/meson.build
index fcf2d64c..b65031a8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('foot', 'c',
- version: '1.7.2',
+ version: '1.8.0',
license: 'MIT',
meson_version: '>=0.53.0',
default_options: [