* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2020-10-17 14:04 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2020-10-17 14:04 UTC (permalink / raw
To: gentoo-commits
commit: bd64e0c05ca2a06a1fdb61faa019d1be8970eae5
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Wed Oct 14 19:08:36 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 14:04:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd64e0c0
x11-terms/kitty: bump to 0.19.1 and fix tests
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://bugs.gentoo.org/747004
Closes: https://bugs.gentoo.org/743076
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.19.1-tests.patch | 11 +++
x11-terms/kitty/kitty-0.19.1.ebuild | 105 +++++++++++++++++++++++++
3 files changed, 117 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 4fc88074c08..f0519148934 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,3 +4,4 @@ DIST kitty-0.17.4.tar.xz 3068456 BLAKE2B 7c3be1bd9e1be814ca2c98ac8bed5c8ac906021
DIST kitty-0.18.1.tar.xz 3098940 BLAKE2B c54f9e7996e8e17182d5cdb3f915964b2626985992dc9f8bf2f11d086475fd7b13ee131aaf942f521cd6356ac13f7efdf436253237022532ffc68cb7923bc645 SHA512 d1870fa8c1c42c9a20251ba7819fb649760a98070653cff6bbc0ef86160d6b20070bbfe4e549b80d75d7a78b37cb3c1153e4be246709cf630129cd4d09a76604
DIST kitty-0.18.2.tar.xz 3100228 BLAKE2B ac7c1c6dc9ced4f8ca59c9a9a9ff2d0c6410bbed64efc8528a899b5b55ad008e65bed6ef1b1fdb74da6b4df2ccef63e1d64ffc375ad225243999bcbb2c1378ec SHA512 12b17f241884347e841b597cc86ac7dec9f509350af33de4e790f586b1cb8a5b89222f25f710f1f5ab82ea09cb1c7b0fa9ffee869cbae497e2a2ab0c6ef1b5a0
DIST kitty-0.18.3.tar.xz 3107268 BLAKE2B 5a81552d59f5232253c0c23a9a4eb88950a5d6e9c3ca69412ca7d56d521cb69f424461df2718774489de42c78de8253d2336e4bf7f352b488364fe30f418b0c4 SHA512 77636c4d1c21157e86cae3a88bca8b161207c1f1112ce60d11d04e79cf6e8ed331085f99e0caa20b7b4f297d8bf193aeb7afa8679c871085cc9d328ed8da3ad7
+DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
diff --git a/x11-terms/kitty/files/kitty-0.19.1-tests.patch b/x11-terms/kitty/files/kitty-0.19.1-tests.patch
new file mode 100644
index 00000000000..ee489b0dce3
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.19.1-tests.patch
@@ -0,0 +1,11 @@
+--- a/kitty/constants.py
++++ b/kitty/constants.py
+@@ -64,7 +64,7 @@
+ def kitty_exe() -> str:
+ rpath = sys._xoptions.get('bundle_exe_dir')
+ if not rpath:
+- items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(base, 'launcher')]
++ items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(base, '../linux-package/bin')]
+ seen: Set[str] = set()
+ for candidate in filter(None, items):
+ if candidate not in seen:
diff --git a/x11-terms/kitty/kitty-0.19.1.ebuild b/x11-terms/kitty/kitty-0.19.1.ebuild
new file mode 100644
index 00000000000..f8561302ddf
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.19.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit optfeature python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+ 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 wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-1.5.0:=
+ media-libs/libcanberra
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ x11-libs/libxcb[xkb]
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libxkbcommon[X]
+ x11-libs/libXrandr
+ x11-terms/kitty-terminfo
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.17
+ )
+ $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+"
+
+DEPEND="${RDEPEND}
+ media-libs/mesa[X]
+ sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.17.2-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
+ "${FILESDIR}"/${PN}-0.19.1-tests.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 || die
+
+ tc-export CC
+}
+
+src_compile() {
+ "${EPYTHON}" setup.py \
+ --verbose $(usex debug --debug "") \
+ --libdir-name $(get_libdir) \
+ linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+ export KITTY_CONFIG_DIRECTORY=${T}
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2024-03-16 7:25 Ionen Wolkens
0 siblings, 0 replies; 21+ messages in thread
From: Ionen Wolkens @ 2024-03-16 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 5b7011824d4afdc77c1cd28a2d46445208c77145
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 07:21:51 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 07:25:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b701182
x11-terms/kitty: backport fix for non-x86/amd64/arm64
Only tested on amd64 by forcing CPPFLAGS=-DKITTY_NO_SIMD which
fails like it would on any arches where simde is not used.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kitty/files/kitty-0.33.0-no-simd.patch | 12 ++++++++++++
x11-terms/kitty/kitty-0.33.0.ebuild | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/x11-terms/kitty/files/kitty-0.33.0-no-simd.patch b/x11-terms/kitty/files/kitty-0.33.0-no-simd.patch
new file mode 100644
index 000000000000..c1366c0ce73c
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.33.0-no-simd.patch
@@ -0,0 +1,12 @@
+Backport of fix for -DKITTY_NO_SIMD (aka for non-x86/amd64/arm64)
+https://github.com/kovidgoyal/kitty/issues/7225
+https://github.com/kovidgoyal/kitty/commit/393169f79daf60c038b3e11e657fa5f3ee41c24c
+--- a/kitty/simd-string-impl.h
++++ b/kitty/simd-string-impl.h
+@@ -21,5 +21,5 @@
+ bool FUNC(utf8_decode_to_esc)(UTF8Decoder *d UNUSED, const uint8_t *src UNUSED, size_t src_sz UNUSED) NOSIMD
+ const uint8_t* FUNC(find_either_of_two_bytes)(const uint8_t *haystack UNUSED, const size_t sz UNUSED, const uint8_t a UNUSED, const uint8_t b UNUSED) NOSIMD
+-void FUNC(xor_data64)(const uint8_t key[64], uint8_t* data, const size_t data_sz);
++void FUNC(xor_data64)(const uint8_t key[64] UNUSED, uint8_t* data UNUSED, const size_t data_sz UNUSED) NOSIMD
+ #undef NOSIMD
+ #else
diff --git a/x11-terms/kitty/kitty-0.33.0.ebuild b/x11-terms/kitty/kitty-0.33.0.ebuild
index 19f68cbfc354..0b8a2e645268 100644
--- a/x11-terms/kitty/kitty-0.33.0.ebuild
+++ b/x11-terms/kitty/kitty-0.33.0.ebuild
@@ -84,6 +84,10 @@ BDEPEND="
QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
+PATCHES=(
+ "${FILESDIR}"/${P}-no-simd.patch
+)
+
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2023-12-12 21:25 Ionen Wolkens
0 siblings, 0 replies; 21+ messages in thread
From: Ionen Wolkens @ 2023-12-12 21:25 UTC (permalink / raw
To: gentoo-commits
commit: f30f5e08aba835394aedf62f73adf3c0e54c0c1c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 15:44:10 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 21:23:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30f5e08
x11-terms/kitty: drop 0.30.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kitty/Manifest | 3 -
x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch | 21 ---
x11-terms/kitty/kitty-0.30.1.ebuild | 174 -----------------------
3 files changed, 198 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f440c1c61ab5..b0b5772c379a 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,6 +1,3 @@
-DIST kitty-0.30.1-vendor.tar.xz 1425096 BLAKE2B dcf65787badf2439b5e7dc9ff1fb2073d0d8b124a7c39e017aee70a9c5c8f9b5f75b9c7942748cdd7327c75e506d667736eb13d91d8c42f46dfff12ffb9ae4d9 SHA512 4cabb39c82b4dfde96390bfd739d24af3abc6a48f2f6013fb51a1d95d31b04c545f8dbf0d3fc89bcb692c26955bdefe196e95d41eed7222eb815b3f05688a362
-DIST kitty-0.30.1.tar.xz 7799076 BLAKE2B 99ada03fa957819e716d3225fbee20af62135ff8861d3a6ce8aaf442b4526a69f34dae0ec126db48a4336fcbd2dfde5583e2ff8f16140e938fada6c0a8854a60 SHA512 e5fd68b8acf3eae8f53a2c27101d998eb0d8eff1571de1b03ab431bceafcab0efae821590684ec48b5ed6e3d86fb984d9e04784022ba50c0378d37a68598f9ed
-DIST kitty-0.30.1.tar.xz.sig 566 BLAKE2B 18ad4df3ef3e161d8382f635f371b0100ff812d3eb2d5d1a2af1df2e04d1c15a344e4dd86d6a8faaf663a6a9d579521cdacdf6c5b1852d2120d94c43cd765826 SHA512 8c90733cb1683f6cb7c57fcf1efdbd0a99b16c4e1edca9b7e99820e5108694fcee521fecd7adaecc331a744b04d2041594adbf058d6218cd82099550f04b961e
DIST kitty-0.31.0-vendor.tar.xz 1397172 BLAKE2B 0c3bf3cece86cec651ec6dd4a97923464636885e5c9ef44b0e094d34ea66ca1b8176cc7d2647eda0030f857faf5e87e506ec9af6465487ef9a61efd634492d86 SHA512 41699cbd112f429d78dbf5b7716b3b017d5decd3649a13913e273a5b1ab6177ab7d93c5d2e3cb9b927846f41ada91f8cf95e7148e52d6a3bf914e7b116b7b072
DIST kitty-0.31.0.tar.xz 7929620 BLAKE2B 74ccd0e14803ee3991d895c8ec0099567b6a087110eda03d5b35a45d1e684916d63846f1bd1184b2f5fe7a88431983602899cfd6392c28de78d020b8c98c89b2 SHA512 3868431003f9f1a3907415124c1d8282b077985a9d104615d48f9d309f6fbf1a11119546674508649aa35f2b6e66aa5638024e8127f92ae7b043da367c7b3363
DIST kitty-0.31.0.tar.xz.sig 566 BLAKE2B 5013b35dd7119b5bed3e4fefee70009f6fe6ba8c3215a35e82fdd3929063ef32c58c77f12c246374693801936ac362c3d432da95c91b632fdb848d98b3cf0bf9 SHA512 cc8583bbdd9e23a005cecb87f5d7d72ada5db1a1a8cdf59a67a103fc0c11df403df2673434d373216415903b6967a1638bf3f51ff7474368d618685a542d4280
diff --git a/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch b/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch
deleted file mode 100644
index d22bca5de0b5..000000000000
--- a/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Ensure no sudo wrapper given may easily result in an error with no permission
-to set TERMINFO. Normally disabled by "no-sudo" but depending on load ordering
-or user configs overwriting that without disabling it as well, it could give
-poor surprises.
-
-Not needed on Gentoo given have a kitty-terminfo package installed in standard
-paths without needing TERMINFO set.
---- a/shell-integration/bash/kitty.bash
-+++ b/shell-integration/bash/kitty.bash
-@@ -215,4 +214,0 @@
-- if [[ "${_ksi_prompt[sudo]}" == "y" ]]; then
-- # Ensure terminfo is available in sudo
-- [[ -n "$TERMINFO" ]] && builtin alias sudo="sudo TERMINFO=\"$TERMINFO\""
-- fi
---- a/shell-integration/zsh/kitty-integration
-+++ b/shell-integration/zsh/kitty-integration
-@@ -391,4 +390,0 @@
-- if (( ! opt[(Ie)no-sudo] )); then
-- # Ensure terminfo is available in sudo
-- [[ -n "$TERMINFO" ]] && builtin alias sudo="sudo TERMINFO=\"$TERMINFO\""
-- fi
diff --git a/x11-terms/kitty/kitty-0.30.1.ebuild b/x11-terms/kitty/kitty-0.30.1.ebuild
deleted file mode 100644
index aa40b2f334ac..000000000000
--- a/x11-terms/kitty/kitty-0.30.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
- inherit verify-sig
- SRC_URI="
- https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
- https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
- verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
- "
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
- KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3 ZLIB"
-LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0 " # go
-SLOT="0"
-IUSE="+X test wayland"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( X wayland )
- test? ( X wayland )
-"
-RESTRICT="!test? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/openssl:=
- dev-libs/xxhash
- media-libs/fontconfig
- media-libs/harfbuzz:=[truetype]
- media-libs/lcms:2
- media-libs/libglvnd[X?]
- media-libs/libpng:=
- sys-apps/dbus
- sys-libs/zlib:=
- x11-libs/libxkbcommon[X?]
- x11-misc/xkeyboard-config
- ~x11-terms/kitty-shell-integration-${PV}
- ~x11-terms/kitty-terminfo-${PV}
- X? ( x11-libs/libX11 )
- wayland? ( dev-libs/wayland )
- !sci-mathematics/kissat
-"
-DEPEND="
- ${RDEPEND}
- X? (
- x11-base/xorg-proto
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- )
- wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-lang/go-1.21
- sys-libs/ncurses
- virtual/pkgconfig
- test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
- wayland? ( dev-util/wayland-scanner )
-"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.30.1-no-sudo.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- cd "${S}" || die
- edo go mod vendor
- else
- use verify-sig &&
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
- default
- fi
-}
-
-src_prepare() {
- default
-
- # sed unfortunately feels easier on maintenance than patches here
- local sedargs=(
- -e "/num_workers =/s/=.*/= $(makeopts_jobs)/"
- -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//'
- -e "s/ld_flags.append('-[sw]')/pass/"
- )
-
- # kitty is often popular on wayland-only setups, try to allow this
- use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918
- use !X || use !wayland &&
- sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" )
-
- # skip docs for live version, missing dependencies
- [[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' )
-
- sed -i setup.py "${sedargs[@]}" || die
-
- local skiptests=(
- # relies on 'who' command which doesn't detect users with pid-sandbox
- kitty_tests/utmp.py
- # may fail/hang depending on environment and shell initialization
- kitty_tests/{shell_integration,ssh}.py
- # relies on /proc/self/fd and gets confused when ran from here
- tools/utils/tpmfile_test.go
- )
- use !test || rm "${skiptests[@]}" || die
-}
-
-src_compile() {
- tc-export CC
- local -x GOFLAGS="-p=$(makeopts_jobs) -v -x"
- use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie"
- local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
- local conf=(
- --disable-link-time-optimization
- --ignore-compiler-warnings
- --libdir-name=$(get_libdir)
- --shell-integration="enabled no-rc no-sudo"
- --update-check-interval=0
- --verbose
- )
-
- edo "${EPYTHON}" setup.py linux-package "${conf[@]}"
- use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}"
-
- rm -r linux-package/share/terminfo || die # provided by kitty-terminfo
-
- if [[ ${PV} == 9999 ]]; then
- mkdir -p linux-package/share/doc/${PF} || die
- else
- mv linux-package/share/doc/{${PN},${PF}} || die
- fi
-
- # generate default config as reference, command taken from docs/conf.rst
- if ! tc-is-cross-compiler; then
- linux-package/bin/kitty +runpy \
- 'from kitty.config import *; print(commented_out_default_config())' \
- > linux-package/share/doc/${PF}/kitty.conf || die
- fi
-}
-
-src_test() {
- KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
-}
-
-src_install() {
- edo mv linux-package "${ED}"/usr
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "audio-based terminal bell support" media-libs/libcanberra
- optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2023-07-14 9:32 Ionen Wolkens
0 siblings, 0 replies; 21+ messages in thread
From: Ionen Wolkens @ 2023-07-14 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 6cfc3c38d2c83824786e2a63797f9cea9b330023
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Fri Jul 14 02:16:36 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 09:30:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfc3c38
x11-terms/kitty: Backport fix for musl 1.2.4
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31872
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch | 20 ++++++++++++++++++++
x11-terms/kitty/kitty-0.27.1.ebuild | 4 ++++
x11-terms/kitty/kitty-0.28.1.ebuild | 4 ++++
x11-terms/kitty/kitty-0.29.0.ebuild | 4 ++++
4 files changed, 32 insertions(+)
diff --git a/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch b/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch
new file mode 100644
index 000000000000..f02f425d0d66
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch
@@ -0,0 +1,20 @@
+From https://github.com/kovidgoyal/kitty/commit/90223b5d146828c65179da49c75ce31b304fa1b8 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 11 Jul 2023 09:22:40 +0530
+Subject: [PATCH] Fix compilation against musl
+
+As usual in C stdlib world. Ill thought out break the world changes.
+Sigh. musl no longer defines off64_t.
+
+Fixes #6441
+--- a/kitty/fast-file-copy.c
++++ b/kitty/fast-file-copy.c
+@@ -83,7 +83,7 @@ copy_with_file_range(int infd, int outfd, off_t in_pos, size_t len, FastFileCopy
+ #ifdef HAS_COPY_FILE_RANGE
+ unsigned num_of_consecutive_zero_returns = 128;
+ while (len) {
+- off64_t r = in_pos;
++ int64_t r = in_pos;
+ ssize_t n = copy_file_range(infd, &r, outfd, NULL, len, 0);
+ if (n < 0) {
+ if (errno == EAGAIN) continue;
diff --git a/x11-terms/kitty/kitty-0.27.1.ebuild b/x11-terms/kitty/kitty-0.27.1.ebuild
index 1fa60113f89c..f0f229436c3f 100644
--- a/x11-terms/kitty/kitty-0.27.1.ebuild
+++ b/x11-terms/kitty/kitty-0.27.1.ebuild
@@ -70,6 +70,10 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner )"
[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.29.0-musl-1.2.4.patch"
+)
+
QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
src_unpack() {
diff --git a/x11-terms/kitty/kitty-0.28.1.ebuild b/x11-terms/kitty/kitty-0.28.1.ebuild
index e034994923d5..00cbcf7ed7e4 100644
--- a/x11-terms/kitty/kitty-0.28.1.ebuild
+++ b/x11-terms/kitty/kitty-0.28.1.ebuild
@@ -70,6 +70,10 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner )"
[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.29.0-musl-1.2.4.patch"
+)
+
QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
src_unpack() {
diff --git a/x11-terms/kitty/kitty-0.29.0.ebuild b/x11-terms/kitty/kitty-0.29.0.ebuild
index ca29cc5189de..73a34d22e2c4 100644
--- a/x11-terms/kitty/kitty-0.29.0.ebuild
+++ b/x11-terms/kitty/kitty-0.29.0.ebuild
@@ -70,6 +70,10 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner )"
[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.29.0-musl-1.2.4.patch"
+)
+
QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
src_unpack() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2022-09-08 18:23 Ionen Wolkens
0 siblings, 0 replies; 21+ messages in thread
From: Ionen Wolkens @ 2022-09-08 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 6895321462771307e2d14b334eb3ff2daf58a9d5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 18:19:05 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 18:23:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68953214
x11-terms/kitty: drop vulnerable 0.25.2, 0.26.1
Bug: https://bugs.gentoo.org/868543
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kitty/Manifest | 4 -
x11-terms/kitty/files/kitty-0.23.1-flags.patch | 17 ----
x11-terms/kitty/kitty-0.25.2.ebuild | 135 -------------------------
x11-terms/kitty/kitty-0.26.1.ebuild | 131 ------------------------
4 files changed, 287 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index ea0aa009806a..f6aeece75d47 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,6 +1,2 @@
-DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
-DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9
-DIST kitty-0.26.1.tar.xz 4716836 BLAKE2B 1369fe3bb13fc5fb134c5b45f179ddd60b4edb61243d88aa08d8b414b4153b17e5c739859c9ed2db366e096db1b07e207cbef715d95787722037ddf5854582e1 SHA512 ed270c84078acb33921506296c476ada5f19fb33344047c7dad5b2d7b697c2111e2925dc391eb4927a05ef82ae583b35db5eee53e148e3e4d71ce942a1deade2
-DIST kitty-0.26.1.tar.xz.sig 566 BLAKE2B 9cc653d0bb5fb2d46b82d1320a4273402af371783cc6469bd2a8f472dd03a25fa3d6cd0e9b47fedbd733713f422b73106069c66368a4b4a8c07c848050cc4e31 SHA512 2cb03e74e7c8a02a8aca8006662a174bff9ef511140340988dd0a079504e1ca665c927a78f5ddc59c243e92df9cf68d0a531b388ecf148901a855bdef2489ded
DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7
DIST kitty-0.26.2.tar.xz.sig 566 BLAKE2B 4f36d131143ad4c1ea3dbdd7b094cbfd7ece133e573ec95714d5b778a80cb58b3b89ab02f575442aaf1618985e37528285009bb724721e5d48b1ffc611175672 SHA512 8ec0f237eb0b9f868ea703ab8b5cb85405f9360ad8e7402a0e5a3c4f3268a5a127359a9444c0e7cf05f364ea5dfeb31f9657a110fadc34bb6ed870ef939a4ada
diff --git a/x11-terms/kitty/files/kitty-0.23.1-flags.patch b/x11-terms/kitty/files/kitty-0.23.1-flags.patch
deleted file mode 100644
index 8f23393f8a0e..000000000000
--- a/x11-terms/kitty/files/kitty-0.23.1-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -295,3 +295,3 @@
- fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
-- optimize = df if debug or sanitize else '-O3'
-+ optimize = ''
- sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
-@@ -319,3 +319,3 @@
- 'OVERRIDE_LDFLAGS',
-- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+ '-Wall ' + ' '.join(sanitize_args)
- )
-@@ -807,4 +807,2 @@
- libs.append('-lprofiler')
-- else:
-- cflags.append('-O3')
- if bundle_type.endswith('-freeze'):
diff --git a/x11-terms/kitty/kitty-0.25.2.ebuild b/x11-terms/kitty/kitty-0.25.2.ebuild
deleted file mode 100644
index 2c71e5584d72..000000000000
--- a/x11-terms/kitty/kitty-0.25.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
- inherit verify-sig
- SRC_URI="
- https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
- verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
- KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+X debug test transfer wayland"
-REQUIRED_USE="
- || ( X wayland )
- ${PYTHON_REQUIRED_USE}"
-RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
- ${PYTHON_DEPS}
- media-libs/fontconfig
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libglvnd[X?]
- media-libs/libpng:=
- sys-apps/dbus
- sys-libs/zlib:=
- x11-libs/libxkbcommon[X?]
- x11-misc/xkeyboard-config
- ~x11-terms/kitty-shell-integration-${PV}
- ~x11-terms/kitty-terminfo-${PV}
- X? ( x11-libs/libX11 )
- transfer? ( net-libs/librsync:= )
- wayland? ( dev-libs/wayland )"
-DEPEND="
- ${RDEPEND}
- X? (
- x11-base/xorg-proto
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- )
- wayland? ( dev-libs/wayland-protocols )"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-libs/ncurses
- virtual/pkgconfig
- test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
- wayland? ( dev-util/wayland-scanner )"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.23.1-flags.patch
-)
-
-src_prepare() {
- default
-
- sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
- -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
- -e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
- -i setup.py || die
-
- if use !transfer; then
- sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
- rm -r kittens/transfer || die
- fi
-
- # test relies on 'who' command which doesn't detect users with pid-sandbox
- rm kitty_tests/utmp.py || die
-
- # test may fail/hang depending on environment and shell initialization scripts
- rm kitty_tests/{shell_integration,ssh}.py || die
-
- # skip docs for live version
- [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
-}
-
-src_compile() {
- tc-export CC
- export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
- local setup=(
- ${EPYTHON} setup.py linux-package
- --disable-link-time-optimization
- --ignore-compiler-warnings
- --libdir-name=$(get_libdir)
- --shell-integration="enabled no-rc"
- --update-check-interval=0
- --verbose
- $(usev debug --debug)
- )
-
- echo "${setup[*]}"
- "${setup[@]}" || die "setup.py failed to compile ${PN}"
-
- [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
- rm -r linux-package/share/terminfo || die
-}
-
-src_test() {
- PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \
- ${EPYTHON} test.py || die
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/.
-
- fperms +x /usr/bin/kitty \
- /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
- optfeature "audio-based terminal bell support" media-libs/libcanberra
- optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/kitty/kitty-0.26.1.ebuild b/x11-terms/kitty/kitty-0.26.1.ebuild
deleted file mode 100644
index 3ee9cbb30121..000000000000
--- a/x11-terms/kitty/kitty-0.26.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
- inherit verify-sig
- SRC_URI="
- https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
- verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
- KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+X test transfer wayland"
-REQUIRED_USE="
- || ( X wayland )
- ${PYTHON_REQUIRED_USE}"
-RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/openssl:=
- media-libs/fontconfig
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libglvnd[X?]
- media-libs/libpng:=
- sys-apps/dbus
- sys-libs/zlib:=
- x11-libs/libxkbcommon[X?]
- x11-misc/xkeyboard-config
- ~x11-terms/kitty-shell-integration-${PV}
- ~x11-terms/kitty-terminfo-${PV}
- X? ( x11-libs/libX11 )
- transfer? ( net-libs/librsync:= )
- wayland? ( dev-libs/wayland )"
-DEPEND="
- ${RDEPEND}
- X? (
- x11-base/xorg-proto
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- )
- wayland? ( dev-libs/wayland-protocols )"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-libs/ncurses
- virtual/pkgconfig
- test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
- wayland? ( dev-util/wayland-scanner )"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-src_prepare() {
- default
-
- # seds unfortunately feel easier on maintainenance than patches here
- sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
- -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
- -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
- -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
- -i setup.py || die
-
- if use !transfer; then
- sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
- rm -r kittens/transfer || die
- fi
-
- # test relies on 'who' command which doesn't detect users with pid-sandbox
- rm kitty_tests/utmp.py || die
-
- # test may fail/hang depending on environment and shell initialization scripts
- rm kitty_tests/{shell_integration,ssh}.py || die
-
- # skip docs for live version
- [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
-}
-
-src_compile() {
- tc-export CC
- export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
- local conf=(
- --disable-link-time-optimization
- --ignore-compiler-warnings
- --libdir-name=$(get_libdir)
- --shell-integration="enabled no-rc"
- --update-check-interval=0
- --verbose
- )
-
- edo ${EPYTHON} setup.py linux-package "${conf[@]}"
- use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
-
- [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
- rm -r linux-package/share/terminfo || die
-}
-
-src_test() {
- KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/.
-
- fperms +x /usr/bin/kitty \
- /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
- optfeature "audio-based terminal bell support" media-libs/libcanberra
- optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2021-11-10 10:59 Ionen Wolkens
0 siblings, 0 replies; 21+ messages in thread
From: Ionen Wolkens @ 2021-11-10 10:59 UTC (permalink / raw
To: gentoo-commits
commit: e88eeadfd2a4e605cbfe9ecb5c9ec425423fb35f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 08:48:37 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 10:52:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88eeadf
x11-terms/kitty: drop 0.23.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kitty/files/kitty-0.20.1-tests.patch | 11 ---
x11-terms/kitty/files/kitty-0.21.2-flags.patch | 54 ----------
.../kitty/files/kitty-0.21.2-remove-terminfo.patch | 16 ---
x11-terms/kitty/kitty-0.23.1.ebuild | 109 ---------------------
4 files changed, 190 deletions(-)
diff --git a/x11-terms/kitty/files/kitty-0.20.1-tests.patch b/x11-terms/kitty/files/kitty-0.20.1-tests.patch
deleted file mode 100644
index 210898b888d..00000000000
--- a/x11-terms/kitty/files/kitty-0.20.1-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kitty/constants.py
-+++ b/kitty/constants.py
-@@ -64,7 +64,7 @@
- def kitty_exe() -> str:
- rpath = sys._xoptions.get('bundle_exe_dir')
- if not rpath:
-- items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, 'kitty', 'launcher')]
-+ items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, '../linux-package/bin')]
- seen: Set[str] = set()
- for candidate in filter(None, items):
- if candidate not in seen:
diff --git a/x11-terms/kitty/files/kitty-0.21.2-flags.patch b/x11-terms/kitty/files/kitty-0.21.2-flags.patch
deleted file mode 100644
index 0e773c67765..00000000000
--- a/x11-terms/kitty/files/kitty-0.21.2-flags.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/setup.py b/setup.py
-index f751107f..69bf39d4 100755
---- a/setup.py
-+++ b/setup.py
-@@ -293,7 +293,7 @@ def init_env(
- df += ' -Og'
- float_conversion = '-Wfloat-conversion'
- fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
-- 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'),
-@@ -308,8 +308,8 @@ def init_env(
- cflags_ = os.environ.get(
- 'OVERRIDE_CFLAGS', (
- f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
-- f' {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
-- f' -pipe {march} -fvisibility=hidden {fortify_source}'
-+ f' {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
-+ f' {march} -fvisibility=hidden {fortify_source}'
- )
- )
- cflags = shlex.split(cflags_) + shlex.split(
-@@ -317,7 +317,7 @@ def init_env(
- )
- 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')
-@@ -789,10 +789,7 @@
-
-
- def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
-- werror = '' if args.ignore_compiler_warnings else '-pedantic-errors -Werror'
-- cflags = f'-Wall {werror} -fpie'.split()
-- if args.build_universal_binary:
-- cflags += '-arch x86_64 -arch arm64'.split()
-+ cflags = f'-Wall -fpie'.split()
- cppflags = []
- libs: List[str] = []
- if args.profile or args.sanitize:
-@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
- 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.21.2-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
deleted file mode 100644
index 39fe84b3b2a..00000000000
--- a/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index ce5309ee..02f38c61 100755
---- a/setup.py
-+++ a/setup.py
-@@ -1082,11 +1082,6 @@
- else:
- build_launcher(args, launcher_dir, bundle_type)
- os.makedirs(os.path.join(libdir, 'logo'))
-- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build')
-- for x in (libdir, os.path.join(ddir, 'share')):
-- odir = os.path.join(x, 'terminfo')
-- safe_makedirs(odir)
-- build_terminfo['compile_terminfo'](odir)
- shutil.copy2('__main__.py', libdir)
- shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo'))
- shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
diff --git a/x11-terms/kitty/kitty-0.23.1.ebuild b/x11-terms/kitty/kitty-0.23.1.ebuild
deleted file mode 100644
index ee7d59c7435..00000000000
--- a/x11-terms/kitty/kitty-0.23.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
- 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 wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-1.5.0:=
- media-libs/lcms
- media-libs/libcanberra
- media-libs/libpng:0=
- sys-apps/dbus
- sys-libs/zlib
- x11-libs/libxcb[xkb]
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libxkbcommon[X]
- x11-libs/libXrandr
- x11-misc/xkeyboard-config
- x11-terms/kitty-terminfo
- wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.17
- )
-"
-
-DEPEND="${RDEPEND}
- media-libs/mesa[X]
- sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.21.2-flags.patch
- "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
- "${FILESDIR}"/${PN}-0.20.1-tests.patch
-)
-
-src_prepare() {
- default
-
- # disable wayland as required
- if ! use wayland; then
- sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
- # also disable wayland tests
- sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
- sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
- fi
-
- # respect doc dir
- sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
-
- tc-export CC
-}
-
-src_compile() {
- "${EPYTHON}" setup.py \
- --verbose $(usex debug --debug "") \
- --libdir-name $(get_libdir) \
- --update-check-interval=0 \
- linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
- export KITTY_CONFIG_DIRECTORY=${T}
- "${EPYTHON}" test.py || die
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/*
- dobin linux-package/bin/kitty
- python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2021-07-14 6:25 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2021-07-14 6:25 UTC (permalink / raw
To: gentoo-commits
commit: 50476b6bfc29ac4ccb5ac6ee3806b17ae5c2f5e7
Author: end222 <pabloorduna98 <AT> gmail <DOT> com>
AuthorDate: Thu Jul 1 21:03:46 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 06:25:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50476b6b
x11-terms/kitty: bump to 0.21.2
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
.../{kitty-9999-flags.patch => kitty-0.21.2-flags.patch} | 0
...-terminfo.patch => kitty-0.21.2-remove-terminfo.patch} | 0
.../kitty/{kitty-9999.ebuild => kitty-0.21.2.ebuild} | 15 +++++++++------
x11-terms/kitty/kitty-9999.ebuild | 4 ++--
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 8a8bf738a61..e1a1774bb2a 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,4 @@
DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
+DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-0.21.2-flags.patch
similarity index 100%
rename from x11-terms/kitty/files/kitty-9999-flags.patch
rename to x11-terms/kitty/files/kitty-0.21.2-flags.patch
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
similarity index 100%
rename from x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
rename to x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.21.2.ebuild
similarity index 83%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.21.2.ebuild
index e67ade73823..d08fd64a821 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.21.2.ebuild
@@ -28,9 +28,9 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
>=media-libs/harfbuzz-1.5.0:=
+ media-libs/lcms
media-libs/libcanberra
media-libs/libpng:0=
- media-libs/lcms
sys-apps/dbus
sys-libs/zlib
x11-libs/libxcb[xkb]
@@ -47,19 +47,19 @@ RDEPEND="
"
DEPEND="${RDEPEND}
- media-libs/mesa[X(+)]
+ media-libs/mesa[X]
sys-libs/ncurses
"
BDEPEND="virtual/pkgconfig"
-[[ ${PV} == *9999 ]] && BDEPEND+="
- $(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
PATCHES=(
- "${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-remove-terminfo.patch
+ "${FILESDIR}"/${PN}-0.21.2-flags.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
+ "${FILESDIR}"/${PN}-0.20.1-tests.patch
)
src_prepare() {
@@ -68,6 +68,9 @@ src_prepare() {
# disable wayland as required
if ! use wayland; then
sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+ # also disable wayland tests
+ sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+ sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
fi
# respect doc dir
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index e67ade73823..eee99356183 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -57,8 +57,8 @@ BDEPEND="virtual/pkgconfig"
$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
PATCHES=(
- "${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-remove-terminfo.patch
+ "${FILESDIR}"/${PN}-0.21.2-flags.patch
+ "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2021-06-01 0:02 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-06-01 0:02 UTC (permalink / raw
To: gentoo-commits
commit: f11153fa749b505cf7feed51870fccea06325d79
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Wed May 19 21:48:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 31 23:59:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11153fa
x11-terms/kitty: bump to 0.20.3
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.20.3-flags.patch | 53 ++++++++++++
x11-terms/kitty/kitty-0.20.3.ebuild | 109 +++++++++++++++++++++++++
3 files changed, 163 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 68abc25bf93..8a8bf738a61 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,3 @@
DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
+DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
diff --git a/x11-terms/kitty/files/kitty-0.20.3-flags.patch b/x11-terms/kitty/files/kitty-0.20.3-flags.patch
new file mode 100644
index 00000000000..131d6214b4c
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.20.3-flags.patch
@@ -0,0 +1,53 @@
+diff --git a/setup.py b/setup.py
+index f751107f..69bf39d4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -293,7 +293,7 @@ def init_env(
+ df += ' -Og'
+ float_conversion = '-Wfloat-conversion'
+ fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
+- 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'),
+@@ -308,8 +308,8 @@ def init_env(
+ cflags_ = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
+- f' -pedantic-errors {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
+- f' -pipe {march} -fvisibility=hidden {fortify_source}'
++ f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
++ f' {march} -fvisibility=hidden {fortify_source}'
+ )
+ )
+ cflags = shlex.split(cflags_) + shlex.split(
+@@ -317,7 +317,7 @@ def init_env(
+ )
+ 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')
+@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None:
+
+
+ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
+- cflags = '-Wall -Werror -fpie'.split()
+- if args.build_universal_binary:
+- cflags += '-arch x86_64 -arch arm64'.split()
++ cflags = '-Wall -fpie'.split()
+ cppflags = []
+ libs: List[str] = []
+ if args.profile or args.sanitize:
+@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
+ 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/kitty-0.20.3.ebuild b/x11-terms/kitty/kitty-0.20.3.ebuild
new file mode 100644
index 00000000000..35273c44a07
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.20.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit optfeature python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+ 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 wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-1.5.0:=
+ media-libs/lcms
+ media-libs/libcanberra
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ x11-libs/libxcb[xkb]
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libxkbcommon[X]
+ x11-libs/libXrandr
+ x11-terms/kitty-terminfo
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.17
+ )
+"
+
+DEPEND="${RDEPEND}
+ media-libs/mesa[X]
+ sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.20.3-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.20.1-remove-terminfo.patch
+ "${FILESDIR}"/${PN}-0.20.1-tests.patch
+)
+
+src_prepare() {
+ default
+
+ # disable wayland as required
+ if ! use wayland; then
+ sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+ # also disable wayland tests
+ sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+ sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
+ fi
+
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+ tc-export CC
+}
+
+src_compile() {
+ "${EPYTHON}" setup.py \
+ --verbose $(usex debug --debug "") \
+ --libdir-name $(get_libdir) \
+ --update-check-interval=0 \
+ linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+ export KITTY_CONFIG_DIRECTORY=${T}
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2021-05-10 8:06 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2021-05-10 8:06 UTC (permalink / raw
To: gentoo-commits
commit: c4f3c5793421257bcf042cf6b9efe44c7e693037
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 08:06:05 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 10 08:06:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f3c579
x11-terms/kitty: remove duplicate .patch file
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/files/kitty-9999-remove-terminfo.patch | 16 ----------------
x11-terms/kitty/kitty-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
deleted file mode 100644
index aeb40e60118..00000000000
--- a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index ce5309ee..02f38c61 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None:
- safe_makedirs(launcher_dir)
- build_launcher(args, launcher_dir, bundle_type)
- os.makedirs(os.path.join(libdir, 'logo'))
-- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') # type: ignore
-- for x in (libdir, os.path.join(ddir, 'share')):
-- odir = os.path.join(x, 'terminfo')
-- safe_makedirs(odir)
-- build_terminfo['compile_terminfo'](odir)
- shutil.copy2('__main__.py', libdir)
- shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo'))
- shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index d6240798626..fb9de537a83 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -58,7 +58,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-remove-terminfo.patch
+ "${FILESDIR}"/kitty-0.20.1-remove-terminfo.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2021-05-10 8:06 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2021-05-10 8:06 UTC (permalink / raw
To: gentoo-commits
commit: c6680c82b3aa9965ad37228ada43198f8cecb3dd
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Fri Apr 30 22:03:47 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 10 08:06:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6680c82
x11-terms/kitty: bump to 0.20.1
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.20.1-flags.patch | 49 +++++++++
.../kitty/files/kitty-0.20.1-remove-terminfo.patch | 16 +++
x11-terms/kitty/files/kitty-0.20.1-tests.patch | 11 +++
x11-terms/kitty/kitty-0.20.1.ebuild | 110 +++++++++++++++++++++
5 files changed, 187 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 5a886b4a8f4..68abc25bf93 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1 +1,2 @@
DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
+DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
diff --git a/x11-terms/kitty/files/kitty-0.20.1-flags.patch b/x11-terms/kitty/files/kitty-0.20.1-flags.patch
new file mode 100644
index 00000000000..27a44f56794
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.20.1-flags.patch
@@ -0,0 +1,49 @@
+diff --git a/setup.py b/setup.py
+index ce5309ee..9cb59461 100755
+--- a/setup.py
++++ b/setup.py
+@@ -278,7 +278,7 @@ def init_env(
+ df += ' -Og'
+ float_conversion = '-Wfloat-conversion'
+ fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
+- 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'),
+@@ -289,7 +289,7 @@ def init_env(
+ cflags_ = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}'
++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}'
+ ).format(
+ float_conversion,
+ '' if is_openbsd else '-std=c11',
+@@ -306,7 +306,7 @@ def init_env(
+ )
+ 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')
+@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None:
+
+
+ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
+- cflags = '-Wall -Werror -fpie'.split()
++ cflags = '-Wall -fpie'.split()
+ cppflags = []
+ libs: List[str] = []
+ if args.profile or args.sanitize:
+@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
+ 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.20.1-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch
new file mode 100644
index 00000000000..aeb40e60118
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index ce5309ee..02f38c61 100755
+--- a/setup.py
++++ b/setup.py
+@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None:
+ safe_makedirs(launcher_dir)
+ build_launcher(args, launcher_dir, bundle_type)
+ os.makedirs(os.path.join(libdir, 'logo'))
+- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') # type: ignore
+- for x in (libdir, os.path.join(ddir, 'share')):
+- odir = os.path.join(x, 'terminfo')
+- safe_makedirs(odir)
+- build_terminfo['compile_terminfo'](odir)
+ shutil.copy2('__main__.py', libdir)
+ shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo'))
+ shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
diff --git a/x11-terms/kitty/files/kitty-0.20.1-tests.patch b/x11-terms/kitty/files/kitty-0.20.1-tests.patch
new file mode 100644
index 00000000000..210898b888d
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.20.1-tests.patch
@@ -0,0 +1,11 @@
+--- a/kitty/constants.py
++++ b/kitty/constants.py
+@@ -64,7 +64,7 @@
+ def kitty_exe() -> str:
+ rpath = sys._xoptions.get('bundle_exe_dir')
+ if not rpath:
+- items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, 'kitty', 'launcher')]
++ items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, '../linux-package/bin')]
+ seen: Set[str] = set()
+ for candidate in filter(None, items):
+ if candidate not in seen:
diff --git a/x11-terms/kitty/kitty-0.20.1.ebuild b/x11-terms/kitty/kitty-0.20.1.ebuild
new file mode 100644
index 00000000000..242d24ee070
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.20.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit optfeature python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+ 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 wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-1.5.0:=
+ media-libs/lcms
+ media-libs/libcanberra
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ x11-libs/libxcb[xkb]
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libxkbcommon[X]
+ x11-libs/libXrandr
+ x11-terms/kitty-terminfo
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.17
+ )
+ $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+"
+
+DEPEND="${RDEPEND}
+ media-libs/mesa[X]
+ sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.20.1-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.20.1-remove-terminfo.patch
+ "${FILESDIR}"/${PN}-0.20.1-tests.patch
+)
+
+src_prepare() {
+ default
+
+ # disable wayland as required
+ if ! use wayland; then
+ sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+ # also disable wayland tests
+ sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+ sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
+ fi
+
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+ tc-export CC
+}
+
+src_compile() {
+ "${EPYTHON}" setup.py \
+ --verbose $(usex debug --debug "") \
+ --libdir-name $(get_libdir) \
+ --update-check-interval=0 \
+ linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+ export KITTY_CONFIG_DIRECTORY=${T}
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2021-02-02 13:08 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2021-02-02 13:08 UTC (permalink / raw
To: gentoo-commits
commit: e5d0e8614d68462eddda330d57378d1e8bf4ee66
Author: Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com>
AuthorDate: Tue Feb 2 12:01:04 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 12:47:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d0e861
x11-terms/kitty: Update flags.patch for -9999
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19250
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/files/kitty-9999-flags.patch | 49 ++++++++++++++++++++++++++++
x11-terms/kitty/kitty-9999.ebuild | 2 +-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
new file mode 100644
index 00000000000..3bc0431b569
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -0,0 +1,49 @@
+diff --git a/setup.py b/setup.py
+index ce5309ee..9cb59461 100755
+--- a/setup.py
++++ b/setup.py
+@@ -278,7 +278,7 @@ def init_env(
+ df += ' -Og'
+ float_conversion = '-Wfloat-conversion'
+ fortify_source = '-D_FORTIFY_SOURCE=2'
+- 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'),
+@@ -289,7 +289,7 @@ def init_env(
+ cflags_ = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}'
++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}'
+ ).format(
+ float_conversion,
+ '' if is_openbsd else '-std=c11',
+@@ -306,7 +306,7 @@ def init_env(
+ )
+ 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')
+@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None:
+
+
+ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
+- cflags = '-Wall -Werror -fpie'.split()
++ cflags = '-Wall -fpie'.split()
+ cppflags = []
+ libs: List[str] = []
+ if args.profile or args.sanitize:
+@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
+ 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/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index caaf77a28e9..6aefe3154d4 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -56,7 +56,7 @@ BDEPEND="virtual/pkgconfig"
$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
PATCHES=(
- "${FILESDIR}"/kitty-0.17.2-flags.patch
+ "${FILESDIR}"/${P}-flags.patch
"${FILESDIR}"/${P}-remove-terminfo.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2020-03-20 14:30 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2020-03-20 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 17db32a74c1440c24f4fa106948cd497d8a96f24
Author: end222 <pabloorduna98 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 20 10:24:41 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 14:30:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17db32a7
x11-terms/kitty: remove terminfo file
- splitted to kitty-terminfo package
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14933
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../kitty/files/kitty-0.16.0-remove-terminfo.patch | 14 +++
x11-terms/kitty/kitty-0.16.0-r2.ebuild | 102 +++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
new file mode 100644
index 00000000000..4b7352aa73b
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
@@ -0,0 +1,14 @@
+--- a/setup.py
++++ b/setup.py
+@@ -837,11 +837,6 @@
+ safe_makedirs(launcher_dir)
+ build_launcher(args, launcher_dir, bundle_type)
+ os.makedirs(os.path.join(libdir, 'logo'))
+- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build')
+- for x in (libdir, os.path.join(ddir, 'share')):
+- odir = os.path.join(x, 'terminfo')
+- safe_makedirs(odir)
+- build_terminfo['compile_terminfo'](odir)
+ shutil.copy2('__main__.py', libdir)
+ shutil.copy2('logo/kitty.rgba', os.path.join(libdir, 'logo'))
+ shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
diff --git a/x11-terms/kitty/kitty-0.16.0-r2.ebuild b/x11-terms/kitty/kitty-0.16.0-r2.ebuild
new file mode 100644
index 00000000000..a0decdfefc6
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.16.0-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+ 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 wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-1.5.0:=
+ media-libs/libcanberra
+ media-libs/libpng:0=
+ x11-libs/libxcb[xkb]
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libxkbcommon[X]
+ x11-libs/libXrandr
+ sys-apps/dbus
+ sys-libs/zlib
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.17
+ )
+"
+
+DEPEND="${RDEPEND}
+ media-libs/mesa[X(+)]
+ sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.15.1-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.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 || die
+
+ tc-export CC
+}
+
+src_compile() {
+ "${EPYTHON}" setup.py \
+ --verbose $(usex debug --debug "") \
+ --libdir-name $(get_libdir) \
+ linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+ export KITTY_CONFIG_DIRECTORY=${T}
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2020-03-14 12:07 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2020-03-14 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 335901c14756ce68a0d8f07edb41e49b9ae7f18c
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Thu Mar 12 00:17:29 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 12:06:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335901c1
x11-terms/kitty: update live ebuild
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14931
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/files/kitty-9999-flags.patch | 50 ++++++++++++++++++++++++++++
x11-terms/kitty/kitty-9999.ebuild | 8 ++---
2 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
new file mode 100644
index 00000000000..5a247679dc8
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -0,0 +1,50 @@
+Respect user CFLAGS.
+
+--- a/setup.py
++++ b/setup.py
+@@ -236,7 +236,7 @@
+ if ccver >= (5, 0):
+ df += ' -Og'
+ float_conversion = '-Wfloat-conversion'
+ fortify_source = '-D_FORTIFY_SOURCE=2'
+- 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'),
+@@ -217,7 +217,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(
+ float_conversion, std,
+ optimize,
+@@ -232,7 +232,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')
+@@ -614,7 +614,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:
+@@ -626,8 +626,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/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index c62b5d65569..684d939bff8 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -3,9 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
-inherit python-single-r1 toolchain-funcs xdg
+inherit eutils python-single-r1 toolchain-funcs xdg
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
@@ -38,7 +38,6 @@ RDEPEND="
x11-libs/libXrandr
sys-apps/dbus
sys-libs/zlib
- virtual/imagemagick-tools
wayland? (
dev-libs/wayland
>=dev-libs/wayland-protocols-1.17
@@ -55,7 +54,7 @@ BDEPEND="virtual/pkgconfig"
[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
PATCHES=(
- "${FILESDIR}"/kitty-0.15.1-flags.patch
+ "${FILESDIR}"/kitty-9999-flags.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
@@ -94,6 +93,7 @@ src_install() {
pkg_postinst() {
xdg_icon_cache_update
+ optfeature "Displaying images in the terminal" virtual/imagemagick-tools
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2020-02-05 9:09 Tim Harder
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder @ 2020-02-05 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 8a462c4e627f5f4421dd4ab6c7dd06d379bd545f
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 09:05:42 2020 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 09:09:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a462c4e
x11-terms/kitty: remove old
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
x11-terms/kitty/Manifest | 2 -
x11-terms/kitty/files/kitty-0.14.4-flags.patch | 49 -----------
x11-terms/kitty/files/kitty-0.15.0-flags.patch | 49 -----------
x11-terms/kitty/kitty-0.14.6-r1.ebuild | 108 -------------------------
x11-terms/kitty/kitty-0.15.0.ebuild | 101 -----------------------
x11-terms/kitty/metadata.xml | 3 -
6 files changed, 312 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f9b9e656347..0c97c3d2d29 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,4 +1,2 @@
-DIST kitty-0.14.6.tar.xz 2970008 BLAKE2B e4f64051aebcc5d5aa1956351acb5564815e65c7c8435cac3c7960c5096fbeb5f0e98e3bdf92e750e8d70d6b0124b081bbb5d38a589c3dc5cf74642c3eaf83c9 SHA512 889bfce732f2a36d338c9c41b28e0770d98c15530b56a9f037cef610593b50453f1bde60e89560472035fc250dec0431a9776de1449f77e4c6988aca157eea12
-DIST kitty-0.15.0.tar.xz 2978152 BLAKE2B 49f6e5051392c9ad0a91151ccc9f62dbc8ce0031680c66f4b08291c5b5cf43ccb1f096aecfcc69f7980997397d326d6b164f5f189fb89608ed9c8c22f313ebda SHA512 4e546fb9ad0cf34df8aa5ef3787224e8dd820fadb474faddc5f47b987bbc46fb62350a64bcacbdccd7e7cd287df22045ed742b89f613e402f033dc8bb73d8688
DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
diff --git a/x11-terms/kitty/files/kitty-0.14.4-flags.patch b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
deleted file mode 100644
index 5bf301efd5a..00000000000
--- a/x11-terms/kitty/files/kitty-0.14.4-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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.15.0-flags.patch b/x11-terms/kitty/files/kitty-0.15.0-flags.patch
deleted file mode 100644
index 921104e95f3..00000000000
--- a/x11-terms/kitty/files/kitty-0.15.0-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- kitty-0.15.0/setup.py
-+++ kitty-0.15.0/setup.py
-@@ -204,7 +204,7 @@
- if ccver >= (5, 0):
- df += ' -Og'
- float_conversion = '-Wfloat-conversion'
-- 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'),
-@@ -217,7 +217,7 @@
- cflags = os.environ.get(
- 'OVERRIDE_CFLAGS', (
- '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11'
-- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
- ).format(
- float_conversion, std,
- optimize,
-@@ -232,7 +232,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')
-@@ -611,7 +611,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:
-@@ -623,8 +623,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/kitty-0.14.6-r1.ebuild b/x11-terms/kitty/kitty-0.14.6-r1.ebuild
deleted file mode 100644
index 8fa3a58dc70..00000000000
--- a/x11-terms/kitty/kitty-0.14.6-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
- 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 doc imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
- ${PYTHON_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
- x11-libs/libXcursor
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libxkbcommon[X]
- x11-libs/libxcb[xkb]
- wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.17
- )
-"
-RDEPEND="
- ${COMMON_DEPS}
- imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
- media-libs/mesa[X(+)]
- sys-libs/ncurses
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.14.4-flags.patch
- "${FILESDIR}"/${PN}-0.14.4-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}"
-
- if ! use doc; then
- rm -r "${ED}"/usr/share/doc || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.15.0.ebuild b/x11-terms/kitty/kitty-0.15.0.ebuild
deleted file mode 100644
index 6cf7eb8c9ee..00000000000
--- a/x11-terms/kitty/kitty-0.15.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
- 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}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-1.5.0:=
- media-libs/libcanberra
- media-libs/libpng:0=
- x11-libs/libxcb[xkb]
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libxkbcommon[X]
- x11-libs/libXrandr
- sys-apps/dbus
- sys-libs/zlib
- imagemagick? ( virtual/imagemagick-tools )
- wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.17
- )
-"
-
-DEPEND="${RDEPEND}
- media-libs/mesa[X(+)]
- sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
- "${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${PN}-0.14.4-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 || die
-
- tc-export CC
-}
-
-src_compile() {
- "${EPYTHON}" setup.py \
- --verbose $(usex debug --debug "") \
- --libdir-name $(get_libdir) \
- linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
- export KITTY_CONFIG_DIRECTORY=${T}
- "${EPYTHON}" test.py || die
-}
-
-src_install() {
- insinto /usr
- doins -r linux-package/*
- dobin linux-package/bin/kitty
- python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index 99074a0caa8..2c9e0554312 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -9,9 +9,6 @@
<email>proxy-maint@gentoo.org</email>
<name>Gentoo Proxy Maintainers Project</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>
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2020-01-14 14:23 Joonas Niilola
0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2020-01-14 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 0b63f6c8919fa941324959b93578b603bd083597
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Tue Jan 14 10:30:26 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 14:22:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b63f6c8
x11-terms/kitty: fix live ebuild and add support for python 3.8
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14333
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/files/kitty-9999-flags.patch | 49 ----------------------------
x11-terms/kitty/kitty-9999.ebuild | 10 +++---
2 files changed, 5 insertions(+), 54 deletions(-)
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
deleted file mode 100644
index 0b60ae190fc..00000000000
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- kitty-0.15.0/setup.py
-+++ kitty-0.15.0/setup.py
-@@ -204,7 +204,7 @@
- if ccver >= (5, 0):
- df += ' -Og'
- float_conversion = '-Wfloat-conversion'
-- 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'),
-@@ -217,7 +217,7 @@
- cflags = os.environ.get(
- 'OVERRIDE_CFLAGS', (
- '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -D_POSIX_C_SOURCE=200809L -std=c11'
-- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
- ).format(
- float_conversion, std,
- optimize,
-@@ -232,7 +232,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')
-@@ -611,7 +611,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:
-@@ -623,8 +623,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/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 6cf7eb8c9ee..c62b5d65569 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit python-single-r1 toolchain-funcs xdg
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
LICENSE="GPL-3"
SLOT="0"
-IUSE="debug imagemagick wayland"
+IUSE="debug wayland"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
@@ -38,7 +38,7 @@ RDEPEND="
x11-libs/libXrandr
sys-apps/dbus
sys-libs/zlib
- imagemagick? ( virtual/imagemagick-tools )
+ virtual/imagemagick-tools
wayland? (
dev-libs/wayland
>=dev-libs/wayland-protocols-1.17
@@ -55,7 +55,7 @@ BDEPEND="virtual/pkgconfig"
[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
PATCHES=(
- "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/kitty-0.15.1-flags.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2019-06-15 21:27 Tim Harder
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder @ 2019-06-15 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 245a49551eaf5f211e11b7c9282f06c05b44922c
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 21:16:42 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 21:21:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245a4955
x11-terms/kitty: version bump to 0.14.2
Closes: https://bugs.gentoo.org/685290
Closes: https://bugs.gentoo.org/687332
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.14.2-flags.patch | 49 +++++++++++
x11-terms/kitty/kitty-0.14.2.ebuild | 107 +++++++++++++++++++++++++
3 files changed, 157 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 553f9b77e5e..333336fda0d 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,4 @@
DIST kitty-0.13.1.tar.xz 2836564 BLAKE2B 16fa53f81d291610dd5567ef5f06c083246f9e636fc1d1ef7f340c1017c81b2e92f2a14b9f8d53ad924715ae25fd40190e071b403b2319d7c707f95aaf58e8d1 SHA512 0dbc23c300549b507b526abf2f89bf06d4dbdcd96be240d605cc9da2097b407f9b886de67c19462bb517c2b1931cf78810f0efd982cb848cb4fdab86374701db
DIST kitty-0.13.2.tar.xz 2849800 BLAKE2B 94f717fd989fda5148cd8a138db7657bacd33f34e2feb6dc37cfaf12081caa0c7170dcd8e8c6641145123a95acd8d745826fcc95dab382e8072a8bfa6578693a SHA512 f66624d200223810e01b7d880ac42fc314e6be3040aa357bfd7ddf94096c58e4dd7924aebc5c1cdd8fe6082556245b586b96a264010baaaf6fd2a2ae264e4faf
DIST kitty-0.13.3.tar.xz 2846220 BLAKE2B cb2da9e64696298471001f28bc5cc568a6ec21331153929fa86b8bc7262b5928430fc053f86b7ef669eafde676439f6ee644f14cd942e2f11fba7b7dadfcb294 SHA512 9ce803469057245f9e1c50b53e03d48d3f2483b01f9441be6eadbfea8edcba01652177cbff11d1dd2b35e9415db6822fd72a0494f00ee3be30f58c1f1991c37b
+DIST kitty-0.14.2.tar.xz 2867116 BLAKE2B 20f3d66caa5242502f2699d4a5e8364eda357b00c72d50650ab0d03fbbb552152a2d4447e37ce20660d6d8f9ffc285aee057f6adf7a03ac57fa8ab6d1da61013 SHA512 191a37424c51776d271008c6b4b0cb43b60cd2abea3ea7b2a08cca9a8d44c4932ca11470f3efb8debc0e2ef3641bb68c05374401073b23cf81042af467b1dbf4
diff --git a/x11-terms/kitty/files/kitty-0.14.2-flags.patch b/x11-terms/kitty/files/kitty-0.14.2-flags.patch
new file mode 100644
index 00000000000..d362c421651
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.2-flags.patch
@@ -0,0 +1,49 @@
+Respect user CFLAGS.
+
+--- kitty-0.14.2/setup.py
++++ kitty-0.14.2/setup.py
+@@ -198,7 +198,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', (
+@@ -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')
+@@ -550,14 +550,14 @@
+
+
+ def build_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/kitty-0.14.2.ebuild b/x11-terms/kitty/kitty-0.14.2.ebuild
new file mode 100644
index 00000000000..9a7deb4fa06
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.14.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+
+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/releases/download/v${PV}/${P}.tar.xz"
+ 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 doc imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+ ${PYTHON_DEPS}
+ >=media-libs/harfbuzz-1.5.0:=
+ sys-apps/dbus
+ 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]
+ x11-libs/libxcb[xkb]
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.17
+ )
+"
+RDEPEND="
+ ${COMMON_DEPS}
+ imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+ media-libs/mesa
+ sys-libs/ncurses
+ virtual/pkgconfig
+"
+[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.14.2-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}"
+
+ if ! use doc; then
+ rm -r "${ED}"/usr/share/doc || die
+ fi
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2019-06-08 4:31 Matthew Thode
0 siblings, 0 replies; 21+ messages in thread
From: Matthew Thode @ 2019-06-08 4:31 UTC (permalink / raw
To: gentoo-commits
commit: 481f83f4ef8e964665e51ba878ee7f5312359082
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 04:31:17 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 04:31:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481f83f4
x11-terms/kitty: fix 9999 builds
Package-Manager: Portage-2.3.66, Repoman-2.3.14
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
x11-terms/kitty/files/kitty-9999-flags.patch | 47 ++++++++++++++++++++++++++++
x11-terms/kitty/kitty-9999.ebuild | 2 +-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
new file mode 100644
index 00000000000..fe54a959cb7
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -0,0 +1,47 @@
+--- kitty-0.13.2/setup.py
++++ kitty-0.13.2/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 -Wstrict-prototypes -std=c11'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' -pedantic-errors {} {} -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')
+@@ -517,14 +517,14 @@
+
+
+ def build_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/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 74d2102fb6d..4e18d020cf5 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -52,8 +52,8 @@ DEPEND="${RDEPEND}
[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
PATCHES=(
- "${FILESDIR}"/${PN}-0.13.2-flags.patch
"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
+ "${FILESDIR}"/${P}-flags.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2019-01-06 2:56 Tim Harder
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder @ 2019-01-06 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 94dcb6780bcb0ff410f1f5222261f8056da59e75
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 02:54:32 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 02:55:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94dcb678
x11-terms/kitty: version bump to 0.13.2
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.13.2-flags.patch | 47 ++++++++++++++++++++++
.../{kitty-9999.ebuild => kitty-0.13.2.ebuild} | 6 +--
x11-terms/kitty/kitty-9999.ebuild | 6 +--
4 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f75c02e68cf..b02db7a70fa 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,4 @@
DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
DIST kitty-0.12.3.tar.xz 2832760 BLAKE2B dcf338d6d66bd33c5d1bc164964f344d458fd0bf4869536681ba72c5e2920dc84b18187f0c343b68fe954396a351b887bff0034993966e9feade69593f35272d SHA512 6e4ac5f6a44ae1cdade71f0e3fee7cfbdde15f5770d960904b2d762abef9814f9bcef2b32d4a630de8a0c88d7a7945b7cbb7fef05d62625650c2eea9932c93db
DIST kitty-0.13.1.tar.xz 2836564 BLAKE2B 16fa53f81d291610dd5567ef5f06c083246f9e636fc1d1ef7f340c1017c81b2e92f2a14b9f8d53ad924715ae25fd40190e071b403b2319d7c707f95aaf58e8d1 SHA512 0dbc23c300549b507b526abf2f89bf06d4dbdcd96be240d605cc9da2097b407f9b886de67c19462bb517c2b1931cf78810f0efd982cb848cb4fdab86374701db
+DIST kitty-0.13.2.tar.xz 2849800 BLAKE2B 94f717fd989fda5148cd8a138db7657bacd33f34e2feb6dc37cfaf12081caa0c7170dcd8e8c6641145123a95acd8d745826fcc95dab382e8072a8bfa6578693a SHA512 f66624d200223810e01b7d880ac42fc314e6be3040aa357bfd7ddf94096c58e4dd7924aebc5c1cdd8fe6082556245b586b96a264010baaaf6fd2a2ae264e4faf
diff --git a/x11-terms/kitty/files/kitty-0.13.2-flags.patch b/x11-terms/kitty/files/kitty-0.13.2-flags.patch
new file mode 100644
index 00000000000..b79edaf884f
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.13.2-flags.patch
@@ -0,0 +1,47 @@
+--- kitty-0.13.2/setup.py
++++ kitty-0.13.2/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=c11'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' -pedantic-errors {} {} -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')
+@@ -517,14 +517,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/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.13.2.ebuild
similarity index 94%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.13.2.ebuild
index 37279b2e443..74d2102fb6d 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -38,7 +38,7 @@ COMMON_DEPS="
x11-libs/libxcb[xkb]
wayland? (
dev-libs/wayland
- >=dev-libs/wayland-protocols-1.12
+ >=dev-libs/wayland-protocols-1.17
)
"
RDEPEND="
@@ -52,7 +52,7 @@ DEPEND="${RDEPEND}
[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-flags.patch
+ "${FILESDIR}"/${PN}-0.13.2-flags.patch
"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
)
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 37279b2e443..74d2102fb6d 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -38,7 +38,7 @@ COMMON_DEPS="
x11-libs/libxcb[xkb]
wayland? (
dev-libs/wayland
- >=dev-libs/wayland-protocols-1.12
+ >=dev-libs/wayland-protocols-1.17
)
"
RDEPEND="
@@ -52,7 +52,7 @@ DEPEND="${RDEPEND}
[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-flags.patch
+ "${FILESDIR}"/${PN}-0.13.2-flags.patch
"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2018-06-21 18:02 Tim Harder
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder @ 2018-06-21 18:02 UTC (permalink / raw
To: gentoo-commits
commit: f06d8f7efc129b066305ef9b8fde213cd3949702
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 17:47:22 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 18:01:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f06d8f7e
x11-terms/kitty: remove old
x11-terms/kitty/Manifest | 3 -
x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch | 16 ----
x11-terms/kitty/files/kitty-0.9.1-flags.patch | 47 ------------
x11-terms/kitty/kitty-0.10.1.ebuild | 94 -----------------------
x11-terms/kitty/kitty-0.11.0.ebuild | 96 ------------------------
x11-terms/kitty/kitty-0.9.1.ebuild | 94 -----------------------
6 files changed, 350 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 8a78f542f8c..c6ecd53d302 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,4 +1 @@
-DIST kitty-0.10.1.tar.gz 3844251 BLAKE2B f2b1e523ae48415c410080ae0b419c96e394bfc145da4c3f73fe865e2b1fbd6f7c8ffd18d4e14ea09c0397b8fceb35ebfce72a49d731886588acea5135d4615a SHA512 5341ebdec5356665db5ed0b9f910dac66860b0b39334c0878a3af637bd3da983c11ab8425794e8ea7b3c90f6d64855d8acda4531f25726c01ab355293f033a08
-DIST kitty-0.11.0.tar.gz 3907898 BLAKE2B aed74721a332b41cdfb798097797a4e59c1743d32bf2ae6bf5d90eb571acc5ab93c27f837f17de0f79dcece55ba58b6d178a01df980f19fd5d5c5c11337dba4d SHA512 33e9d0a8de5531d9dad341054dde7986eee9ad9ef1c97809c6ee7f3a5fc5ae210eff59ac02e571c31f233676329143f38f4e95d8971d28b21e6befc362e46984
DIST kitty-0.11.1.tar.gz 3924068 BLAKE2B a71535cfffe863ee06f699eba3a06c1665c851673bee0d1134fe992fe0335cc13d9a89cebf5814082a155166aaa0939b0e6296ad567564c608bf72eedce5cce3 SHA512 79a3ed4ffbc58e34e6c907646dc33168a8dcb58db859549549e2983186521dc69990e2d2e3eb120fcd31af03187d9a8233a60b75c205ac4e59bb7b575836cceb
-DIST kitty-0.9.1.tar.gz 3698447 BLAKE2B f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15 SHA512 3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329
diff --git a/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch b/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch
deleted file mode 100644
index 345ba99a89d..00000000000
--- a/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Use SVG icon instead of PNG.
-
---- kitty-0.7.1/setup.py
-+++ kitty-0.7.1/setup.py
-@@ -507,9 +507,9 @@
- safe_makedirs(launcher_dir)
- build_linux_launcher(args, launcher_dir, for_bundle, sh_launcher)
- if not is_macos: # {{{ linux desktop gunk
-- 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/files/kitty-0.9.1-flags.patch b/x11-terms/kitty/files/kitty-0.9.1-flags.patch
deleted file mode 100644
index 9c544610b6b..00000000000
--- a/x11-terms/kitty/files/kitty-0.9.1-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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.10.1.ebuild b/x11-terms/kitty/kitty-0.10.1.ebuild
deleted file mode 100644
index a458d0c6738..00000000000
--- a/x11-terms/kitty/kitty-0.10.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-0.11.0.ebuild b/x11-terms/kitty/kitty-0.11.0.ebuild
deleted file mode 100644
index e1bdc32f631..00000000000
--- a/x11-terms/kitty/kitty-0.11.0.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_{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
- dev-python/sphinx[${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/kitty-0.9.1.ebuild b/x11-terms/kitty/kitty-0.9.1.ebuild
deleted file mode 100644
index a458d0c6738..00000000000
--- a/x11-terms/kitty/kitty-0.9.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2018-05-07 6:29 Tim Harder
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder @ 2018-05-07 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 5031b0bd347845fbeb2babc8b35e0359ccce0729
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 00:28:21 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon May 7 05:49:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5031b0bd
x11-terms/kitty: version bump to 0.9.1
Closes: https://bugs.gentoo.org/655076
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.9.1-flags.patch | 47 ++++++++++++++++++++++
.../{kitty-9999.ebuild => kitty-0.9.1.ebuild} | 12 +++++-
x11-terms/kitty/kitty-9999.ebuild | 12 +++++-
4 files changed, 68 insertions(+), 4 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-9999.ebuild b/x11-terms/kitty/kitty-0.9.1.ebuild
similarity index 89%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.9.1.ebuild
index b51c9110b0e..a458d0c6738 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.9.1.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
+}
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
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
@ 2018-02-05 12:18 Tim Harder
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder @ 2018-02-05 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 9df975d888eae65bd65a4aeb553ab9b2fb6ad48c
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 12:04:09 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 12:09:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df975d8
x11-terms/kitty: initial import
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.7.1-flags.patch | 43 +++++++++++++
x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch | 16 +++++
x11-terms/kitty/kitty-0.7.1.ebuild | 79 ++++++++++++++++++++++++
x11-terms/kitty/metadata.xml | 14 +++++
5 files changed, 153 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
new file mode 100644
index 00000000000..d6aa2678430
--- /dev/null
+++ b/x11-terms/kitty/Manifest
@@ -0,0 +1 @@
+DIST kitty-0.7.1.tar.gz 2535007 BLAKE2B 13c5506b30e54b190d1cec2c2bb5b3b8c76ba3492a065fccae84c84606842b717dc33f74a7b3abf4c0ffec8564c5dd9be4b6ed3972c24cf95662aec594359bc9 SHA512 595e64e49ac940b37ff88d6152006ebfe2722682a8ff6c8bc2514c150a5b51934b9de5b8c99130910e5638f9c1db566abf4adb65f3fdce893708787d1ded59c1
diff --git a/x11-terms/kitty/files/kitty-0.7.1-flags.patch b/x11-terms/kitty/files/kitty-0.7.1-flags.patch
new file mode 100644
index 00000000000..6352ae93f63
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.7.1-flags.patch
@@ -0,0 +1,43 @@
+--- kitty-0.7.1/setup.py
++++ kitty-0.7.1/setup.py
+@@ -163,12 +163,12 @@
+ 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()
+ cflags = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra -Wno-missing-field-initializers -Wall -std=c99 -D_XOPEN_SOURCE=700'
+- ' -pedantic-errors -Werror {} {} -D{}DEBUG -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' -pedantic {} {} -D{}DEBUG -fwrapv {} {} {} -fvisibility=hidden'
+ ).format(
+ optimize,
+ ' '.join(sanitize_args),
+@@ -183,7 +183,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')
+@@ -455,13 +455,13 @@
+
+
+ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False):
+- cflags = '-Wall -Werror -fpie'.split()
++ cflags = '-Wall -fpie'.split()
+ libs = []
+ if args.profile:
+ cflags.append('-DWITH_PROFILER'), cflags.append('-g')
+ libs.append('-lprofiler')
+- else:
+- cflags.append('-O3')
++ #else:
++ # cflags.append('-O3')
+ if for_bundle:
+ cflags.append('-DFOR_BUNDLE')
+ cflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch b/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch
new file mode 100644
index 00000000000..345ba99a89d
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.7.1-svg-icon.patch
@@ -0,0 +1,16 @@
+Use SVG icon instead of PNG.
+
+--- kitty-0.7.1/setup.py
++++ kitty-0.7.1/setup.py
+@@ -507,9 +507,9 @@
+ safe_makedirs(launcher_dir)
+ build_linux_launcher(args, launcher_dir, for_bundle, sh_launcher)
+ if not is_macos: # {{{ linux desktop gunk
+- 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.7.1.ebuild b/x11-terms/kitty/kitty-0.7.1.ebuild
new file mode 100644
index 00000000000..4a24fd5abf5
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.7.1.ebuild
@@ -0,0 +1,79 @@
+# 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
+
+DESCRIPTION="a cross-platform, fast, featureful, GPU-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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/libXinerama
+ x11-libs/libxkbcommon
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.12
+ )
+"
+RDEPEND="
+ ${COMMON_DEPS}
+ imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-svg-icon.patch)
+
+src_prepare() {
+ default
+
+ # respect libdir
+ sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
+
+ # 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 "") linux-package
+}
+
+src_test() {
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ mkdir -p "${ED}"usr || die
+ cp -r linux-package/* "${ED}usr" || die
+
+ dodoc CHANGELOG.rst *.asciidoc
+}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
new file mode 100644
index 00000000000..9289a618728
--- /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>radhermit@gentoo.org</email>
+ <name>Tim Harder</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] 21+ messages in thread
end of thread, other threads:[~2024-03-16 7:25 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-17 14:04 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-03-16 7:25 Ionen Wolkens
2023-12-12 21:25 Ionen Wolkens
2023-07-14 9:32 Ionen Wolkens
2022-09-08 18:23 Ionen Wolkens
2021-11-10 10:59 Ionen Wolkens
2021-07-14 6:25 Joonas Niilola
2021-06-01 0:02 Sam James
2021-05-10 8:06 Joonas Niilola
2021-05-10 8:06 Joonas Niilola
2021-02-02 13:08 Joonas Niilola
2020-03-20 14:30 Joonas Niilola
2020-03-14 12:07 Joonas Niilola
2020-02-05 9:09 Tim Harder
2020-01-14 14:23 Joonas Niilola
2019-06-15 21:27 Tim Harder
2019-06-08 4:31 Matthew Thode
2019-01-06 2:56 Tim Harder
2018-06-21 18:02 Tim Harder
2018-05-07 6:29 Tim Harder
2018-02-05 12:18 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox