Github messages for voidlinux
 help / color / mirror / Atom feed
From: TeddyDD <TeddyDD@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] kakoune: update to 2022.10.31.
Date: Sun, 18 Dec 2022 13:02:09 +0100	[thread overview]
Message-ID: <20221218120209.LcPt_WpuSecHlSHBlihKZnjNCUrDXF9caQEG1BWQ3KQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41144@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is an updated pull request by TeddyDD against master on the void-packages repository

https://github.com/TeddyDD/void-packages-1 update-kakoune
https://github.com/void-linux/void-packages/pull/41144

kakoune: update to 2022.10.31.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41144.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-kakoune-41144.patch --]
[-- Type: text/x-diff, Size: 3113 bytes --]

From 1cb1a2cd0f5f66cc883de0a5f851eb2ed4d41c01 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 17 Dec 2022 13:49:54 +0100
Subject: [PATCH] kakoune: update to 2022.10.31.

---
 ...2ffa600fd2a7b14e415b68ceedba3325c5db.patch | 56 -------------------
 srcpkgs/kakoune/template                      |  4 +-
 2 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/kakoune/patches/d1ea2ffa600fd2a7b14e415b68ceedba3325c5db.patch

diff --git a/srcpkgs/kakoune/patches/d1ea2ffa600fd2a7b14e415b68ceedba3325c5db.patch b/srcpkgs/kakoune/patches/d1ea2ffa600fd2a7b14e415b68ceedba3325c5db.patch
deleted file mode 100644
index afa49eda2152..000000000000
--- a/srcpkgs/kakoune/patches/d1ea2ffa600fd2a7b14e415b68ceedba3325c5db.patch
+++ /dev/null
@@ -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)
diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template
index ecab13423b99..c1e1a8a0b872 100644
--- a/srcpkgs/kakoune/template
+++ b/srcpkgs/kakoune/template
@@ -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

  parent reply	other threads:[~2022-12-18 12:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-17 12:51 [PR PATCH] " TeddyDD
2022-12-17 13:07 ` TeddyDD
2022-12-18 12:02 ` TeddyDD [this message]
2022-12-18 12:41 ` [PR PATCH] [Merged]: " paper42

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221218120209.LcPt_WpuSecHlSHBlihKZnjNCUrDXF9caQEG1BWQ3KQ@z \
    --to=teddydd@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).