| 1 |
commit: bd5359cbda10c6ba292526e84f09f65dbd6b8bd1 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 12 14:24:23 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 12 14:32:55 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5359cb |
| 7 |
|
| 8 |
x11-terms/rxvt-unicode-9.26: only apply 24-bit-colour patch when needed |
| 9 |
|
| 10 |
It's too aggressive, i.e. USE=-24-bit-color doesn't fully disable this |
| 11 |
feature. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/801571 |
| 14 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 15 |
|
| 16 |
...-9.26-r1.ebuild => rxvt-unicode-9.26-r2.ebuild} | 39 +++++++++++++--------- |
| 17 |
1 file changed, 24 insertions(+), 15 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild |
| 20 |
similarity index 80% |
| 21 |
rename from x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild |
| 22 |
rename to x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild |
| 23 |
index 4fa68cb62a3..f439e028a7e 100644 |
| 24 |
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild |
| 25 |
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild |
| 26 |
@@ -36,7 +36,6 @@ BDEPEND="virtual/pkgconfig" |
| 27 |
PATCHES=( |
| 28 |
"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch |
| 29 |
"${FILESDIR}"/${PN}-9.21-xsubpp.patch |
| 30 |
- "${WORKDIR}"/${COLOUR_PATCH_NAME} |
| 31 |
) |
| 32 |
DOCS=( |
| 33 |
Changes |
| 34 |
@@ -50,6 +49,11 @@ DOCS=( |
| 35 |
src_prepare() { |
| 36 |
default |
| 37 |
|
| 38 |
+ # Current patch is too aggressive to apply unconditionally, see Bug #801571 |
| 39 |
+ if use 24-bit-color; then |
| 40 |
+ eapply "${WORKDIR}"/${COLOUR_PATCH_NAME} |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
# kill the rxvt-unicode terminfo file - #192083 |
| 44 |
sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" |
| 45 |
|
| 46 |
@@ -59,21 +63,26 @@ src_prepare() { |
| 47 |
|
| 48 |
src_configure() { |
| 49 |
# --enable-everything goes first: the order of the arguments matters |
| 50 |
- econf --enable-everything \ |
| 51 |
- $(use_enable 24-bit-color) \ |
| 52 |
- $(use_enable 256-color) \ |
| 53 |
- $(use_enable blink text-blink) \ |
| 54 |
- $(use_enable fading-colors fading) \ |
| 55 |
- $(use_enable font-styles) \ |
| 56 |
- $(use_enable gdk-pixbuf pixbuf) \ |
| 57 |
- $(use_enable iso14755) \ |
| 58 |
- $(use_enable mousewheel) \ |
| 59 |
- $(use_enable perl) \ |
| 60 |
- $(use_enable startup-notification) \ |
| 61 |
- $(use_enable unicode3) \ |
| 62 |
- $(use_enable utmp) \ |
| 63 |
- $(use_enable wtmp) \ |
| 64 |
+ local myconf=( |
| 65 |
+ --enable-everything |
| 66 |
+ $(use_enable 256-color) |
| 67 |
+ $(use_enable blink text-blink) |
| 68 |
+ $(use_enable fading-colors fading) |
| 69 |
+ $(use_enable font-styles) |
| 70 |
+ $(use_enable gdk-pixbuf pixbuf) |
| 71 |
+ $(use_enable iso14755) |
| 72 |
+ $(use_enable mousewheel) |
| 73 |
+ $(use_enable perl) |
| 74 |
+ $(use_enable startup-notification) |
| 75 |
+ $(use_enable unicode3) |
| 76 |
+ $(use_enable utmp) |
| 77 |
+ $(use_enable wtmp) |
| 78 |
$(use_enable xft) |
| 79 |
+ ) |
| 80 |
+ if use 24-bit-color; then |
| 81 |
+ myconf+=( --enable-24-bit-color ) |
| 82 |
+ fi |
| 83 |
+ econf "${myconf[@]}" |
| 84 |
} |
| 85 |
|
| 86 |
src_compile() { |
Archives