* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2018-06-05 4:34 Tim Harder
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder @ 2018-06-05 4:34 UTC (permalink / raw
To: gentoo-commits
commit: 61cd50137109773b1f91b474911631fb13f19649
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 5 04:33:59 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jun 5 04:34:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cd5013
x11-terms/kitty: remove old
x11-terms/kitty/Manifest | 3 -
x11-terms/kitty/files/kitty-0.7.1-flags.patch | 43 --------------
x11-terms/kitty/kitty-0.8.2-r1.ebuild | 86 ---------------------------
x11-terms/kitty/kitty-0.8.3.ebuild | 86 ---------------------------
x11-terms/kitty/kitty-0.8.4.ebuild | 86 ---------------------------
5 files changed, 304 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 3cab57ee80f..564ba428337 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,5 +1,2 @@
DIST kitty-0.10.1.tar.gz 3844251 BLAKE2B f2b1e523ae48415c410080ae0b419c96e394bfc145da4c3f73fe865e2b1fbd6f7c8ffd18d4e14ea09c0397b8fceb35ebfce72a49d731886588acea5135d4615a SHA512 5341ebdec5356665db5ed0b9f910dac66860b0b39334c0878a3af637bd3da983c11ab8425794e8ea7b3c90f6d64855d8acda4531f25726c01ab355293f033a08
-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.7.1-flags.patch b/x11-terms/kitty/files/kitty-0.7.1-flags.patch
deleted file mode 100644
index 6352ae93f63..00000000000
--- a/x11-terms/kitty/files/kitty-0.7.1-flags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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/kitty-0.8.2-r1.ebuild b/x11-terms/kitty/kitty-0.8.2-r1.ebuild
deleted file mode 100644
index b51c9110b0e..00000000000
--- a/x11-terms/kitty/kitty-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,86 +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
-
-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.7.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
-}
diff --git a/x11-terms/kitty/kitty-0.8.3.ebuild b/x11-terms/kitty/kitty-0.8.3.ebuild
deleted file mode 100644
index b51c9110b0e..00000000000
--- a/x11-terms/kitty/kitty-0.8.3.ebuild
+++ /dev/null
@@ -1,86 +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
-
-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.7.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
-}
diff --git a/x11-terms/kitty/kitty-0.8.4.ebuild b/x11-terms/kitty/kitty-0.8.4.ebuild
deleted file mode 100644
index b51c9110b0e..00000000000
--- a/x11-terms/kitty/kitty-0.8.4.ebuild
+++ /dev/null
@@ -1,86 +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
-
-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.7.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
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2018-06-17 9:18 Tim Harder
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder @ 2018-06-17 9:18 UTC (permalink / raw
To: gentoo-commits
commit: eb8eb034f24b8ebb15af1f1e8310c184c7fb4609
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 19:38:24 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 09:17:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8eb034
x11-terms/kitty: version bump to 0.11.0
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.11.0-flags.patch | 47 ++++++++++++++++++++++
x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch | 16 ++++++++
.../{kitty-9999.ebuild => kitty-0.11.0.ebuild} | 10 +++--
x11-terms/kitty/kitty-9999.ebuild | 10 +++--
5 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 564ba428337..bf8f4bdaf65 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,3 @@
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.9.1.tar.gz 3698447 BLAKE2B f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15 SHA512 3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329
diff --git a/x11-terms/kitty/files/kitty-0.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
new file mode 100644
index 00000000000..44abfb669a0
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
@@ -0,0 +1,47 @@
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -177,7 +177,7 @@
+ df = '-g3'
+ if ccver >= (5, 0):
+ df += ' -Og'
+- optimize = df if debug or sanitize else '-O3'
++ optimize = ''
+ sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
+ cppflags = os.environ.get(
+ 'OVERRIDE_CPPFLAGS', (
+@@ -190,7 +190,7 @@
+ cflags = os.environ.get(
+ 'OVERRIDE_CFLAGS', (
+ '-Wextra -Wno-missing-field-initializers -Wall -std=c99'
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++ ' -pedantic {} {} -fwrapv {} {} {} -fvisibility=hidden'
+ ).format(
+ optimize,
+ ' '.join(sanitize_args),
+@@ -204,7 +204,7 @@
+ )
+ ldflags = os.environ.get(
+ 'OVERRIDE_LDFLAGS',
+- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
++ '-Wall ' + ' '.join(sanitize_args)
+ )
+ ldflags = shlex.split(ldflags)
+ ldflags.append('-shared')
+@@ -505,14 +505,14 @@
+
+
+ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
+- cflags = '-Wall -Werror -fpie'.split()
++ cflags = '-Wall -fpie'.split()
+ cppflags = []
+ libs = []
+ if args.profile:
+ cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
+ libs.append('-lprofiler')
+- else:
+- cflags.append('-O3')
++ #else:
++ # cflags.append('-O3')
+ if for_bundle or for_freeze:
+ cppflags.append('-DFOR_BUNDLE')
+ cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
new file mode 100644
index 00000000000..97e45c677f8
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
@@ -0,0 +1,16 @@
+Use SVG icon instead of PNG.
+
+--- kitty-0.11.0/setup.py
++++ kitty-0.11.0/setup.py
+@@ -605,9 +605,9 @@
+ if not is_macos: # {{{ linux desktop gunk
+ copy_man_pages(ddir)
+ copy_html_docs(ddir)
+- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
++ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
+ safe_makedirs(icdir)
+- shutil.copy2('logo/kitty.png', icdir)
++ shutil.copy2('logo/kitty.svg', icdir)
+ deskdir = os.path.join(ddir, 'share', 'applications')
+ safe_makedirs(deskdir)
+ with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.11.0.ebuild
similarity index 90%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.11.0.ebuild
index a458d0c6738..e1bdc32f631 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.11.0.ebuild
@@ -45,11 +45,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ dev-python/sphinx[${PYTHON_USEDEP}]
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.9.1-flags.patch
- "${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.11.0-flags.patch
+ "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
)
src_prepare() {
@@ -60,6 +61,9 @@ src_prepare() {
sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
fi
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
tc-export CC
}
@@ -81,8 +85,6 @@ src_install() {
mkdir -p "${ED}"usr || die
cp -r linux-package/* "${ED}usr" || die
python_fix_shebang "${ED}"
-
- dodoc CHANGELOG.rst *.asciidoc
}
pkg_postinst() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index a458d0c6738..e1bdc32f631 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -45,11 +45,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ dev-python/sphinx[${PYTHON_USEDEP}]
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.9.1-flags.patch
- "${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.11.0-flags.patch
+ "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
)
src_prepare() {
@@ -60,6 +61,9 @@ src_prepare() {
sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
fi
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
tc-export CC
}
@@ -81,8 +85,6 @@ src_install() {
mkdir -p "${ED}"usr || die
cp -r linux-package/* "${ED}usr" || die
python_fix_shebang "${ED}"
-
- dodoc CHANGELOG.rst *.asciidoc
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2019-06-15 21:27 Tim Harder
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder @ 2019-06-15 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 2625f138f2296cb1b5fb224efc8c17e1ef087b58
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 21:21:04 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 21:21:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2625f138
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.11.0-flags.patch | 47 -----------
x11-terms/kitty/kitty-0.13.1-r1.ebuild | 106 -------------------------
x11-terms/kitty/kitty-0.13.2.ebuild | 106 -------------------------
4 files changed, 261 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 333336fda0d..3e46ccfee19 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,4 +1,2 @@
-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.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
deleted file mode 100644
index 44abfb669a0..00000000000
--- a/x11-terms/kitty/files/kitty-0.11.0-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- kitty-0.11.0/setup.py
-+++ kitty-0.11.0/setup.py
-@@ -177,7 +177,7 @@
- df = '-g3'
- if ccver >= (5, 0):
- df += ' -Og'
-- optimize = df if debug or sanitize else '-O3'
-+ optimize = ''
- sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
- cppflags = os.environ.get(
- 'OVERRIDE_CPPFLAGS', (
-@@ -190,7 +190,7 @@
- cflags = os.environ.get(
- 'OVERRIDE_CFLAGS', (
- '-Wextra -Wno-missing-field-initializers -Wall -std=c99'
-- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+ ' -pedantic {} {} -fwrapv {} {} {} -fvisibility=hidden'
- ).format(
- optimize,
- ' '.join(sanitize_args),
-@@ -204,7 +204,7 @@
- )
- ldflags = os.environ.get(
- 'OVERRIDE_LDFLAGS',
-- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+ '-Wall ' + ' '.join(sanitize_args)
- )
- ldflags = shlex.split(ldflags)
- ldflags.append('-shared')
-@@ -505,14 +505,14 @@
-
-
- def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
-- cflags = '-Wall -Werror -fpie'.split()
-+ cflags = '-Wall -fpie'.split()
- cppflags = []
- libs = []
- if args.profile:
- cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
- libs.append('-lprofiler')
-- else:
-- cflags.append('-O3')
-+ #else:
-+ # cflags.append('-O3')
- if for_bundle or for_freeze:
- cppflags.append('-DFOR_BUNDLE')
- cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/kitty-0.13.1-r1.ebuild b/x11-terms/kitty/kitty-0.13.1-r1.ebuild
deleted file mode 100644
index 01fd1141ccc..00000000000
--- a/x11-terms/kitty/kitty-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 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}
- sys-libs/ncurses
- virtual/pkgconfig
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-flags.patch
- "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
-)
-
-src_prepare() {
- default
-
- # disable wayland as required
- if ! use wayland; then
- sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
- fi
-
- # respect doc dir
- sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
- tc-export CC
-}
-
-doecho() {
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- doecho "${EPYTHON}" setup.py \
- --verbose $(usex debug --debug "") \
- --libdir-name $(get_libdir) \
- linux-package
-}
-
-src_test() {
- export KITTY_CONFIG_DIRECTORY=${T}
- "${EPYTHON}" test.py || die
-}
-
-src_install() {
- mkdir -p "${ED}"usr || die
- cp -r linux-package/* "${ED}usr" || die
- python_fix_shebang "${ED}"
-
- if ! use doc; then
- rm -r "${ED}"/usr/share/doc || die
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.13.2.ebuild b/x11-terms/kitty/kitty-0.13.2.ebuild
deleted file mode 100644
index 74d2102fb6d..00000000000
--- a/x11-terms/kitty/kitty-0.13.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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}
- sys-libs/ncurses
- virtual/pkgconfig
-"
-[[ ${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
-)
-
-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] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2019-07-16 23:17 Matthew Thode
0 siblings, 0 replies; 18+ messages in thread
From: Matthew Thode @ 2019-07-16 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 59635ed1891743343e8a1750f024a1ccc0153c23
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 23:16:36 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 23:16:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59635ed1
x11-terms/kitty: fix git master builds (patch fails)
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
x11-terms/kitty/files/kitty-9999-flags.patch | 32 ++++++++++++++-----------
x11-terms/kitty/files/kitty-9999-svg-icon.patch | 14 +++++++++++
x11-terms/kitty/kitty-9999.ebuild | 2 +-
3 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index fe54a959cb7..f7efa3b305b 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -1,6 +1,6 @@
---- kitty-0.13.2/setup.py
-+++ kitty-0.13.2/setup.py
-@@ -178,7 +178,7 @@
+--- setup.py.orig 2019-07-16 18:04:24.052780940 -0500
++++ setup.py 2019-07-16 18:05:54.564383192 -0500
+@@ -202,7 +202,7 @@
df = '-g3'
if ccver >= (5, 0):
df += ' -Og'
@@ -8,8 +8,8 @@
+ optimize = ''
sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
cppflags = os.environ.get(
- 'OVERRIDE_CPPFLAGS', (
-@@ -191,7 +191,7 @@
+ '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'
@@ -18,7 +18,7 @@
).format(
optimize,
' '.join(sanitize_args),
-@@ -205,7 +205,7 @@
+@@ -227,7 +227,7 @@
)
ldflags = os.environ.get(
'OVERRIDE_LDFLAGS',
@@ -27,21 +27,25 @@
)
ldflags = shlex.split(ldflags)
ldflags.append('-shared')
-@@ -517,14 +517,14 @@
+@@ -606,20 +606,17 @@
- def build_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
+ def build_launcher(args, launcher_dir='.', bundle_type='source'):
- cflags = '-Wall -Werror -fpie'.split()
+ cflags = '-Wall -fpie'.split()
cppflags = []
libs = []
- if args.profile:
- cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
- libs.append('-lprofiler')
+ if args.profile or args.sanitize:
+ if args.sanitize:
+- cflags.append('-g3')
+ cflags.extend(get_sanitize_args(env.cc, env.ccver))
+ libs += ['-lasan'] if env.cc == 'gcc' and not is_macos else []
+ else:
+ cflags.append('-g')
+ if args.profile:
+ libs.append('-lprofiler')
- else:
- cflags.append('-O3')
-+ #else:
-+ # cflags.append('-O3')
- if for_bundle or for_freeze:
+ 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-9999-svg-icon.patch b/x11-terms/kitty/files/kitty-9999-svg-icon.patch
new file mode 100644
index 00000000000..ff9e00eb67c
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-svg-icon.patch
@@ -0,0 +1,14 @@
+--- kitty-9999/setup.py.orig 2019-07-16 18:13:07.072868752 -0500
++++ kitty-9999/setup.py 2019-07-16 18:13:40.082039929 -0500
+@@ -705,9 +705,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:
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index b56c1d4487f..f9a458abd9a 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -54,7 +54,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
+ "${FILESDIR}"/${P}-svg-icon.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2019-08-31 10:28 Tim Harder
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder @ 2019-08-31 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 335fef7ad22c1c25809e9df53e6f448811edd894
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 10:22:00 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 10:25:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335fef7a
x11-terms/kitty: version bump to 0.14.4
Closes: https://bugs.gentoo.org/691880
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.14.4-flags.patch | 49 ++++++++++++++++++++++
x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch | 16 +++++++
.../{kitty-9999.ebuild => kitty-0.14.4.ebuild} | 5 ++-
x11-terms/kitty/kitty-9999.ebuild | 1 +
5 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 3e46ccfee19..ed11875f60b 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,3 @@
DIST kitty-0.13.3.tar.xz 2846220 BLAKE2B cb2da9e64696298471001f28bc5cc568a6ec21331153929fa86b8bc7262b5928430fc053f86b7ef669eafde676439f6ee644f14cd942e2f11fba7b7dadfcb294 SHA512 9ce803469057245f9e1c50b53e03d48d3f2483b01f9441be6eadbfea8edcba01652177cbff11d1dd2b35e9415db6822fd72a0494f00ee3be30f58c1f1991c37b
DIST kitty-0.14.2.tar.xz 2867116 BLAKE2B 20f3d66caa5242502f2699d4a5e8364eda357b00c72d50650ab0d03fbbb552152a2d4447e37ce20660d6d8f9ffc285aee057f6adf7a03ac57fa8ab6d1da61013 SHA512 191a37424c51776d271008c6b4b0cb43b60cd2abea3ea7b2a08cca9a8d44c4932ca11470f3efb8debc0e2ef3641bb68c05374401073b23cf81042af467b1dbf4
+DIST kitty-0.14.4.tar.xz 2946268 BLAKE2B e06cdb1081d821bd65190ec7526482f7471f7a04c8a559e48465b602559079c10d220024ac521d2fce34e0eb90af7bee01d1da408082bfa724ac61e59709a860 SHA512 1550883232bff21217fc0d294598d6d828e67a944fc69b324079e87bf2505344c58ade75cec8bff1dca7821c4f490c066f2645281cee0e71792d317ef7df3779
diff --git a/x11-terms/kitty/files/kitty-0.14.4-flags.patch b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
new file mode 100644
index 00000000000..5bf301efd5a
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
@@ -0,0 +1,49 @@
+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.14.4-svg-icon.patch b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
new file mode 100644
index 00000000000..13f874dd3c1
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
@@ -0,0 +1,16 @@
+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:
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.14.4.ebuild
similarity index 94%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.14.4.ebuild
index 623cddae6fb..85c9ba13dfc 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.14.4.ebuild
@@ -27,6 +27,7 @@ COMMON_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
@@ -53,8 +54,8 @@ DEPEND="${RDEPEND}
[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
PATCHES=(
- "${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.14.4-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
src_prepare() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 623cddae6fb..c51e3ffd52d 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -27,6 +27,7 @@ COMMON_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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2019-08-31 10:28 Tim Harder
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder @ 2019-08-31 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 7988919b17db0f8238fd45eae92002dd1a8f66ed
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 10:26:25 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 10:26:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7988919b
x11-terms/kitty: remove old
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 -----------
x11-terms/kitty/kitty-0.13.3.ebuild | 106 -------------------------
3 files changed, 154 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index ed11875f60b..cf75d64fee8 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,2 @@
-DIST kitty-0.13.3.tar.xz 2846220 BLAKE2B cb2da9e64696298471001f28bc5cc568a6ec21331153929fa86b8bc7262b5928430fc053f86b7ef669eafde676439f6ee644f14cd942e2f11fba7b7dadfcb294 SHA512 9ce803469057245f9e1c50b53e03d48d3f2483b01f9441be6eadbfea8edcba01652177cbff11d1dd2b35e9415db6822fd72a0494f00ee3be30f58c1f1991c37b
DIST kitty-0.14.2.tar.xz 2867116 BLAKE2B 20f3d66caa5242502f2699d4a5e8364eda357b00c72d50650ab0d03fbbb552152a2d4447e37ce20660d6d8f9ffc285aee057f6adf7a03ac57fa8ab6d1da61013 SHA512 191a37424c51776d271008c6b4b0cb43b60cd2abea3ea7b2a08cca9a8d44c4932ca11470f3efb8debc0e2ef3641bb68c05374401073b23cf81042af467b1dbf4
DIST kitty-0.14.4.tar.xz 2946268 BLAKE2B e06cdb1081d821bd65190ec7526482f7471f7a04c8a559e48465b602559079c10d220024ac521d2fce34e0eb90af7bee01d1da408082bfa724ac61e59709a860 SHA512 1550883232bff21217fc0d294598d6d828e67a944fc69b324079e87bf2505344c58ade75cec8bff1dca7821c4f490c066f2645281cee0e71792d317ef7df3779
diff --git a/x11-terms/kitty/files/kitty-0.13.2-flags.patch b/x11-terms/kitty/files/kitty-0.13.2-flags.patch
deleted file mode 100644
index b79edaf884f..00000000000
--- a/x11-terms/kitty/files/kitty-0.13.2-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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-0.13.3.ebuild b/x11-terms/kitty/kitty-0.13.3.ebuild
deleted file mode 100644
index 74d2102fb6d..00000000000
--- a/x11-terms/kitty/kitty-0.13.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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}
- sys-libs/ncurses
- virtual/pkgconfig
-"
-[[ ${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
-)
-
-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] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2019-11-12 4:00 Tim Harder
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder @ 2019-11-12 4:00 UTC (permalink / raw
To: gentoo-commits
commit: 080e405250a08a717fdd34f9810c72d98590cdf3
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 03:52:06 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 03:54:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080e4052
x11-terms/kitty: remove old
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 -
x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch | 16 ----
x11-terms/kitty/files/kitty-0.14.2-flags.patch | 49 ----------
x11-terms/kitty/kitty-0.14.4.ebuild | 108 ----------------------
4 files changed, 174 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 8aa1f415c4d..8d37e0a76d7 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1 @@
-DIST kitty-0.14.4.tar.xz 2946268 BLAKE2B e06cdb1081d821bd65190ec7526482f7471f7a04c8a559e48465b602559079c10d220024ac521d2fce34e0eb90af7bee01d1da408082bfa724ac61e59709a860 SHA512 1550883232bff21217fc0d294598d6d828e67a944fc69b324079e87bf2505344c58ade75cec8bff1dca7821c4f490c066f2645281cee0e71792d317ef7df3779
DIST kitty-0.14.6.tar.xz 2970008 BLAKE2B e4f64051aebcc5d5aa1956351acb5564815e65c7c8435cac3c7960c5096fbeb5f0e98e3bdf92e750e8d70d6b0124b081bbb5d38a589c3dc5cf74642c3eaf83c9 SHA512 889bfce732f2a36d338c9c41b28e0770d98c15530b56a9f037cef610593b50453f1bde60e89560472035fc250dec0431a9776de1449f77e4c6988aca157eea12
diff --git a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
deleted file mode 100644
index 97e45c677f8..00000000000
--- a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Use SVG icon instead of PNG.
-
---- kitty-0.11.0/setup.py
-+++ kitty-0.11.0/setup.py
-@@ -605,9 +605,9 @@
- if not is_macos: # {{{ linux desktop gunk
- copy_man_pages(ddir)
- copy_html_docs(ddir)
-- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
-+ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
- safe_makedirs(icdir)
-- shutil.copy2('logo/kitty.png', icdir)
-+ shutil.copy2('logo/kitty.svg', icdir)
- deskdir = os.path.join(ddir, 'share', 'applications')
- safe_makedirs(deskdir)
- with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
diff --git a/x11-terms/kitty/files/kitty-0.14.2-flags.patch b/x11-terms/kitty/files/kitty-0.14.2-flags.patch
deleted file mode 100644
index d362c421651..00000000000
--- a/x11-terms/kitty/files/kitty-0.14.2-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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.4.ebuild b/x11-terms/kitty/kitty-0.14.4.ebuild
deleted file mode 100644
index 85c9ba13dfc..00000000000
--- a/x11-terms/kitty/kitty-0.14.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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/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
- virtual/pkgconfig
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-
-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() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2019-12-03 13:13 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2019-12-03 13:13 UTC (permalink / raw
To: gentoo-commits
commit: 108de5ce4949383ae17a140e658fdb61013f07a1
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Tue Dec 3 09:31:33 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 13:13:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108de5ce
x11-terms/kitty: bump to 0.15.0, improve ebuilds and add myself as a Proxy-Maintainer
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13769
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
...y-9999-flags.patch => kitty-0.15.0-flags.patch} | 28 ++++++-------
x11-terms/kitty/files/kitty-9999-flags.patch | 28 ++++++-------
x11-terms/kitty/files/kitty-9999-svg-icon.patch | 14 -------
.../{kitty-9999.ebuild => kitty-0.15.0.ebuild} | 47 +++++++++-------------
x11-terms/kitty/kitty-9999.ebuild | 47 +++++++++-------------
x11-terms/kitty/metadata.xml | 9 ++++-
7 files changed, 73 insertions(+), 101 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 8d37e0a76d7..be302aa445c 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1 +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
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-0.15.0-flags.patch
similarity index 68%
copy from x11-terms/kitty/files/kitty-9999-flags.patch
copy to x11-terms/kitty/files/kitty-0.15.0-flags.patch
index 1c53cfcc84c..921104e95f3 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-0.15.0-flags.patch
@@ -1,26 +1,26 @@
-diff --git a/setup.py b/setup.py
-index 22423119..b1f4dfe0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -202,7 +202,7 @@ def init_env(
- df = '-g3'
+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'),
-@@ -213,7 +213,7 @@ def init_env(
+@@ -217,7 +217,7 @@
cflags = os.environ.get(
'OVERRIDE_CFLAGS', (
- '-Wextra -Wfloat-conversion -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+ '-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,
- ' '.join(sanitize_args),
-@@ -227,7 +227,7 @@ def init_env(
+@@ -232,7 +232,7 @@
)
ldflags = os.environ.get(
'OVERRIDE_LDFLAGS',
@@ -29,7 +29,7 @@ index 22423119..b1f4dfe0 100755
)
ldflags = shlex.split(ldflags)
ldflags.append('-shared')
-@@ -606,20 +606,17 @@ def safe_makedirs(path):
+@@ -611,7 +611,7 @@
def build_launcher(args, launcher_dir='.', bundle_type='source'):
@@ -38,11 +38,7 @@ index 22423119..b1f4dfe0 100755
cppflags = []
libs = []
if args.profile or args.sanitize:
- if args.sanitize:
-- cflags.append('-g3')
- cflags.extend(get_sanitize_args(env.cc, env.ccver))
- libs += ['-lasan'] if env.cc == 'gcc' and not is_macos else []
- else:
+@@ -623,8 +623,6 @@
cflags.append('-g')
if args.profile:
libs.append('-lprofiler')
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index 1c53cfcc84c..0b60ae190fc 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -1,26 +1,26 @@
-diff --git a/setup.py b/setup.py
-index 22423119..b1f4dfe0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -202,7 +202,7 @@ def init_env(
- df = '-g3'
+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'),
-@@ -213,7 +213,7 @@ def init_env(
+@@ -217,7 +217,7 @@
cflags = os.environ.get(
'OVERRIDE_CFLAGS', (
- '-Wextra -Wfloat-conversion -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+ '-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,
- ' '.join(sanitize_args),
-@@ -227,7 +227,7 @@ def init_env(
+@@ -232,7 +232,7 @@
)
ldflags = os.environ.get(
'OVERRIDE_LDFLAGS',
@@ -29,7 +29,7 @@ index 22423119..b1f4dfe0 100755
)
ldflags = shlex.split(ldflags)
ldflags.append('-shared')
-@@ -606,20 +606,17 @@ def safe_makedirs(path):
+@@ -611,7 +611,7 @@
def build_launcher(args, launcher_dir='.', bundle_type='source'):
@@ -38,11 +38,7 @@ index 22423119..b1f4dfe0 100755
cppflags = []
libs = []
if args.profile or args.sanitize:
- if args.sanitize:
-- cflags.append('-g3')
- cflags.extend(get_sanitize_args(env.cc, env.ccver))
- libs += ['-lasan'] if env.cc == 'gcc' and not is_macos else []
- else:
+@@ -623,8 +623,6 @@
cflags.append('-g')
if args.profile:
libs.append('-lprofiler')
diff --git a/x11-terms/kitty/files/kitty-9999-svg-icon.patch b/x11-terms/kitty/files/kitty-9999-svg-icon.patch
deleted file mode 100644
index ff9e00eb67c..00000000000
--- a/x11-terms/kitty/files/kitty-9999-svg-icon.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- kitty-9999/setup.py.orig 2019-07-16 18:13:07.072868752 -0500
-+++ kitty-9999/setup.py 2019-07-16 18:13:40.082039929 -0500
-@@ -705,9 +705,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:
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.15.0.ebuild
similarity index 79%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.15.0.ebuild
index 1d1a09c24c6..5e7043b85fb 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.15.0.ebuild
@@ -2,6 +2,7 @@
# 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
@@ -19,43 +20,43 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
LICENSE="GPL-3"
SLOT="0"
-IUSE="debug doc imagemagick wayland"
+IUSE="debug imagemagick wayland"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEPS="
+RDEPEND="
${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
>=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/libxcb[xkb]
x11-libs/libXcursor
- x11-libs/libXrandr
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libxkbcommon[X]
- x11-libs/libxcb[xkb]
+ x11-libs/libXrandr
+ sys-apps/dbus
+ sys-libs/zlib
+ imagemagick? ( virtual/imagemagick-tools )
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"
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
PATCHES=(
"${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
src_prepare() {
@@ -67,18 +68,13 @@ src_prepare() {
fi
# respect doc dir
- sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
tc-export CC
}
-doecho() {
- echo "$@"
- "$@" || die
-}
-
src_compile() {
- doecho "${EPYTHON}" setup.py \
+ "${EPYTHON}" setup.py \
--verbose $(usex debug --debug "") \
--libdir-name $(get_libdir) \
linux-package
@@ -90,13 +86,10 @@ src_test() {
}
src_install() {
- mkdir -p "${ED}"/usr || die
- cp -r linux-package/* "${ED}/usr" || die
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
python_fix_shebang "${ED}"
-
- if ! use doc; then
- rm -r "${ED}"/usr/share/doc || die
- fi
}
pkg_postinst() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 1d1a09c24c6..5e7043b85fb 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -2,6 +2,7 @@
# 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
@@ -19,43 +20,43 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
LICENSE="GPL-3"
SLOT="0"
-IUSE="debug doc imagemagick wayland"
+IUSE="debug imagemagick wayland"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEPS="
+RDEPEND="
${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
>=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/libxcb[xkb]
x11-libs/libXcursor
- x11-libs/libXrandr
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libxkbcommon[X]
- x11-libs/libxcb[xkb]
+ x11-libs/libXrandr
+ sys-apps/dbus
+ sys-libs/zlib
+ imagemagick? ( virtual/imagemagick-tools )
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"
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
PATCHES=(
"${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
src_prepare() {
@@ -67,18 +68,13 @@ src_prepare() {
fi
# respect doc dir
- sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
tc-export CC
}
-doecho() {
- echo "$@"
- "$@" || die
-}
-
src_compile() {
- doecho "${EPYTHON}" setup.py \
+ "${EPYTHON}" setup.py \
--verbose $(usex debug --debug "") \
--libdir-name $(get_libdir) \
linux-package
@@ -90,13 +86,10 @@ src_test() {
}
src_install() {
- mkdir -p "${ED}"/usr || die
- cp -r linux-package/* "${ED}/usr" || die
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
python_fix_shebang "${ED}"
-
- if ! use doc; then
- rm -r "${ED}"/usr/share/doc || die
- fi
}
pkg_postinst() {
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index acf4464e905..99074a0caa8 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -1,7 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>pabloorduna98@gmail.com</email>
+ <name>Pablo Orduna</name>
+ </maintainer>
+ <maintainer type="project">
+ <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>
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2020-01-09 6:01 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2020-01-09 6:01 UTC (permalink / raw
To: gentoo-commits
commit: b9730df95f348f29a57c02cd3c9febdff47d1ead
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Tue Jan 7 09:14:09 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 06:00:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9730df9
x11-terms/kitty: bump to 0.15.1 and add support for python 3.8
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14081
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
x11-terms/kitty/files/kitty-0.15.1-flags.patch | 49 ++++++++++++
x11-terms/kitty/kitty-0.15.1.ebuild | 101 +++++++++++++++++++++++++
3 files changed, 151 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index be302aa445c..f54d9c510e7 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/x11-terms/kitty/files/kitty-0.15.1-flags.patch b/x11-terms/kitty/files/kitty-0.15.1-flags.patch
new file mode 100644
index 00000000000..cf09a4a5bab
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.15.1-flags.patch
@@ -0,0 +1,49 @@
+Respect user CFLAGS.
+
+--- a/setup.py
++++ b/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=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-0.15.1.ebuild b/x11-terms/kitty/kitty-0.15.1.ebuild
new file mode 100644
index 00000000000..13c55df7f88
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.15.1.ebuild
@@ -0,0 +1,101 @@
+# 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 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
+ 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
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2020-04-04 7:39 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2020-04-04 7:39 UTC (permalink / raw
To: gentoo-commits
commit: d0cde2c3c36349bd11864cea13bc811aae86479f
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Thu Apr 2 08:44:08 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 4 07:38:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cde2c3
x11-terms/kitty: bump to 0.17.2
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://bugs.gentoo.org/715592
Closes: https://github.com/gentoo/gentoo/pull/15206
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 +
.../files/{kitty-9999-flags.patch => kitty-0.17.2-flags.patch} | 0
x11-terms/kitty/{kitty-9999.ebuild => kitty-0.17.2.ebuild} | 10 ++++++----
x11-terms/kitty/kitty-9999.ebuild | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 0c97c3d2d29..e01a8731b94 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,3 @@
DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
+DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-0.17.2-flags.patch
similarity index 100%
rename from x11-terms/kitty/files/kitty-9999-flags.patch
rename to x11-terms/kitty/files/kitty-0.17.2-flags.patch
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.17.2.ebuild
similarity index 92%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.17.2.ebuild
index 684d939bff8..3331f1a9370 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.17.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit eutils python-single-r1 toolchain-funcs xdg
@@ -30,14 +30,15 @@ RDEPEND="
>=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
- sys-apps/dbus
- sys-libs/zlib
+ x11-terms/kitty-terminfo
wayland? (
dev-libs/wayland
>=dev-libs/wayland-protocols-1.17
@@ -54,8 +55,9 @@ BDEPEND="virtual/pkgconfig"
[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
PATCHES=(
- "${FILESDIR}"/kitty-9999-flags.patch
+ "${FILESDIR}"/${PN}-0.17.2-flags.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
)
src_prepare() {
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 684d939bff8..96dbc6f15d6 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -54,7 +54,7 @@ BDEPEND="virtual/pkgconfig"
[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
PATCHES=(
- "${FILESDIR}"/kitty-9999-flags.patch
+ "${FILESDIR}"/kitty-0.17.2-flags.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2020-05-01 15:09 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2020-05-01 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 847c4510e5474d992463df111a6241f501353a95
Author: end222 <pabloorduna98 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 30 15:07:39 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 1 15:09:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847c4510
x11-terms/kitty: cleanup older versions
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15575
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/Manifest | 2 -
x11-terms/kitty/files/kitty-0.15.1-flags.patch | 49 ------------
x11-terms/kitty/kitty-0.15.1.ebuild | 101 ------------------------
x11-terms/kitty/kitty-0.16.0-r1.ebuild | 101 ------------------------
x11-terms/kitty/kitty-0.16.0-r2.ebuild | 103 -------------------------
x11-terms/kitty/kitty-0.16.0-r3.ebuild | 103 -------------------------
6 files changed, 459 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 5469a2cc936..bac5a972e96 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,4 +1,2 @@
-DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
-DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
diff --git a/x11-terms/kitty/files/kitty-0.15.1-flags.patch b/x11-terms/kitty/files/kitty-0.15.1-flags.patch
deleted file mode 100644
index cf09a4a5bab..00000000000
--- a/x11-terms/kitty/files/kitty-0.15.1-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Respect user CFLAGS.
-
---- a/setup.py
-+++ b/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=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-0.15.1.ebuild b/x11-terms/kitty/kitty-0.15.1.ebuild
deleted file mode 100644
index b921dc1b6a7..00000000000
--- a/x11-terms/kitty/kitty-0.15.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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 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
- 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/kitty-0.16.0-r1.ebuild b/x11-terms/kitty/kitty-0.16.0-r1.ebuild
deleted file mode 100644
index 1dde4e4a996..00000000000
--- a/x11-terms/kitty/kitty-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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}"/kitty-0.15.1-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
- optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.16.0-r2.ebuild b/x11-terms/kitty/kitty-0.16.0-r2.ebuild
deleted file mode 100644
index fac39de6d70..00000000000
--- a/x11-terms/kitty/kitty-0.16.0-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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
- optfeature "Terminfo file for the kitty terminal emulator" x11-terms/kitty-terminfo
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.16.0-r3.ebuild b/x11-terms/kitty/kitty-0.16.0-r3.ebuild
deleted file mode 100644
index 39c54b5dc7d..00000000000
--- a/x11-terms/kitty/kitty-0.16.0-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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=
- 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.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] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2021-02-02 13:08 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2021-02-02 13:08 UTC (permalink / raw
To: gentoo-commits
commit: a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576
Author: Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com>
AuthorDate: Fri Jan 29 15:26:10 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=a3b7507d
x11-terms/kitty: Fix broken patch for -9999
Closes: https://bugs.gentoo.org/767457
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com>
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 | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
new file mode 100644
index 00000000000..aeb40e60118
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-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/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 9b101e5a802..caaf77a28e9 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -57,7 +57,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/kitty-0.17.2-flags.patch
- "${FILESDIR}"/kitty-0.16.0-remove-terminfo.patch
+ "${FILESDIR}"/${P}-remove-terminfo.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2021-06-11 7:21 Joonas Niilola
0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2021-06-11 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 5e72d22a2ea5a5dd58fd99ad345c9cae0fde82f1
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Thu Jun 10 21:50:40 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 07:21:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e72d22a
x11-terms/kitty: fix live ebuild and update python compatibility
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://bugs.gentoo.org/789285
Closes: https://github.com/gentoo/gentoo/pull/21179
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty/files/kitty-9999-flags.patch | 13 +++++++------
x11-terms/kitty/files/kitty-9999-remove-terminfo.patch | 16 ++++++++++++++++
x11-terms/kitty/kitty-9999.ebuild | 4 ++--
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index 39042dbd458..0e773c67765 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -17,7 +17,7 @@ index f751107f..69bf39d4 100755
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' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
++ f' {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
+ f' {march} -fvisibility=hidden {fortify_source}'
)
)
@@ -31,14 +31,15 @@ index f751107f..69bf39d4 100755
)
ldflags = shlex.split(ldflags_)
ldflags.append('-shared')
-@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None:
-
-
+@@ -789,10 +789,7 @@
+
+
def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
-- cflags = '-Wall -Werror -fpie'.split()
+- 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 = '-Wall -fpie'.split()
++ cflags = f'-Wall -fpie'.split()
cppflags = []
libs: List[str] = []
if args.profile or args.sanitize:
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
new file mode 100644
index 00000000000..39fe84b3b2a
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
@@ -0,0 +1,16 @@
+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-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index fb9de537a83..e67ade73823 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit optfeature python-single-r1 toolchain-funcs xdg
@@ -58,7 +58,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/kitty-0.20.1-remove-terminfo.patch
+ "${FILESDIR}"/${P}-remove-terminfo.patch
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
)
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2021-10-17 20:39 John Helmert III
0 siblings, 0 replies; 18+ messages in thread
From: John Helmert III @ 2021-10-17 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 987e94f56ebd5543cfa92c977e0974b8eed66cbb
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 19:09:07 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 20:36:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987e94f5
x11-terms/kitty: drop 0.19.3
Bug: https://bugs.gentoo.org/784608
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
x11-terms/kitty/Manifest | 1 -
.../kitty/files/kitty-0.16.0-remove-terminfo.patch | 14 ---
x11-terms/kitty/files/kitty-0.17.2-flags.patch | 50 ----------
x11-terms/kitty/files/kitty-0.19.1-tests.patch | 11 ---
x11-terms/kitty/kitty-0.19.3.ebuild | 107 ---------------------
5 files changed, 183 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 41c4a129750..f5db726d325 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,4 +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
DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
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
deleted file mode 100644
index 4b7352aa73b..00000000000
--- a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/files/kitty-0.17.2-flags.patch b/x11-terms/kitty/files/kitty-0.17.2-flags.patch
deleted file mode 100644
index 5a247679dc8..00000000000
--- a/x11-terms/kitty/files/kitty-0.17.2-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/files/kitty-0.19.1-tests.patch b/x11-terms/kitty/files/kitty-0.19.1-tests.patch
deleted file mode 100644
index ee489b0dce3..00000000000
--- a/x11-terms/kitty/files/kitty-0.19.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(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.3.ebuild b/x11-terms/kitty/kitty-0.19.3.ebuild
deleted file mode 100644
index af521efe1f6..00000000000
--- a/x11-terms/kitty/kitty-0.19.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 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.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) \
- --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] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2021-11-03 6:41 Ionen Wolkens
0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2021-11-03 6:41 UTC (permalink / raw
To: gentoo-commits
commit: 0c349b95e730918fb9af59fffd8e09489b27faf2
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 26 23:28:08 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 3 06:36:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c349b95
x11-terms/kitty: revamp ebuild
* EAPI-8
* enable py3.10
* make glfw-x11.so optional with IUSE=+X wrt bug #713702
* move most glfw dlopen() deps to DEPEND-only, they are not
essential at runtime for kitty save for libglvnd
* add wayland-scanner BDEPEND (if missing it silently skips
glfw-wayland.so despite USE=wayland)
* export PKGCONFIG_EXE to use right pkg-config
* disable LTO, same reason was already stripping -O3 (if wanted,
should be set by users in CFLAGS -- there is no custom LTO paths)
* use intended --ignore-compiler-warnings to disable -Werror and
simplify -flags.patch to hopefully need less rebasing
* replace -tests.patch used to find bin/kitty by setting PATH
* drop terminfo patch, let kitty install its own /usr/lib64/kitty
terminfo and only skip /usr/share/terminfo from kitty-terminfo
* pin kitty-terminfo to match, the >-r0 check will be removable next
version and is there to avoid collisions (pinning not always
/essential/, but on a same system they originate from the same
package and should match)
* add test dep on dev-python/pillow used by 1 test
* remove unnessary fix shebang (these don't have executable bits and
are used through kitty's linked libpython)
* make libcanberra an optfeature wrt bug #775266
* for imagemagick optfeature, don't use the virtual so it's not noisy
if users have *magick installed but not the virtual
* change HOMEPAGE to actual homepage, github is shown from remote-id
Closes: https://bugs.gentoo.org/713702
Closes: https://bugs.gentoo.org/775266
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kitty/files/kitty-0.23.1-flags.patch | 17 ++++
x11-terms/kitty/kitty-0.23.1-r1.ebuild | 118 +++++++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/x11-terms/kitty/files/kitty-0.23.1-flags.patch b/x11-terms/kitty/files/kitty-0.23.1-flags.patch
new file mode 100644
index 00000000000..8f23393f8a0
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.23.1-flags.patch
@@ -0,0 +1,17 @@
+--- 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.23.1-r1.ebuild b/x11-terms/kitty/kitty-0.23.1-r1.ebuild
new file mode 100644
index 00000000000..2a7084b9f1c
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.23.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit optfeature python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+else
+ SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Fast, feature-rich, GPU-based terminal"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+X debug test wayland"
+REQUIRED_USE="
+ || ( X wayland )
+ ${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
+ 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-terminfo-${PV}
+ >x11-terms/kitty-terminfo-0.23.1-r0
+ X? ( x11-libs/libX11 )
+ 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 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.23.1-flags.patch
+)
+
+src_prepare() {
+ default
+
+ sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die
+ sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \
+ -i kitty_tests/check_build.py || die
+ use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.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
+ --disable-link-time-optimization
+ --ignore-compiler-warnings
+ --libdir-name=$(get_libdir)
+ --update-check-interval=0
+ --verbose
+ $(usev debug --debug)
+ linux-package
+ )
+
+ 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
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+
+ optfeature "displaying images in the terminal" \
+ media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick]
+
+ optfeature "audio-based terminal bell support" media-libs/libcanberra
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2021-11-03 6:41 Ionen Wolkens
0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2021-11-03 6:41 UTC (permalink / raw
To: gentoo-commits
commit: 6e9031ed5d4d375652f70b1638c8b2411be59de3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 08:40:09 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 3 06:36:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9031ed
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 <AT> gentoo.org>
x11-terms/kitty/Manifest | 3 -
x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch | 16 ---
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.3-flags.patch | 53 ----------
x11-terms/kitty/kitty-0.20.1.ebuild | 110 ---------------------
x11-terms/kitty/kitty-0.20.3.ebuild | 109 --------------------
x11-terms/kitty/kitty-0.21.2.ebuild | 110 ---------------------
8 files changed, 466 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f5db726d325..a7edd803adc 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -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
diff --git a/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
deleted file mode 100644
index 13f874dd3c1..00000000000
--- a/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
+++ /dev/null
@@ -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:
diff --git a/x11-terms/kitty/files/kitty-0.20.1-flags.patch b/x11-terms/kitty/files/kitty-0.20.1-flags.patch
deleted file mode 100644
index 27a44f56794..00000000000
--- a/x11-terms/kitty/files/kitty-0.20.1-flags.patch
+++ /dev/null
@@ -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()))
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
deleted file mode 100644
index aeb40e60118..00000000000
--- a/x11-terms/kitty/files/kitty-0.20.1-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/files/kitty-0.20.3-flags.patch b/x11-terms/kitty/files/kitty-0.20.3-flags.patch
deleted file mode 100644
index 131d6214b4c..00000000000
--- a/x11-terms/kitty/files/kitty-0.20.3-flags.patch
+++ /dev/null
@@ -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()))
diff --git a/x11-terms/kitty/kitty-0.20.1.ebuild b/x11-terms/kitty/kitty-0.20.1.ebuild
deleted file mode 100644
index ec22fd9a776..00000000000
--- a/x11-terms/kitty/kitty-0.20.1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/x11-terms/kitty/kitty-0.20.3.ebuild b/x11-terms/kitty/kitty-0.20.3.ebuild
deleted file mode 100644
index 31b802b51d1..00000000000
--- a/x11-terms/kitty/kitty-0.20.3.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-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
-}
diff --git a/x11-terms/kitty/kitty-0.21.2.ebuild b/x11-terms/kitty/kitty-0.21.2.ebuild
deleted file mode 100644
index 38d21756bb2..00000000000
--- a/x11-terms/kitty/kitty-0.21.2.ebuild
+++ /dev/null
@@ -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
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2023-08-11 4:59 Ionen Wolkens
0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2023-08-11 4:59 UTC (permalink / raw
To: gentoo-commits
commit: a51e6b2ddc05b9e7b6ac3c13b3c42775157a070c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 04:58:00 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 04:58:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51e6b2d
x11-terms/kitty: drop 0.27.1, 0.29.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kitty/Manifest | 6 -
.../kitty/files/kitty-0.29.0-musl-1.2.4.patch | 20 ---
x11-terms/kitty/kitty-0.27.1.ebuild | 169 ---------------------
x11-terms/kitty/kitty-0.29.1.ebuild | 165 --------------------
4 files changed, 360 deletions(-)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 2d9ea594436e..351678a4db0f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,9 +1,3 @@
-DIST kitty-0.27.1-vendor.tar.xz 695432 BLAKE2B 86c9a316351432e0ff14bf139158816ddabe7e16d91768694a8560a500765b518ba42db26ad24349c05caece5771c5db4fdf7077f06631d1e81ea9ddb52e0391 SHA512 f96366b7896a34202110c98a9f2177482a01102fb822bd33c46eeb6ffe096fce927213950bab658a6649e1874e936c479ea7884d3518a0d054e2f598d6402bdf
-DIST kitty-0.27.1.tar.xz 5045588 BLAKE2B 2381b3e9af26bb8a4c4358318289e9ef49ba1e38678ef192fd815ced962644671433a80f124579fb593257351cd8e0a61f845975d61d0d33f42b9d470ef130f0 SHA512 484d451b418defc7256319730d623224e3744d6200989d92839c40c951fdb213fe2ef472ddf968f695e499aa6c35d994ad76bb0eb28bca80ec8644b2ead40d56
-DIST kitty-0.27.1.tar.xz.sig 566 BLAKE2B 49cb96d99c48cfe74a50191687fac269cdc33146b5879acbb298c3c9bc7760eda1b2b08839f531d6fe4cf46287d671a1f6a6a24ffe6d6408939d113ba40545db SHA512 b4d24f24ea49c342756d0e458c22e856c4117f07f197ee5294b07ac0a8b5e9d992446b86effb5a7aa1683582cf9ee59bcf651ae4f3952df7783f0a4438042799
-DIST kitty-0.29.1-vendor.tar.xz 1376632 BLAKE2B 7ac778f1687f3fcf0803ae5b993306c72797b900203609bc1f96a3a624d1b8ea3d4f8a63b4930d64e4c720b3da932daf19d03928f7233402ac3fe63576abfeab SHA512 f4bc8a3e9d23824e428beb02a09e34565d89cda4d277b0599a08a2491bc4960d4fe5fd6a4d70e3360ea88c28b786699381404629b0bf27a6190b4ef0cae81a74
-DIST kitty-0.29.1.tar.xz 7809084 BLAKE2B eba6bbe0fc69184a2b73088fff2859d49d06f030128306e761c16142872ceb280b3f034e86190614e68dd0703e8e0506ad5a1d4c4dd9fa64f22c9274d45952e2 SHA512 ce09342ed3cbb0a518dde8d33606468ee5a2a164f18ff4c8addbd33b05459407d4a935b93acb0e98df8d618aa832c93f91e9ac060e7f87c1e4567484adc46c9c
-DIST kitty-0.29.1.tar.xz.sig 566 BLAKE2B e7430db16603233faff10f92599962fd095ca8d5bbcf573e3fa600ec73cce7f23b9f12a299228ea53c1a04fd2f430ebc546b088f7e1b0504c44021f9fbe0ad0d SHA512 e661c1c0aba0bc0c4cde2458b27fe8aa591bd6f5510ba4fbbe881d3ea6e60c2f94bf3b2974f4f385b96d31668850eca274aadc98e96690b51e41ceddf3acad50
DIST kitty-0.29.2-vendor.tar.xz 1377044 BLAKE2B f342c7be9bec556b9b16b0e2032ac1ec80296f791a0c55d8b0831d8e148f05e2a7e1ae7c30090c70e7da7e6ca489e5b9b013f59d35af708eff073899f345b7ac SHA512 c0e2c55b0c7ca6ad435092c1267ed1164e042cc61ebf80b298477703607ac7611170cac1918d3703669e2363756e2d805d490018e66cc5b97efecbd0e516298e
DIST kitty-0.29.2.tar.xz 7809388 BLAKE2B 6928d79a6cc0eaac4d92ce3babbeb0a42bf1dbc92b775386b521c8399352ba77ab9828f8cfd9f40c3e4f29ae98852b6f3cb9ee1f412474ba2ef655c18d2c294d SHA512 a34d8b5bc817dd9d27f1afa190856d916576f52458ede2253655b294358b6b89b1f103acb90d8d66a494b346420ddedc9fcf1a3399f561268ded82e7b1954b06
DIST kitty-0.29.2.tar.xz.sig 566 BLAKE2B 52fe246f3c4a74dfb62ed34b12b639858eb91aef02c872e472e1a1272268f6da2027b325dc29e260346c76bfbaa206486c6ce2f44f259d33f1ca3a0fd82150ff SHA512 ffcc63904a09148ddbf2eb761686942d1de3ce2c8c7c93b8a1c59ef704e0886bce972dd162e88de65912682233b21398970685cebbda785f7c4215f02ddbf9fd
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
deleted file mode 100644
index f02f425d0d66..000000000000
--- a/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index f0f229436c3f..000000000000
--- a/x11-terms/kitty/kitty-0.27.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="${BROOT}/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 MIT" # 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:=
- media-libs/fontconfig
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libglvnd[X?]
- media-libs/libpng:=
- net-libs/librsync:=
- 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.20
- 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.29.0-musl-1.2.4.patch"
-)
-
-QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
-
-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"
- --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
-}
diff --git a/x11-terms/kitty/kitty-0.29.1.ebuild b/x11-terms/kitty/kitty-0.29.1.ebuild
deleted file mode 100644
index c38a800fedd4..000000000000
--- a/x11-terms/kitty/kitty-0.29.1.ebuild
+++ /dev/null
@@ -1,165 +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="${BROOT}/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 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:=
- media-libs/fontconfig
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libglvnd[X?]
- media-libs/libpng:=
- net-libs/librsync:=
- 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.20
- 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
-
-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"
- --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] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
@ 2023-10-05 15:23 Ionen Wolkens
0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2023-10-05 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 9128f4f7852f868909d3f5c7eff3879624e3a940
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 5 14:43:00 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 15:20:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9128f4f7
x11-terms/kitty: add 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 insertions(+)
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index d0caf5e430be..5fa2a9e2427f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,3 +4,6 @@ DIST kitty-0.29.2.tar.xz.sig 566 BLAKE2B 52fe246f3c4a74dfb62ed34b12b639858eb91ae
DIST kitty-0.30.0-vendor.tar.xz 1412860 BLAKE2B 71ca2f2981bab51af5d6baa85485b8c5f91d721f19039c129ec1b10d52b50667a7ee593798db5bc85c0b7e835ce2c1a1eb53d6b9a0b0413b7e7dc77ac4a0713b SHA512 a1649f626cd52472e87d1e4570331f21db6875c61c991e6535e6e81404dc069e52e8ba438ed956da8f1a51bcc9bdb71a541c8e0a6b8cb7678e4bb839bda85402
DIST kitty-0.30.0.tar.xz 7842724 BLAKE2B a656fbb74a92a6b834fe8d06a89eaa1240044b132d64d7ad9eb429c71fd60e564ed963638bb9ba4e99d3e31c2ac594543e702b298a0b53aea1050e3b2e19ae9a SHA512 05438de8752057d7c419da41621b4d8fcfa6e7189530efc32c7c8a0bf2e6dae0332dd1b661206f9dea5bf374713e86ea5e69f640b0e73fe617f528bc963a8792
DIST kitty-0.30.0.tar.xz.sig 566 BLAKE2B bb11c31561fb97ae229cd4eaae787a91cc9937f85bf98a4413476c9540334ff85a94e67a7699d04e326a6e067645e2c831761722d8780ab67c3cc66745bdabca SHA512 117c83e2b2190d6095a4e19386e897c03776ebb11509a23564db7f746dfd31e5ad9865bf88111b3bacf21547385ab08e33d7234027c50ab366f8a69105df8bb4
+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
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
new file mode 100644
index 000000000000..d22bca5de0b5
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000000..884afab7f454
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.30.1.ebuild
@@ -0,0 +1,174 @@
+# 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="${BROOT}/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] 18+ messages in thread
end of thread, other threads:[~2023-10-05 15:23 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-17 9:18 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2023-10-05 15:23 Ionen Wolkens
2023-08-11 4:59 Ionen Wolkens
2021-11-03 6:41 Ionen Wolkens
2021-11-03 6:41 Ionen Wolkens
2021-10-17 20:39 John Helmert III
2021-06-11 7:21 Joonas Niilola
2021-02-02 13:08 Joonas Niilola
2020-05-01 15:09 Joonas Niilola
2020-04-04 7:39 Joonas Niilola
2020-01-09 6:01 Joonas Niilola
2019-12-03 13:13 Joonas Niilola
2019-11-12 4:00 Tim Harder
2019-08-31 10:28 Tim Harder
2019-08-31 10:28 Tim Harder
2019-07-16 23:17 Matthew Thode
2019-06-15 21:27 Tim Harder
2018-06-05 4:34 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox