kakoune: update to 2022.10.31.

This commit is contained in:
Daniel Lewan 2022-12-17 13:49:54 +01:00 committed by Michal Vasilek
parent f26db51786
commit c808c0e574
2 changed files with 2 additions and 58 deletions

View File

@ -1,56 +0,0 @@
From d1ea2ffa600fd2a7b14e415b68ceedba3325c5db Mon Sep 17 00:00:00 2001
From: Tim Allen <screwtape@froup.com>
Date: Sat, 12 Feb 2022 21:35:33 +1100
Subject: [PATCH] Make Color::validate_alpha() a constexpr function.
We call it from a constexpr constructor, so it needs to be constexpr itself.
Fixes #4544.
---
src/color.cc | 7 -------
src/color.hh | 7 ++++++-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/color.cc b/src/color.cc
index b355b9cf13..dfe2e955b2 100644
--- a/src/color.cc
+++ b/src/color.cc
@@ -34,13 +34,6 @@ bool is_color_name(StringView color)
return contains(color_names, color);
}
-void Color::validate_alpha()
-{
- static_assert(RGB == 17);
- if (a < RGB)
- throw runtime_error("Colors alpha must be > 16");
-}
-
Color str_to_color(StringView color)
{
auto it = find_if(color_names, [&](const char* c){ return color == c; });
diff --git a/src/color.hh b/src/color.hh
index 943678edfb..85babd9800 100644
--- a/src/color.hh
+++ b/src/color.hh
@@ -1,6 +1,7 @@
#ifndef color_hh_INCLUDED
#define color_hh_INCLUDED
+#include "exception.hh"
#include "hash.hh"
#include "meta.hh"
#include "assert.hh"
@@ -55,7 +56,11 @@ struct Color
}
private:
- void validate_alpha();
+ constexpr void validate_alpha() {
+ static_assert(RGB == 17);
+ if (a < RGB)
+ throw runtime_error("Colors alpha must be > 16");
+ }
};
constexpr bool operator==(Color lhs, Color rhs)

View File

@ -1,7 +1,7 @@
# Template file for 'kakoune'
pkgname=kakoune
reverts=20180409_1
version=2021.11.08
version=2022.10.31
revision=1
build_wrksrc="src"
build_style=gnu-makefile
@ -14,7 +14,7 @@ maintainer="Jakub Skrzypnik <j.skrzypnik@openmailbox.org>"
license="Unlicense"
homepage="https://kakoune.org"
distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
checksum=aa30889d9da11331a243a8f40fe4f6a8619321b19217debac8f565e06eddb5f4
checksum=fb317b62c9048ddc7567fe83dfc409c252ef85778b24bd2863be2762d4e4e58b
post_patch() {
vsed -i -e 's/-O3//' Makefile