aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-22 17:10:46 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-22 17:10:46 +0000
commit230555a89db313061518b4eeb06860ef2cf81e4b (patch)
treee3c1390514f642badaf48de5be56495520e57916
parentsearch: re-enable search-commit action (diff)
parentmeson/pkgbuild: bump version to 1.4.0, require fcft 2.2.2 (diff)
Merge branch 'releases/1.4'
-rw-r--r--CHANGELOG.md9
-rw-r--r--PKGBUILD4
-rw-r--r--meson.build4
3 files changed, 6 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c711b664..dd2cad32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-* [Unreleased](#unreleased)
+* [1.4.0](#1-4-0)
* [1.3.0](#1-3-0)
* [1.2.3](#1-2-3)
* [1.2.2](#1-2-2)
@@ -8,7 +8,7 @@
* [1.2.0](#1-2-0)
-## Unreleased
+## 1.4.0
### Added
@@ -56,8 +56,6 @@
rather than _visual_ focus.
-### Deprecated
-### Removed
### Fixed
* Do not stop an ongoing selection when `shift` is released. When the
@@ -113,9 +111,6 @@
(https://codeberg.org/dnkl/foot/issues/38).
-### Security
-
-
## 1.3.0
### Added
diff --git a/PKGBUILD b/PKGBUILD
index 809f38b6..945a28a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
pkgname=('foot-git' 'foot-terminfo-git')
-pkgver=1.3.0
+pkgver=1.4.0
pkgrel=1
arch=('x86_64' 'aarch64')
url=https://codeberg.org/dnkl/foot
license=(mit)
makedepends=('meson' 'ninja' 'scdoc' 'python' 'ncurses' 'wayland-protocols' 'tllist>=1.0.1')
-depends=('libxkbcommon' 'wayland' 'pixman' 'fontconfig' 'fcft>=2.2.0')
+depends=('libxkbcommon' 'wayland' 'pixman' 'fontconfig' 'fcft>=2.2.2')
source=()
pkgver() {
diff --git a/meson.build b/meson.build
index a7db2105..fdcce2f6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('foot', 'c',
- version: '1.3.0',
+ version: '1.4.0',
license: 'MIT',
meson_version: '>=0.53.0',
default_options: [
@@ -59,7 +59,7 @@ xkb = dependency('xkbcommon')
fontconfig = dependency('fontconfig')
tllist = dependency('tllist', version: '>=1.0.1', fallback: 'tllist')
-fcft = dependency('fcft', version: ['>=2.2.0', '<3.0.0'], fallback: 'fcft')
+fcft = dependency('fcft', version: ['>=2.2.2', '<3.0.0'], fallback: 'fcft')
wayland_protocols_datadir = wayland_protocols.get_pkgconfig_variable('pkgdatadir')