summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2018-04-15 20:28:21 -0400
committerTim Harder <radhermit@gentoo.org>2018-05-07 01:49:40 -0400
commit5031b0bd347845fbeb2babc8b35e0359ccce0729 (patch)
treeb7a611aecc0f0f0d48d01daaa85cad9ee9c2ccdb /x11-terms
parentdev-ruby/rest-client: fix building without FEATURES=test (diff)
downloadgentoo-5031b0bd347845fbeb2babc8b35e0359ccce0729.tar.gz
gentoo-5031b0bd347845fbeb2babc8b35e0359ccce0729.tar.bz2
gentoo-5031b0bd347845fbeb2babc8b35e0359ccce0729.zip
x11-terms/kitty: version bump to 0.9.1
Closes: https://bugs.gentoo.org/655076
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/kitty/Manifest1
-rw-r--r--x11-terms/kitty/files/kitty-0.9.1-flags.patch47
-rw-r--r--x11-terms/kitty/kitty-0.9.1.ebuild94
-rw-r--r--x11-terms/kitty/kitty-9999.ebuild12
4 files changed, 152 insertions, 2 deletions
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 5cf9235f567..aa4913e108b 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,4 @@
DIST kitty-0.8.2.tar.gz 3281308 BLAKE2B 6219dddc02e8b98b913356708fd2e398ad17aea97b0c539132b2333a736324d76136a6b6599b925424a8e7c578e9ef92b38ef5aa8ea5b42788731ecf19ad5e27 SHA512 4dabbce40a5fe0e54ac64b429baf3491ab492846f0f31b4b763c06c7aeba80a482bfd083419d3ddcd1bc267553458b719df82a2a179d90a88be3ce41a47d9897
DIST kitty-0.8.3.tar.gz 3285120 BLAKE2B dcf47345f26beaaae5a63f122a3592c29a8ef2243406377ebb46fd44b9d8036f2f5493d7b1048195e12a7fb9874fce920ac52a0bb18e071e5e3db869691174d9 SHA512 b758a178b976d7dc133dd48bfafff5db8a373419a67206a8724695392c0654a9d5ba07867cbd6824afe1a5c013724d8472ab4087eae52c8bdb27843688b18968
DIST kitty-0.8.4.tar.gz 3285125 BLAKE2B ad0e1b94caab2b572baabf8340dad703cf6e572494b938fd6941d053deaee9d628d652af9c542efee6ecc2fe71fd7c534595449cb25e50438276d4d0361a61d9 SHA512 1ed5b909f66abd113d643420fadf4034fe0af5b649c957590f0698c541e26d0d061a5d703b8e6220f4be826b2b9914ecb3559fc644eb41cb7cd4b9465030cd93
+DIST kitty-0.9.1.tar.gz 3698447 BLAKE2B f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15 SHA512 3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329
diff --git a/x11-terms/kitty/files/kitty-0.9.1-flags.patch b/x11-terms/kitty/files/kitty-0.9.1-flags.patch
new file mode 100644
index 00000000000..9c544610b6b
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.9.1-flags.patch
@@ -0,0 +1,47 @@
+--- kitty-0.9.1/setup.py
++++ kitty-0.9.1/setup.py
+@@ -178,7 +178,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', (
+@@ -191,7 +191,7 @@
+ cflags = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra -Wno-missing-field-initializers -Wall -std=c99'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' -pedantic {} {} -fwrapv {} {} {} -fvisibility=hidden'
+ ).format(
+ optimize,
+ ' '.join(sanitize_args),
+@@ -205,7 +205,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')
+@@ -508,14 +508,14 @@
+
+
+ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False):
+- cflags = '-Wall -Werror -fpie'.split()
++ cflags = '-Wall -fpie'.split()
+ cppflags = []
+ libs = []
+ if args.profile:
+ cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
+ libs.append('-lprofiler')
+- else:
+- cflags.append('-O3')
++ # else:
++ # cflags.append('-O3')
+ if for_bundle:
+ cppflags.append('-DFOR_BUNDLE')
+ cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/kitty-0.9.1.ebuild b/x11-terms/kitty/kitty-0.9.1.ebuild
new file mode 100644
index 00000000000..a458d0c6738
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.9.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit python-single-r1 toolchain-funcs gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+ ${PYTHON_DEPS}
+ >=media-libs/harfbuzz-1.5.0:=
+ sys-libs/zlib
+ media-libs/libpng:0=
+ media-libs/freetype:2
+ media-libs/fontconfig
+ x11-libs/libXcursor
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libxkbcommon[X]
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.12
+ )
+"
+RDEPEND="
+ ${COMMON_DEPS}
+ imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.1-flags.patch
+ "${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+)
+
+src_prepare() {
+ default
+
+ # disable wayland as required
+ if ! use wayland; then
+ sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+ fi
+
+ tc-export CC
+}
+
+doecho() {
+ echo "$@"
+ "$@" || die
+}
+
+src_compile() {
+ doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
+}
+
+src_test() {
+ export KITTY_CONFIG_DIRECTORY=${T}
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ mkdir -p "${ED}"usr || die
+ cp -r linux-package/* "${ED}usr" || die
+ python_fix_shebang "${ED}"
+
+ dodoc CHANGELOG.rst *.asciidoc
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index b51c9110b0e..a458d0c6738 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python3_{5,6} )
-inherit python-single-r1 toolchain-funcs
+inherit python-single-r1 toolchain-funcs gnome2-utils
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.7.1-flags.patch
+ "${FILESDIR}"/${PN}-0.9.1-flags.patch
"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
)
@@ -84,3 +84,11 @@ src_install() {
dodoc CHANGELOG.rst *.asciidoc
}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}