Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (5468ce720280979e8ccb5fc238292700fc4b6643)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (5468ce720280979e8ccb5fc238292700fc4b6643)
  • Date: Wed, 3 Jul 2024 18:36:20 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:


editors/kakoune/patches/0001-Make-Color-validate_alpha-a-constexpr-function.patch
| 2 +-
editors/kakoune/patches/0001-Stop-using-deprecated-std-iterator.patch
| 2 +-
gnu/gcc-10/patches/0001-Remove-conflicting-duplicated-manpages.patch
| 2 +-
gnu/gcc/patches/0002-Remove-conflicting-duplicated-manpages.patch
| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5468ce720280979e8ccb5fc238292700fc4b6643
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Fix broken patch status lines

diff --git
a/editors/kakoune/patches/0001-Make-Color-validate_alpha-a-constexpr-function.patch

b/editors/kakoune/patches/0001-Make-Color-validate_alpha-a-constexpr-function.patch
index 283cddf..57db595 100644
---
a/editors/kakoune/patches/0001-Make-Color-validate_alpha-a-constexpr-function.patch
+++
b/editors/kakoune/patches/0001-Make-Color-validate_alpha-a-constexpr-function.patch
@@ -6,7 +6,7 @@ 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.
-Upstream-Status: Backported
+Upstream-Status: Backport
---
src/color.cc | 7 -------
src/color.hh | 7 ++++++-
diff --git
a/editors/kakoune/patches/0001-Stop-using-deprecated-std-iterator.patch
b/editors/kakoune/patches/0001-Stop-using-deprecated-std-iterator.patch
index ed67c9c..326dd56 100644
--- a/editors/kakoune/patches/0001-Stop-using-deprecated-std-iterator.patch
+++ b/editors/kakoune/patches/0001-Stop-using-deprecated-std-iterator.patch
@@ -7,7 +7,7 @@ As reported in #4615 and others, GCC 12.1 emits deprecation
warnings
because we use std::iterator. Replace it with the modern equivalent.

Closes #4615
-Upstream-Status: Backported
+Upstream-Status: Backport
---
src/parameters_parser.hh | 8 +++++++-
src/ranges.hh | 34 ++++++++++++++++++++++++++++------
diff --git
a/gnu/gcc-10/patches/0001-Remove-conflicting-duplicated-manpages.patch
b/gnu/gcc-10/patches/0001-Remove-conflicting-duplicated-manpages.patch
index 303d4aa..f58546b 100644
--- a/gnu/gcc-10/patches/0001-Remove-conflicting-duplicated-manpages.patch
+++ b/gnu/gcc-10/patches/0001-Remove-conflicting-duplicated-manpages.patch
@@ -10,7 +10,7 @@ installation.

Origin: Source Mage
Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
-Upstream-Status: Inappropiate
+Upstream-Status: Inappropriate
---
Makefile.in | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git
a/gnu/gcc/patches/0002-Remove-conflicting-duplicated-manpages.patch
b/gnu/gcc/patches/0002-Remove-conflicting-duplicated-manpages.patch
index 7470f35..636c6db 100644
--- a/gnu/gcc/patches/0002-Remove-conflicting-duplicated-manpages.patch
+++ b/gnu/gcc/patches/0002-Remove-conflicting-duplicated-manpages.patch
@@ -9,7 +9,7 @@ different versions of these files, just remove them from the
installation.

Origin: Source Mage
-Upstream-Status: Inappropiate
+Upstream-Status: Inappropriate
Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
gcc/Makefile.in | 5 +----


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (5468ce720280979e8ccb5fc238292700fc4b6643), Ismael Luceno, 07/03/2024

Archive powered by MHonArc 2.6.24.

Top of Page