Gentoo Archives: gentoo-commits

From: gerion <gerion.entrup@×××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/gerislay:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
Date: Fri, 14 Sep 2018 08:27:25
Message-Id: 1536913631.ab65d5915ba621bd9d10e7d0578a24361ee75a1d.gerion@gentoo
1 commit: ab65d5915ba621bd9d10e7d0578a24361ee75a1d
2 Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
3 AuthorDate: Fri Sep 14 08:27:11 2018 +0000
4 Commit: gerion <gerion.entrup <AT> flump <DOT> de>
5 CommitDate: Fri Sep 14 08:27:11 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=ab65d591
7
8 x11-terms/kitty: add version 0.12.1
9
10 x11-terms/kitty/Manifest | 5 ++
11 x11-terms/kitty/files/kitty-0.11.0-flags.patch | 47 +++++++++++
12 x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch | 16 ++++
13 x11-terms/kitty/kitty-0.12.1.ebuild | 96 +++++++++++++++++++++++
14 x11-terms/kitty/metadata.xml | 14 ++++
15 5 files changed, 178 insertions(+)
16
17 diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
18 new file mode 100644
19 index 0000000..3ad4a93
20 --- /dev/null
21 +++ b/x11-terms/kitty/Manifest
22 @@ -0,0 +1,5 @@
23 +AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5
24 +AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
25 +DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
26 +EBUILD kitty-0.12.1.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
27 +MISC metadata.xml 433 BLAKE2B a8f42e543f670090dab29943b39d87b2d6cd6ee17672c3255cdf0e5383efeca03b662d0e92b959bd49c09183d4da9836dc0fe32758f105aa406c3573d6f55ef8 SHA512 13d61d42ab56643456c51285f447a39fcba9224a36a310df4e7631c5d6751f146e4f7b2ebd04bf64c83d0f124eb15abb28c8ce37861597ab4f18297c4a52732c
28
29 diff --git a/x11-terms/kitty/files/kitty-0.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
30 new file mode 100644
31 index 0000000..44abfb6
32 --- /dev/null
33 +++ b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
34 @@ -0,0 +1,47 @@
35 +--- kitty-0.11.0/setup.py
36 ++++ kitty-0.11.0/setup.py
37 +@@ -177,7 +177,7 @@
38 + df = '-g3'
39 + if ccver >= (5, 0):
40 + df += ' -Og'
41 +- optimize = df if debug or sanitize else '-O3'
42 ++ optimize = ''
43 + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
44 + cppflags = os.environ.get(
45 + 'OVERRIDE_CPPFLAGS', (
46 +@@ -190,7 +190,7 @@
47 + cflags = os.environ.get(
48 + 'OVERRIDE_CFLAGS', (
49 + '-Wextra -Wno-missing-field-initializers -Wall -std=c99'
50 +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
51 ++ ' -pedantic {} {} -fwrapv {} {} {} -fvisibility=hidden'
52 + ).format(
53 + optimize,
54 + ' '.join(sanitize_args),
55 +@@ -204,7 +204,7 @@
56 + )
57 + ldflags = os.environ.get(
58 + 'OVERRIDE_LDFLAGS',
59 +- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
60 ++ '-Wall ' + ' '.join(sanitize_args)
61 + )
62 + ldflags = shlex.split(ldflags)
63 + ldflags.append('-shared')
64 +@@ -505,14 +505,14 @@
65 +
66 +
67 + def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
68 +- cflags = '-Wall -Werror -fpie'.split()
69 ++ cflags = '-Wall -fpie'.split()
70 + cppflags = []
71 + libs = []
72 + if args.profile:
73 + cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
74 + libs.append('-lprofiler')
75 +- else:
76 +- cflags.append('-O3')
77 ++ #else:
78 ++ # cflags.append('-O3')
79 + if for_bundle or for_freeze:
80 + cppflags.append('-DFOR_BUNDLE')
81 + cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
82
83 diff --git a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
84 new file mode 100644
85 index 0000000..97e45c6
86 --- /dev/null
87 +++ b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
88 @@ -0,0 +1,16 @@
89 +Use SVG icon instead of PNG.
90 +
91 +--- kitty-0.11.0/setup.py
92 ++++ kitty-0.11.0/setup.py
93 +@@ -605,9 +605,9 @@
94 + if not is_macos: # {{{ linux desktop gunk
95 + copy_man_pages(ddir)
96 + copy_html_docs(ddir)
97 +- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
98 ++ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
99 + safe_makedirs(icdir)
100 +- shutil.copy2('logo/kitty.png', icdir)
101 ++ shutil.copy2('logo/kitty.svg', icdir)
102 + deskdir = os.path.join(ddir, 'share', 'applications')
103 + safe_makedirs(deskdir)
104 + with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
105
106 diff --git a/x11-terms/kitty/kitty-0.12.1.ebuild b/x11-terms/kitty/kitty-0.12.1.ebuild
107 new file mode 100644
108 index 0000000..8bef706
109 --- /dev/null
110 +++ b/x11-terms/kitty/kitty-0.12.1.ebuild
111 @@ -0,0 +1,96 @@
112 +# Copyright 1999-2018 Gentoo Foundation
113 +# Distributed under the terms of the GNU General Public License v2
114 +
115 +EAPI=6
116 +PYTHON_COMPAT=( python3_6 )
117 +
118 +inherit python-single-r1 toolchain-funcs gnome2-utils
119 +
120 +if [[ ${PV} == "9999" ]] ; then
121 + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
122 + inherit git-r3
123 +else
124 + SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
125 + KEYWORDS="~amd64 ~x86"
126 +fi
127 +
128 +DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
129 +HOMEPAGE="https://github.com/kovidgoyal/kitty"
130 +
131 +LICENSE="GPL-3"
132 +SLOT="0"
133 +IUSE="debug imagemagick wayland"
134 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
135 +
136 +COMMON_DEPS="
137 + ${PYTHON_DEPS}
138 + >=media-libs/harfbuzz-1.5.0:=
139 + sys-libs/zlib
140 + media-libs/libpng:0=
141 + media-libs/freetype:2
142 + media-libs/fontconfig
143 + x11-libs/libXcursor
144 + x11-libs/libXrandr
145 + x11-libs/libXi
146 + x11-libs/libXinerama
147 + x11-libs/libxkbcommon[X]
148 + wayland? (
149 + dev-libs/wayland
150 + >=dev-libs/wayland-protocols-1.12
151 + )
152 +"
153 +RDEPEND="
154 + ${COMMON_DEPS}
155 + imagemagick? ( virtual/imagemagick-tools )
156 +"
157 +DEPEND="${RDEPEND}
158 + virtual/pkgconfig
159 + >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
160 +"
161 +
162 +PATCHES=(
163 + "${FILESDIR}"/${PN}-0.11.0-flags.patch
164 + "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
165 +)
166 +
167 +src_prepare() {
168 + default
169 +
170 + # disable wayland as required
171 + if ! use wayland; then
172 + sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
173 + fi
174 +
175 + # respect doc dir
176 + sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
177 +
178 + tc-export CC
179 +}
180 +
181 +doecho() {
182 + echo "$@"
183 + "$@" || die
184 +}
185 +
186 +src_compile() {
187 + doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
188 +}
189 +
190 +src_test() {
191 + export KITTY_CONFIG_DIRECTORY=${T}
192 + "${EPYTHON}" test.py || die
193 +}
194 +
195 +src_install() {
196 + mkdir -p "${ED}"usr || die
197 + cp -r linux-package/* "${ED}usr" || die
198 + python_fix_shebang "${ED}"
199 +}
200 +
201 +pkg_postinst() {
202 + gnome2_icon_cache_update
203 +}
204 +
205 +pkg_postrm() {
206 + gnome2_icon_cache_update
207 +}
208
209 diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
210 new file mode 100644
211 index 0000000..5954dd0
212 --- /dev/null
213 +++ b/x11-terms/kitty/metadata.xml
214 @@ -0,0 +1,14 @@
215 +<?xml version='1.0' encoding='UTF-8'?>
216 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
217 +<pkgmetadata>
218 + <maintainer type="person">
219 + <email>gerion.entrup@×××××.de</email>
220 + <name>Gerion Entrup</name>
221 + </maintainer>
222 + <use>
223 + <flag name="imagemagick">Support displaying images in the terminal with icat</flag>
224 + </use>
225 + <upstream>
226 + <remote-id type="github">kovidgoyal/kitty</remote-id>
227 + </upstream>
228 +</pkgmetadata>