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 2FCA2138334 for ; Tue, 16 Jul 2019 23:17:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 426D0E076B; Tue, 16 Jul 2019 23:17:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 11B99E076B for ; Tue, 16 Jul 2019 23:17:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C01A5347C39 for ; Tue, 16 Jul 2019 23:17:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2A695F1 for ; Tue, 16 Jul 2019 23:17:02 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1563319019.59635ed1891743343e8a1750f024a1ccc0153c23.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/files/kitty-9999-flags.patch x11-terms/kitty/files/kitty-9999-svg-icon.patch x11-terms/kitty/kitty-9999.ebuild X-VCS-Directories: x11-terms/kitty/ x11-terms/kitty/files/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 59635ed1891743343e8a1750f024a1ccc0153c23 X-VCS-Branch: master Date: Tue, 16 Jul 2019 23:17:02 +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: cb66f7ca-d6f1-491f-bd15-90e828d83c5d X-Archives-Hash: 1a7f34b75e53fb3720190a54a2487a15 commit: 59635ed1891743343e8a1750f024a1ccc0153c23 Author: Matthew Thode gentoo org> AuthorDate: Tue Jul 16 23:16:36 2019 +0000 Commit: Matthew Thode gentoo org> CommitDate: Tue Jul 16 23:16:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59635ed1 x11-terms/kitty: fix git master builds (patch fails) Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Matthew Thode gentoo.org> x11-terms/kitty/files/kitty-9999-flags.patch | 32 ++++++++++++++----------- x11-terms/kitty/files/kitty-9999-svg-icon.patch | 14 +++++++++++ x11-terms/kitty/kitty-9999.ebuild | 2 +- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch index fe54a959cb7..f7efa3b305b 100644 --- a/x11-terms/kitty/files/kitty-9999-flags.patch +++ b/x11-terms/kitty/files/kitty-9999-flags.patch @@ -1,6 +1,6 @@ ---- kitty-0.13.2/setup.py -+++ kitty-0.13.2/setup.py -@@ -178,7 +178,7 @@ +--- setup.py.orig 2019-07-16 18:04:24.052780940 -0500 ++++ setup.py 2019-07-16 18:05:54.564383192 -0500 +@@ -202,7 +202,7 @@ df = '-g3' if ccver >= (5, 0): df += ' -Og' @@ -8,8 +8,8 @@ + optimize = '' sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() cppflags = os.environ.get( - 'OVERRIDE_CPPFLAGS', ( -@@ -191,7 +191,7 @@ + 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), +@@ -213,7 +213,7 @@ cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' @@ -18,7 +18,7 @@ ).format( optimize, ' '.join(sanitize_args), -@@ -205,7 +205,7 @@ +@@ -227,7 +227,7 @@ ) ldflags = os.environ.get( 'OVERRIDE_LDFLAGS', @@ -27,21 +27,25 @@ ) ldflags = shlex.split(ldflags) ldflags.append('-shared') -@@ -517,14 +517,14 @@ +@@ -606,20 +606,17 @@ - def build_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False): + def build_launcher(args, launcher_dir='.', bundle_type='source'): - cflags = '-Wall -Werror -fpie'.split() + cflags = '-Wall -fpie'.split() cppflags = [] libs = [] - if args.profile: - cppflags.append('-DWITH_PROFILER'), cflags.append('-g') - libs.append('-lprofiler') + if args.profile or args.sanitize: + if args.sanitize: +- cflags.append('-g3') + cflags.extend(get_sanitize_args(env.cc, env.ccver)) + libs += ['-lasan'] if env.cc == 'gcc' and not is_macos else [] + else: + cflags.append('-g') + if args.profile: + libs.append('-lprofiler') - else: - cflags.append('-O3') -+ #else: -+ # cflags.append('-O3') - if for_bundle or for_freeze: + if bundle_type.endswith('-freeze'): cppflags.append('-DFOR_BUNDLE') cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/files/kitty-9999-svg-icon.patch b/x11-terms/kitty/files/kitty-9999-svg-icon.patch new file mode 100644 index 00000000000..ff9e00eb67c --- /dev/null +++ b/x11-terms/kitty/files/kitty-9999-svg-icon.patch @@ -0,0 +1,14 @@ +--- kitty-9999/setup.py.orig 2019-07-16 18:13:07.072868752 -0500 ++++ kitty-9999/setup.py 2019-07-16 18:13:40.082039929 -0500 +@@ -705,9 +705,9 @@ + run_tool(['make', 'docs']) + copy_man_pages(ddir) + copy_html_docs(ddir) +- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps') ++ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps') + safe_makedirs(icdir) +- shutil.copy2('logo/kitty.png', icdir) ++ shutil.copy2('logo/kitty.svg', icdir) + deskdir = os.path.join(ddir, 'share', 'applications') + safe_makedirs(deskdir) + with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f: diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index b56c1d4487f..f9a458abd9a 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -54,7 +54,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch + "${FILESDIR}"/${P}-svg-icon.patch ) src_prepare() {