* [gentoo-commits] repo/user/gerislay:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2018-09-14 8:27 gerion
0 siblings, 0 replies; 2+ messages in thread
From: gerion @ 2018-09-14 8:27 UTC (permalink / raw
To: gentoo-commits
commit: ab65d5915ba621bd9d10e7d0578a24361ee75a1d
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Fri Sep 14 08:27:11 2018 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Fri Sep 14 08:27:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=ab65d591
x11-terms/kitty: add version 0.12.1
x11-terms/kitty/Manifest | 5 ++
x11-terms/kitty/files/kitty-0.11.0-flags.patch | 47 +++++++++++
x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch | 16 ++++
x11-terms/kitty/kitty-0.12.1.ebuild | 96 +++++++++++++++++++++++
x11-terms/kitty/metadata.xml | 14 ++++
5 files changed, 178 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
new file mode 100644
index 0000000..3ad4a93
--- /dev/null
+++ b/x11-terms/kitty/Manifest
@@ -0,0 +1,5 @@
+AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5
+AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
+DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
+EBUILD kitty-0.12.1.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
+MISC metadata.xml 433 BLAKE2B a8f42e543f670090dab29943b39d87b2d6cd6ee17672c3255cdf0e5383efeca03b662d0e92b959bd49c09183d4da9836dc0fe32758f105aa406c3573d6f55ef8 SHA512 13d61d42ab56643456c51285f447a39fcba9224a36a310df4e7631c5d6751f146e4f7b2ebd04bf64c83d0f124eb15abb28c8ce37861597ab4f18297c4a52732c
diff --git a/x11-terms/kitty/files/kitty-0.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
new file mode 100644
index 0000000..44abfb6
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
@@ -0,0 +1,47 @@
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -177,7 +177,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', (
+@@ -190,7 +190,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),
+@@ -204,7 +204,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')
+@@ -505,14 +505,14 @@
+
+
+ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=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 or for_freeze:
+ cppflags.append('-DFOR_BUNDLE')
+ cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
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
new file mode 100644
index 0000000..97e45c6
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
@@ -0,0 +1,16 @@
+Use SVG icon instead of PNG.
+
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -605,9 +605,9 @@
+ if not is_macos: # {{{ linux desktop gunk
+ 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-0.12.1.ebuild b/x11-terms/kitty/kitty-0.12.1.ebuild
new file mode 100644
index 0000000..8bef706
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.12.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_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
+ >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.11.0-flags.patch
+ "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
+)
+
+src_prepare() {
+ default
+
+ # disable wayland as required
+ if ! use wayland; then
+ sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+ fi
+
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
+ 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}"
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
new file mode 100644
index 0000000..5954dd0
--- /dev/null
+++ b/x11-terms/kitty/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gerion.entrup@flump.de</email>
+ <name>Gerion Entrup</name>
+ </maintainer>
+ <use>
+ <flag name="imagemagick">Support displaying images in the terminal with icat</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">kovidgoyal/kitty</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/user/gerislay:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2018-12-10 9:13 gerion
0 siblings, 0 replies; 2+ messages in thread
From: gerion @ 2018-12-10 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 91c367feb107824b1c3bdc7412c6fe836e146597
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Mon Dec 10 09:12:04 2018 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Mon Dec 10 09:13:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=91c367fe
drop x11-terms/kitty: is in tree
Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>
x11-terms/kitty/Manifest | 5 --
x11-terms/kitty/files/kitty-0.11.0-flags.patch | 47 -----------
x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch | 16 ----
x11-terms/kitty/kitty-0.12.1.ebuild | 96 -----------------------
x11-terms/kitty/metadata.xml | 14 ----
5 files changed, 178 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
deleted file mode 100644
index 3ad4a93..0000000
--- a/x11-terms/kitty/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5
-AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
-DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
-EBUILD kitty-0.12.1.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
-MISC metadata.xml 433 BLAKE2B a8f42e543f670090dab29943b39d87b2d6cd6ee17672c3255cdf0e5383efeca03b662d0e92b959bd49c09183d4da9836dc0fe32758f105aa406c3573d6f55ef8 SHA512 13d61d42ab56643456c51285f447a39fcba9224a36a310df4e7631c5d6751f146e4f7b2ebd04bf64c83d0f124eb15abb28c8ce37861597ab4f18297c4a52732c
diff --git a/x11-terms/kitty/files/kitty-0.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
deleted file mode 100644
index 44abfb6..0000000
--- a/x11-terms/kitty/files/kitty-0.11.0-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- kitty-0.11.0/setup.py
-+++ kitty-0.11.0/setup.py
-@@ -177,7 +177,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', (
-@@ -190,7 +190,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),
-@@ -204,7 +204,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')
-@@ -505,14 +505,14 @@
-
-
- def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=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 or for_freeze:
- cppflags.append('-DFOR_BUNDLE')
- cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
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
deleted file mode 100644
index 97e45c6..0000000
--- a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Use SVG icon instead of PNG.
-
---- kitty-0.11.0/setup.py
-+++ kitty-0.11.0/setup.py
-@@ -605,9 +605,9 @@
- if not is_macos: # {{{ linux desktop gunk
- 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-0.12.1.ebuild b/x11-terms/kitty/kitty-0.12.1.ebuild
deleted file mode 100644
index 8bef706..0000000
--- a/x11-terms/kitty/kitty-0.12.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_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
- >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-flags.patch
- "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
-)
-
-src_prepare() {
- default
-
- # disable wayland as required
- if ! use wayland; then
- sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
- fi
-
- # respect doc dir
- sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
- 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}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
deleted file mode 100644
index 5954dd0..0000000
--- a/x11-terms/kitty/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>gerion.entrup@flump.de</email>
- <name>Gerion Entrup</name>
- </maintainer>
- <use>
- <flag name="imagemagick">Support displaying images in the terminal with icat</flag>
- </use>
- <upstream>
- <remote-id type="github">kovidgoyal/kitty</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-10 9:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-14 8:27 [gentoo-commits] repo/user/gerislay:master commit in: x11-terms/kitty/files/, x11-terms/kitty/ gerion
-- strict thread matches above, loose matches on Subject: below --
2018-12-10 9:13 gerion
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox