<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fd4852773ac0695c07d3a4da170f56616ba366ee">https://github.com/macports/macports-ports/commit/fd4852773ac0695c07d3a4da170f56616ba366ee</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fd4852773ac kitty: Update to 0.20.2
</span>fd4852773ac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fd4852773ac0695c07d3a4da170f56616ba366ee
</span>Author: Vadim-Valdis Yudaev <judaew@outlook.de>
AuthorDate: Wed Apr 28 17:29:27 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> kitty: Update to 0.20.2
</span>---
aqua/kitty/Portfile | 14 ++---
.../patch-fix-compilation-on-macos-10.12.diff | 19 -------
aqua/kitty/files/patch-turn-off-werror.diff | 63 ----------------------
3 files changed, 5 insertions(+), 91 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/kitty/Portfile b/aqua/kitty/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b38d645fd89..3aaa26ff853 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/kitty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/kitty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,9 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup kovidgoyal kitty 0.20.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup kovidgoyal kitty 0.20.2 v
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories aqua
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,16 +26,12 @@ if {${os.major} <= 15} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f14a923892e26886f8079b3aaa39bcb362b21699 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 43596a1c5645fe476e96e748bb3b44afd680d84b4af409cd36b33de19b31933d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3449932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2e5956ac37b839dfef572b141aa068f76293d096 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 81756d1aec14be3b968ebc14831360d404cb1b25c90f6fa82b608e42d6324f19 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3502356
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Changes is already in master, remove the patch in next version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-turn-off-werror.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-compilation-on-macos-10.12.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append patch-kitty-no-deprecated-declarations.diff
python.default_version \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/kitty/files/patch-fix-compilation-on-macos-10.12.diff b/aqua/kitty/files/patch-fix-compilation-on-macos-10.12.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 52e02fdeeba..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/kitty/files/patch-fix-compilation-on-macos-10.12.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Luflosi <luflosi@luflosi.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 21 Apr 2021 16:23:42 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation on macOS 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glfw/cocoa_window.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glfw/cocoa_window.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <float.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 101300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSControlStateValueOn NSOnState
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSControlStateValueOff NSOffState
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSControlStateValueMixed NSMixedState
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static uint32_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vk_code_to_functional_key_code(uint8_t key_code) { // {{{
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/kitty/files/patch-turn-off-werror.diff b/aqua/kitty/files/patch-turn-off-werror.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 85ee5ccd893..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/kitty/files/patch-turn-off-werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,63 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 12763e19d84c40e1274de8868622f799ca3f6b88 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Kovid Goyal <kovid@kovidgoyal.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 24 Apr 2021 18:32:57 +0530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add a build argument to turn off -Werror
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,6 +261,7 @@ def init_env(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- canberra_library: Optional[str] = None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extra_logging: Iterable[str] = (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extra_include_dirs: Iterable[str] = (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ignore_compiler_warnings: bool = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ) -> Env:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- native_optimizations = native_optimizations and not sanitize and not debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if native_optimizations and is_macos and is_arm:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,19 +288,15 @@ def init_env(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cppflags = shlex.split(cppflags_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for el in extra_logging:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cppflags.append('-DDEBUG_{}'.format(el.upper().replace('-', '_')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ werror = '' if ignore_compiler_warnings else '-Werror'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std = '' if is_openbsd else '-std=c11'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sanitize_flag = ' '.join(sanitize_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ march = '-march=native' if native_optimizations else ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags_ = os.environ.get(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'OVERRIDE_CFLAGS', (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ).format(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float_conversion,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '' if is_openbsd else '-std=c11',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- optimize,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ' '.join(sanitize_args),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stack_protector,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- missing_braces,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '-march=native' if native_optimizations else '',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fortify_source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f' -pedantic-errors {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f' -pipe {march} -fvisibility=hidden {fortify_source}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = shlex.split(cflags_) + shlex.split(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -754,7 +751,7 @@ def init_env_from_args(args: Options, native_optimizations: bool = False) -> Non
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env = init_env(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args.debug, args.sanitize, native_optimizations, args.link_time_optimization, args.profile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args.egl_library, args.startup_notification_library, args.canberra_library,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- args.extra_logging, args.extra_include_dirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.extra_logging, args.extra_include_dirs, args.ignore_compiler_warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1234,6 +1231,11 @@ def option_parser() -> argparse.ArgumentParser: # {{{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- action='store_false',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help='Turn off Link Time Optimization (LTO).'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p.add_argument(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '--ignore-compiler-warnings',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ default=False, action='store_true',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ help='Ignore any warnings from the compiler while building'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # }}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>