[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
Date: Wed, 14 Jul 2021 06:25:29 +0000 (UTC)	[thread overview]
Message-ID: <1626243919.50476b6bfc29ac4ccb5ac6ee3806b17ae5c2f5e7.juippis@gentoo> (raw)

commit:     50476b6bfc29ac4ccb5ac6ee3806b17ae5c2f5e7
Author:     end222 <pabloorduna98 <AT> gmail <DOT> com>
AuthorDate: Thu Jul  1 21:03:46 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 06:25:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50476b6b

x11-terms/kitty: bump to 0.21.2

Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-terms/kitty/Manifest                                  |  1 +
 .../{kitty-9999-flags.patch => kitty-0.21.2-flags.patch}  |  0
 ...-terminfo.patch => kitty-0.21.2-remove-terminfo.patch} |  0
 .../kitty/{kitty-9999.ebuild => kitty-0.21.2.ebuild}      | 15 +++++++++------
 x11-terms/kitty/kitty-9999.ebuild                         |  4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 8a8bf738a61..e1a1774bb2a 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,4 @@
 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
 DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
+DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df

diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-0.21.2-flags.patch
similarity index 100%
rename from x11-terms/kitty/files/kitty-9999-flags.patch
rename to x11-terms/kitty/files/kitty-0.21.2-flags.patch

diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
similarity index 100%
rename from x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
rename to x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch

diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.21.2.ebuild
similarity index 83%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.21.2.ebuild
index e67ade73823..d08fd64a821 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.21.2.ebuild
@@ -28,9 +28,9 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	>=media-libs/harfbuzz-1.5.0:=
+	media-libs/lcms
 	media-libs/libcanberra
 	media-libs/libpng:0=
-	media-libs/lcms
 	sys-apps/dbus
 	sys-libs/zlib
 	x11-libs/libxcb[xkb]
@@ -47,19 +47,19 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	media-libs/mesa[X(+)]
+	media-libs/mesa[X]
 	sys-libs/ncurses
 "
 
 BDEPEND="virtual/pkgconfig"
 
-[[ ${PV} == *9999 ]] && BDEPEND+="
-	$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.21.2-flags.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+	"${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.20.1-tests.patch
 )
 
 src_prepare() {
@@ -68,6 +68,9 @@ src_prepare() {
 	# disable wayland as required
 	if ! use wayland; then
 		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+		# also disable wayland tests
+		sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+		sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
 	fi
 
 	# respect doc dir

diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index e67ade73823..eee99356183 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -57,8 +57,8 @@ BDEPEND="virtual/pkgconfig"
 	$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.21.2-flags.patch
+	"${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )

next             reply	other threads:[~2021-07-14  6:25 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-14  6:25 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-16  7:25 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/ Ionen Wolkens
2023-12-12 21:25 Ionen Wolkens
2023-07-14  9:32 Ionen Wolkens
2022-09-08 18:23 Ionen Wolkens
2021-11-10 10:59 Ionen Wolkens
2021-06-01  0:02 Sam James
2021-05-10  8:06 Joonas Niilola
2021-05-10  8:06 Joonas Niilola
2021-02-02 13:08 Joonas Niilola
2020-10-17 14:04 Joonas Niilola
2020-03-20 14:30 Joonas Niilola
2020-03-14 12:07 Joonas Niilola
2020-02-05  9:09 Tim Harder
2020-01-14 14:23 Joonas Niilola
2019-06-15 21:27 Tim Harder
2019-06-08  4:31 Matthew Thode
2019-01-06  2:56 Tim Harder
2018-06-21 18:02 Tim Harder
2018-05-07  6:29 Tim Harder
2018-02-05 12:18 Tim Harder

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8a8bf738a6 dfblob:e1a1774bb2 dfblob:e67ade7382
dfblob:d08fd64a82 dfblob:e67ade7382 dfblob:eee9935618 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1626243919.50476b6bfc29ac4ccb5ac6ee3806b17ae5c2f5e7.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox