From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6B9DB13933E for ; Mon, 12 Jul 2021 14:33:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3037E0C33; Mon, 12 Jul 2021 14:33:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9663FE0C33 for ; Mon, 12 Jul 2021 14:33:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F028A342ABC for ; Mon, 12 Jul 2021 14:33:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75F42581 for ; Mon, 12 Jul 2021 14:33:04 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1626100375.bd5359cbda10c6ba292526e84f09f65dbd6b8bd1.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild X-VCS-Directories: x11-terms/rxvt-unicode/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: bd5359cbda10c6ba292526e84f09f65dbd6b8bd1 X-VCS-Branch: master Date: Mon, 12 Jul 2021 14:33:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: db885362-1665-4e36-9e06-f2819df0792f X-Archives-Hash: 919e0d1bd64e44b93a61f04b390eaa7b commit: bd5359cbda10c6ba292526e84f09f65dbd6b8bd1 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 12 14:24:23 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 12 14:32:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5359cb x11-terms/rxvt-unicode-9.26: only apply 24-bit-colour patch when needed It's too aggressive, i.e. USE=-24-bit-color doesn't fully disable this feature. Closes: https://bugs.gentoo.org/801571 Signed-off-by: Marek Szuba gentoo.org> ...-9.26-r1.ebuild => rxvt-unicode-9.26-r2.ebuild} | 39 +++++++++++++--------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild similarity index 80% rename from x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild rename to x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild index 4fa68cb62a3..f439e028a7e 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild @@ -36,7 +36,6 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch "${FILESDIR}"/${PN}-9.21-xsubpp.patch - "${WORKDIR}"/${COLOUR_PATCH_NAME} ) DOCS=( Changes @@ -50,6 +49,11 @@ DOCS=( src_prepare() { default + # Current patch is too aggressive to apply unconditionally, see Bug #801571 + if use 24-bit-color; then + eapply "${WORKDIR}"/${COLOUR_PATCH_NAME} + fi + # kill the rxvt-unicode terminfo file - #192083 sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" @@ -59,21 +63,26 @@ src_prepare() { src_configure() { # --enable-everything goes first: the order of the arguments matters - econf --enable-everything \ - $(use_enable 24-bit-color) \ - $(use_enable 256-color) \ - $(use_enable blink text-blink) \ - $(use_enable fading-colors fading) \ - $(use_enable font-styles) \ - $(use_enable gdk-pixbuf pixbuf) \ - $(use_enable iso14755) \ - $(use_enable mousewheel) \ - $(use_enable perl) \ - $(use_enable startup-notification) \ - $(use_enable unicode3) \ - $(use_enable utmp) \ - $(use_enable wtmp) \ + local myconf=( + --enable-everything + $(use_enable 256-color) + $(use_enable blink text-blink) + $(use_enable fading-colors fading) + $(use_enable font-styles) + $(use_enable gdk-pixbuf pixbuf) + $(use_enable iso14755) + $(use_enable mousewheel) + $(use_enable perl) + $(use_enable startup-notification) + $(use_enable unicode3) + $(use_enable utmp) + $(use_enable wtmp) $(use_enable xft) + ) + if use 24-bit-color; then + myconf+=( --enable-24-bit-color ) + fi + econf "${myconf[@]}" } src_compile() {