From 8df5f904743b8c89c645fb15f01279b4e585134f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 25 Jun 2021 08:23:36 +0200
Subject: [PATCH 1/3] changelog: prepare for 1.8.0

---
 CHANGELOG.md | 5 ++---
 1 file changed, 2 insertions(+), 3 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)

From 0a455174f46e3e97c5deb01e75845f86e5011ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 25 Jun 2021 08:24:42 +0200
Subject: [PATCH 2/3] meson/pkgbuild: bump version to 1.8.0

---
 PKGBUILD    | 2 +-
 meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

From bc6b4d7b8ab8bee7a5c50c2eeba8fd939487042b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 25 Jun 2021 08:33:42 +0200
Subject: [PATCH 3/3] generate-version: fix regression where a tagged version
 was parsed wrong
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The regexps didn’t work when the “extra” portion of “git describe” was
missing.
---
 generate-version.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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}