From: "Tim Harder" <radhermit@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
Date: Sat, 31 Aug 2019 10:28:10 +0000 (UTC) [thread overview]
Message-ID: <1567247150.335fef7ad22c1c25809e9df53e6f448811edd894.radhermit@gentoo> (raw)
commit: 335fef7ad22c1c25809e9df53e6f448811edd894
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 10:22:00 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 10:25:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335fef7a
x11-terms/kitty: version bump to 0.14.4
Closes: https://bugs.gentoo.org/691880
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.14.4-flags.patch | 49 ++++++++++++++++++++++
x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch | 16 +++++++
.../{kitty-9999.ebuild => kitty-0.14.4.ebuild} | 5 ++-
x11-terms/kitty/kitty-9999.ebuild | 1 +
5 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 3e46ccfee19..ed11875f60b 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,3 @@
DIST kitty-0.13.3.tar.xz 2846220 BLAKE2B cb2da9e64696298471001f28bc5cc568a6ec21331153929fa86b8bc7262b5928430fc053f86b7ef669eafde676439f6ee644f14cd942e2f11fba7b7dadfcb294 SHA512 9ce803469057245f9e1c50b53e03d48d3f2483b01f9441be6eadbfea8edcba01652177cbff11d1dd2b35e9415db6822fd72a0494f00ee3be30f58c1f1991c37b
DIST kitty-0.14.2.tar.xz 2867116 BLAKE2B 20f3d66caa5242502f2699d4a5e8364eda357b00c72d50650ab0d03fbbb552152a2d4447e37ce20660d6d8f9ffc285aee057f6adf7a03ac57fa8ab6d1da61013 SHA512 191a37424c51776d271008c6b4b0cb43b60cd2abea3ea7b2a08cca9a8d44c4932ca11470f3efb8debc0e2ef3641bb68c05374401073b23cf81042af467b1dbf4
+DIST kitty-0.14.4.tar.xz 2946268 BLAKE2B e06cdb1081d821bd65190ec7526482f7471f7a04c8a559e48465b602559079c10d220024ac521d2fce34e0eb90af7bee01d1da408082bfa724ac61e59709a860 SHA512 1550883232bff21217fc0d294598d6d828e67a944fc69b324079e87bf2505344c58ade75cec8bff1dca7821c4f490c066f2645281cee0e71792d317ef7df3779
diff --git a/x11-terms/kitty/files/kitty-0.14.4-flags.patch b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
new file mode 100644
index 00000000000..5bf301efd5a
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
@@ -0,0 +1,49 @@
+Respect user CFLAGS.
+
+--- kitty-0.14.4/setup.py
++++ kitty-0.14.4/setup.py
+@@ -202,7 +202,7 @@
+ df = '-g3'
+ if ccver >= (5, 0):
+ df += ' -Og'
+- 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'),
+@@ -213,7 +213,7 @@
+ cflags = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
+ ).format(
+ optimize,
+ ' '.join(sanitize_args),
+@@ -227,7 +227,7 @@
+ )
+ 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')
+@@ -608,7 +608,7 @@
+
+
+ def build_launcher(args, launcher_dir='.', bundle_type='source'):
+- cflags = '-Wall -Werror -fpie'.split()
++ cflags = '-Wall -fpie'.split()
+ cppflags = []
+ libs = []
+ if args.profile or args.sanitize:
+@@ -620,8 +620,6 @@
+ 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/files/kitty-0.14.4-svg-icon.patch b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
new file mode 100644
index 00000000000..13f874dd3c1
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
@@ -0,0 +1,16 @@
+Use SVG icon instead of PNG.
+
+--- kitty-0.14.4/setup.py
++++ kitty-0.14.4/setup.py
+@@ -710,9 +710,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-0.14.4.ebuild
similarity index 94%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.14.4.ebuild
index 623cddae6fb..85c9ba13dfc 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.14.4.ebuild
@@ -27,6 +27,7 @@ COMMON_DEPS="
>=media-libs/harfbuzz-1.5.0:=
sys-apps/dbus
sys-libs/zlib
+ media-libs/libcanberra
media-libs/libpng:0=
media-libs/freetype:2
media-libs/fontconfig
@@ -53,8 +54,8 @@ DEPEND="${RDEPEND}
[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
PATCHES=(
- "${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.14.4-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
src_prepare() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 623cddae6fb..c51e3ffd52d 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -27,6 +27,7 @@ COMMON_DEPS="
>=media-libs/harfbuzz-1.5.0:=
sys-apps/dbus
sys-libs/zlib
+ media-libs/libcanberra
media-libs/libpng:0=
media-libs/freetype:2
media-libs/fontconfig
next reply other threads:[~2019-08-31 10:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-31 10:28 Tim Harder [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-05 15:23 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/ Ionen Wolkens
2023-08-11 4:59 Ionen Wolkens
2021-11-03 6:41 Ionen Wolkens
2021-11-03 6:41 Ionen Wolkens
2021-10-17 20:39 John Helmert III
2021-06-11 7:21 Joonas Niilola
2021-02-02 13:08 Joonas Niilola
2020-05-01 15:09 Joonas Niilola
2020-04-04 7:39 Joonas Niilola
2020-01-09 6:01 Joonas Niilola
2019-12-03 13:13 Joonas Niilola
2019-11-12 4:00 Tim Harder
2019-08-31 10:28 Tim Harder
2019-07-16 23:17 Matthew Thode
2019-06-15 21:27 Tim Harder
2018-06-17 9:18 Tim Harder
2018-06-05 4:34 Tim Harder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1567247150.335fef7ad22c1c25809e9df53e6f448811edd894.radhermit@gentoo \
--to=radhermit@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox