From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4CFD13835C for ; Tue, 2 Feb 2021 13:08:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E42DE0937; Tue, 2 Feb 2021 13:08:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6EA73E0937 for ; Tue, 2 Feb 2021 13:08:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 044183416A9 for ; Tue, 2 Feb 2021 13:08:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E7B64C0 for ; Tue, 2 Feb 2021 13:08:37 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1612270069.e5d0e8614d68462eddda330d57378d1e8bf4ee66.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/files/kitty-9999-flags.patch x11-terms/kitty/kitty-9999.ebuild X-VCS-Directories: x11-terms/kitty/files/ x11-terms/kitty/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: e5d0e8614d68462eddda330d57378d1e8bf4ee66 X-VCS-Branch: master Date: Tue, 2 Feb 2021 13:08:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 82e1168b-2b66-46b1-b219-05a4189436d5 X-Archives-Hash: 97599bdfa2e01af10be3306bd6471cc1 commit: e5d0e8614d68462eddda330d57378d1e8bf4ee66 Author: Matthias Coppens gmail com> AuthorDate: Tue Feb 2 12:01:04 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Feb 2 12:47:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d0e861 x11-terms/kitty: Update flags.patch for -9999 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Matthias Coppens gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19250 Signed-off-by: Joonas Niilola gentoo.org> x11-terms/kitty/files/kitty-9999-flags.patch | 49 ++++++++++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch new file mode 100644 index 00000000000..3bc0431b569 --- /dev/null +++ b/x11-terms/kitty/files/kitty-9999-flags.patch @@ -0,0 +1,49 @@ +diff --git a/setup.py b/setup.py +index ce5309ee..9cb59461 100755 +--- a/setup.py ++++ b/setup.py +@@ -278,7 +278,7 @@ def init_env( + df += ' -Og' + float_conversion = '-Wfloat-conversion' + fortify_source = '-D_FORTIFY_SOURCE=2' +- optimize = df if debug or sanitize else '-O3' ++ optimize = '' + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() + cppflags_ = os.environ.get( + 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), +@@ -289,7 +289,7 @@ def init_env( + cflags_ = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}' ++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}' + ).format( + float_conversion, + '' if is_openbsd else '-std=c11', +@@ -306,7 +306,7 @@ def init_env( + ) + ldflags_ = os.environ.get( + 'OVERRIDE_LDFLAGS', +- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') ++ '-Wall ' + ' '.join(sanitize_args) + ) + ldflags = shlex.split(ldflags_) + ldflags.append('-shared') +@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: + + + def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: +- cflags = '-Wall -Werror -fpie'.split() ++ cflags = '-Wall -fpie'.split() + cppflags = [] + libs: List[str] = [] + if args.profile or args.sanitize: +@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's + cflags.append('-g') + if args.profile: + libs.append('-lprofiler') +- else: +- cflags.append('-O3') + if bundle_type.endswith('-freeze'): + cppflags.append('-DFOR_BUNDLE') + cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index caaf77a28e9..6aefe3154d4 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -56,7 +56,7 @@ BDEPEND="virtual/pkgconfig" $(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')" PATCHES=( - "${FILESDIR}"/kitty-0.17.2-flags.patch + "${FILESDIR}"/${P}-flags.patch "${FILESDIR}"/${P}-remove-terminfo.patch "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch )