<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/74b3fd45a0cebb086886d4fddd63e2b2b35906b3">https://github.com/macports/macports-ports/commit/74b3fd45a0cebb086886d4fddd63e2b2b35906b3</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 74b3fd45a0c kitty: Build without -Werror
</span>74b3fd45a0c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 74b3fd45a0cebb086886d4fddd63e2b2b35906b3
</span>Author: Vadim-Valdis Yudaev <judaew@outlook.de>
AuthorDate: Sat Apr 24 16:20:36 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> kitty: Build without -Werror
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixed: https://trac.macports.org/ticket/62732
</span>---
aqua/kitty/Portfile | 8 ++-
.../patch-kitty-no-deprecated-declarations.diff | 14 ++---
aqua/kitty/files/patch-turn-off-werror.diff | 63 ++++++++++++++++++++++
3 files changed, 76 insertions(+), 9 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 d55ddd832cb..681f6b77afa 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;'>@@ -6,7 +6,7 @@ PortGroup python 1.0
</span>
github.setup kovidgoyal kitty 0.20.1 v
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories aqua
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,9 @@ checksums rmd160 f14a923892e26886f8079b3aaa39bcb362b21699 \
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Changes is already in master, remove the patch in next version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-turn-off-werror.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append patch-kitty-no-deprecated-declarations.diff
python.default_version \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +50,8 @@ depends_lib-append port:harfbuzz
</span>
build.cmd "${python.bin} setup.py"
build.target kitty.app
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append --verbose --update-check-interval=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --ignore-compiler-warnings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --update-check-interval=0 --verbose
</span>
compiler.c_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/kitty/files/patch-kitty-no-deprecated-declarations.diff b/aqua/kitty/files/patch-kitty-no-deprecated-declarations.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 745fa7b744d..9adb8e28123 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/kitty/files/patch-kitty-no-deprecated-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/kitty/files/patch-kitty-no-deprecated-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- setup.py.orig
+++ setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,7 +289,7 @@
</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:#e0ffe0;'>+@@ -294,7 +294,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ march = '-march=native' if native_optimizations else ''
</span> cflags_ = os.environ.get(
'OVERRIDE_CFLAGS', (
<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;'>-+ '-Wextra {} -Wno-missing-field-initializers -Wno-deprecated-declarations -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:#e0ffe0;'>+- f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wno-deprecated-declarations -Wall -Wstrict-prototypes {std}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f' -pedantic-errors {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f' -pipe {march} -fvisibility=hidden {fortify_source}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..85ee5ccd893
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/kitty/files/patch-turn-off-werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,63 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 12763e19d84c40e1274de8868622f799ca3f6b88 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Kovid Goyal <kovid@kovidgoyal.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Apr 2021 18:32:57 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add a build argument to turn off -Werror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,6 +261,7 @@ def init_env(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ canberra_library: Optional[str] = None,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_logging: Iterable[str] = (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_include_dirs: Iterable[str] = (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ignore_compiler_warnings: bool = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ) -> Env:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ native_optimizations = native_optimizations and not sanitize and not debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if native_optimizations and is_macos and is_arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,19 +288,15 @@ def init_env(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cppflags = shlex.split(cppflags_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for el in extra_logging:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cppflags.append('-DDEBUG_{}'.format(el.upper().replace('-', '_')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ werror = '' if ignore_compiler_warnings else '-Werror'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std = '' if is_openbsd else '-std=c11'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sanitize_flag = ' '.join(sanitize_args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ march = '-march=native' if native_optimizations else ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags_ = os.environ.get(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'OVERRIDE_CFLAGS', (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ).format(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- float_conversion,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '' if is_openbsd else '-std=c11',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- optimize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ' '.join(sanitize_args),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stack_protector,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- missing_braces,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-march=native' if native_optimizations else '',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fortify_source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f' -pedantic-errors {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f' -pipe {march} -fvisibility=hidden {fortify_source}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags = shlex.split(cflags_) + shlex.split(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ env = init_env(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.debug, args.sanitize, native_optimizations, args.link_time_optimization, args.profile,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.egl_library, args.startup_notification_library, args.canberra_library,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.extra_logging, args.extra_include_dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.extra_logging, args.extra_include_dirs, args.ignore_compiler_warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1234,6 +1231,11 @@ def option_parser() -> argparse.ArgumentParser: # {{{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action='store_false',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help='Turn off Link Time Optimization (LTO).'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p.add_argument(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '--ignore-compiler-warnings',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default=False, action='store_true',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help='Ignore any warnings from the compiler while building'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # }}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>