mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
x11-terms/kitty: drop 0.20.1, 0.20.3, 0.21.2
Closes: https://github.com/gentoo/gentoo/pull/22724 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
@@ -1,4 +1 @@
|
||||
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
|
||||
DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
Use SVG icon instead of PNG.
|
||||
|
||||
--- kitty-0.14.4/setup.py
|
||||
+++ kitty-0.14.4/setup.py
|
||||
@@ -710,9 +710,9 @@
|
||||
run_tool(['make', 'docs'])
|
||||
copy_man_pages(ddir)
|
||||
copy_html_docs(ddir)
|
||||
- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
|
||||
+ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
|
||||
safe_makedirs(icdir)
|
||||
- shutil.copy2('logo/kitty.png', icdir)
|
||||
+ shutil.copy2('logo/kitty.svg', icdir)
|
||||
deskdir = os.path.join(ddir, 'share', 'applications')
|
||||
safe_makedirs(deskdir)
|
||||
with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
|
||||
@@ -1,49 +0,0 @@
|
||||
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()))
|
||||
@@ -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'))
|
||||
@@ -1,53 +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' -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()))
|
||||
@@ -1,110 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_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
|
||||
}
|
||||
@@ -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-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
|
||||
}
|
||||
@@ -1,110 +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.14.4-svg-icon.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
|
||||
}
|
||||
Reference in New Issue
Block a user