diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-17 19:04:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-17 19:04:28 +0100 |
| commit | 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch) | |
| tree | 555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /x11-terms/rxvt-unicode | |
| parent | 4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff) | |
gentoo resync : 17.07.2021
Diffstat (limited to 'x11-terms/rxvt-unicode')
| -rw-r--r-- | x11-terms/rxvt-unicode/Manifest | 2 | ||||
| -rw-r--r-- | x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild (renamed from x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild) | 39 |
2 files changed, 25 insertions, 16 deletions
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index 048b020140ca..50eb814e2402 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -10,6 +10,6 @@ DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0 DIST rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz 11716 BLAKE2B 7e18b0f884dbb9574515db8cfb4e1521e1e3287ac194750db288409c7e4d0bb120964e4559ce7e3b91e169935ded93f3af3045fc7c1737a5a6de2710ee2e107b SHA512 8cbcc1c04bdb83996ce08ece559ef9e7f5f530140a2a66291e0ffd049808da60787a68520b4a990dc12e1272de861a85b199ddd10ac8b245eafbfe16dc521199 EBUILD rxvt-unicode-9.22-r9.ebuild 3305 BLAKE2B 10fa2f2fc53f8da9a499703af03be15e464775ed0f0411de2da90ba669061fa846a3a0bb3f75c61da5de6c71e950e9d79c657f9bc5f542be6e0dd6e420982786 SHA512 0907a7236e52c83777d76dbc758d655b27a78778e42d5c0965715b0f3dd60dd717356dce745cf9bb557a5ee1c4ffe55cad8c2d5d599b1bac6855fe6671dc70d9 -EBUILD rxvt-unicode-9.26-r1.ebuild 2991 BLAKE2B 7d1bb895119ebfd3ee8c7e3d3b3c17a3205e1dd9d8d01ca046b685e221621595e5815502fc97af44a73968a797705d1296e823878275401b7212dc1d9f3cc9f6 SHA512 1e3a66b801942e0593f2ea8705d977d9b4d644a8742479a5cd566d70e664f6143741caa86bfadc4623e9acbab143525ff7c15a4aa465ddc25d91b59a61cd9547 +EBUILD rxvt-unicode-9.26-r2.ebuild 3154 BLAKE2B df176b51dff7fd03116c03a1a624984f0e44c3e494dce1affde7485a877462b84325dca3e81ae2238950e2ca0eca69f64a4e4ab00688ab702892afd0e7aa9d28 SHA512 a3552cfe279b8cca277754bb01ce15c6c5e745720ceb23152cf150d224eff062f198ddf80e91eefd511647680dc46568c6229d2807b185a85fc4e2303fc604a5 EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4 diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild index 4fa68cb62a3e..f439e028a7e1 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() { |