From 2500c6ced70ebacfff56116560e516b4d9df7f74 Mon Sep 17 00:00:00 2001 From: gryf Date: Sat, 31 Oct 2026 17:43:37 +0100 Subject: [PATCH] x11-terms/rxvt-unicode: sync with gentoo tree --- x11-terms/rxvt-unicode/Manifest | 3 +- .../files/rxvt-unicode-9.31-cxx20.patch | 41 +++++++++++++++++++ .../rxvt-unicode/rxvt-unicode-9.31-r10.ebuild | 37 ++++++++++++----- 3 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 x11-terms/rxvt-unicode/files/rxvt-unicode-9.31-cxx20.patch diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index 15515ee..d7660ae 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -1,6 +1,7 @@ AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ede1a8b75ea0acde945275af0e524e4382610a40d1e42b2f0be9879bf7c25cb00da6ae410e554567efdcc2f43ceff52e37c44060e6c4a7 SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec AUX rxvt-unicode-9.31-add-space-to-extent-test-chars.patch 4621 BLAKE2B 8cdfca2551da753364870dc02e21318c3ba043fa319eba6a55e928067c696f65c51f054c79f3f8a2cfc8705a57f07a2446e35c1dd9cc6b9169c1bb05c69a5976 SHA512 1aa2bb362c4ff5eb6ef43cac301bb9cf1addca9ac47f5435323fb4d30f7561a007c9a641aa0920f2fa1ac5dbfd451ae9c06e6d88184c88f9ac7e864730fd7ac7 +AUX rxvt-unicode-9.31-cxx20.patch 1382 BLAKE2B bcc799195262fed196229c446eee0740f9f42ffe4429dabdfe0ce5ae2cdeb71f6a93998135973338f56811cf64562c759c34e35bda84901cf159f86b4a01ac64 SHA512 d46307c09c1a0fa7958f4b02bd1a61fe72fe1ea711505f2eea2ac20e7a95187c0b0d1dd33dabcc47070d242fb99b42998c3686afd653de27cecab6edb78a4616 AUX rxvt-unicode-9.31-enable-wide-glyphs.patch 7669 BLAKE2B 5d9c87bcedf96a117a2defafa63cc20ee7001a123e802e675956cee5be9232b9f83d6036ac2bde3164148527e0daf728f92a1e04834660a4fc00c4b3ef3b612a SHA512 0091479f1f8e8c2721555e72f5f46297c8a3daa8d44da7cebba7de88860c15ed40d3555f7260baf172463af1a0a5e52e2321f26607968ab932e6ad0ef4b23a0a AUX rxvt-unicode-9.31-font-width-fix.patch 4939 BLAKE2B 8c8bba9900d6581326c54dfdb92486190f12ff8ff4ae2f0bd88e0d82a3ddce988dd7ab6b435f69544f09d9112937d6dedafe1d55486528015310a3a855fb0631 SHA512 ff911195975c2043cb7da509c7975ce78b426d30ce0d35611f90e0ba5c34c0e6e04884934708739a45747b03886d1fddd09f661c71ed5db916a37c499cec0835 AUX rxvt-unicode-9.31-line-spacing-fix.patch 4783 BLAKE2B ad19bfdadba3a51aff88b3bb512be1897080afb544139f98141d9d7e44c6d9b42ad2a39e5bdfffe8fe4664a52b5382cd72954a04f369b6f7ec5eb9e134247764 SHA512 79f8616969737252cee825a6a247b3fbfcce3152b5a83968e59d7047c0b979036f173629901191537850733cf93739e4a577e00ba52cf1cadbdd5d1011204330 @@ -10,4 +11,4 @@ AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7f AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f0742330910c3867f60871a96a237787d85f66b8999b397281b36ed9b92bda2422e1e2295accfee SHA512 20c7d7a00bd41deefb738b6795ecbea8098ec81d3356cceab4de39408de3552d385fc48ef74a087f3724d436b77de54adb67d0858a0949b9595820ee3d9cf7e4 DIST rxvt-unicode-9.31.tar.bz2 880148 BLAKE2B 439a8c33b7260e0f2fd68b8a4409773c06c3bb7623b5dfbbb0742cc198c9fd25e8a247907878639db5fac3dcd3b6be3d839347787bcf08ca602ae246607f750b SHA512 4d14ecbbb62de1b1c717277f5aae5cfb536e11392f2d4b82c884c1713f437fce8e9dd69a328fa353a55d068d8ee4121a31900f45191acec172d5dc76652b6255 DIST rxvt-unicode-9.31_24-bit-color_aur-9.31-20239117.patch.xz 7776 BLAKE2B 88c12e2db38991fc6c7909950aade09a8c089d93980535af5a602d40cb4712aaa97f659c67e49b52abb71e6d0e2b8279f3d9a6d66654cdf68dde68bf64279873 SHA512 dfc0388138f35345c0c80df0a392c28a52a03d008ca336999369522031898813046c314c1e4ec9a81fea41b81d3230f5ca09d47b84ef04c0f6da98c559812a16 -EBUILD rxvt-unicode-9.31-r10.ebuild 4407 BLAKE2B e1be845b25725c7ad1b4426ac41da8f3d2966126b4d94f49d74023511799648fc44b1def4a6639cc10c0b3a45946eb919b5ef8526cb60cc338ba01cd274fd686 SHA512 ccf82584788aac15f173bf2941bb87cf02403fa7b08e2453086d759962b72aa488e3e825e7094d442f4033eaaf64bad0a8b67e045a0335f874163ea2fd82eee8 +EBUILD rxvt-unicode-9.31-r10.ebuild 4616 BLAKE2B 79c14fe200331181e05215d06bd8294b9bcbd7e39efd3ecde563ad08c515fa78f64f71b272f3911c8ce88978afcd06d453cf3d9db87fc3ee2039df27a7b2ecbc SHA512 af55a4d199266ac02ae84f82b7c8c0bf0e7b793c1e1db3511437725e1bd7c7ebd987dd156c6487bc22a5beece4f6ef07b80e6780ea7789b8fe2b3459d4dde941 diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.31-cxx20.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.31-cxx20.patch new file mode 100644 index 0000000..c9a224a --- /dev/null +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.31-cxx20.patch @@ -0,0 +1,41 @@ +see https://bugs.gentoo.org/967067 +lerp is declared globally with c++20 which is by default with gcc-16 +rename lerp to avoid conflict with the non-identical function std::lerp +lerp is int here but std::lerp is float +--- a/src/rxvttoolkit.C ++++ b/src/rxvttoolkit.C +@@ -834,7 +834,7 @@ rxvt_color::set (rxvt_screen *screen, const char *name) + // parse the nonstandard "[alphapercent]" prefix + if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) + { +- c.a = lerp (0, rgba::MAX_CC, c.a); ++ c.a = rxlerp (0, rgba::MAX_CC, c.a); + name += skip; + } + +@@ -981,10 +981,10 @@ rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rg + result.set ( + screen, + rgba ( +- lerp (c.r, to.r, percent), +- lerp (c.g, to.g, percent), +- lerp (c.b, to.b, percent), +- lerp (c.a, to.a, percent) ++ rxlerp (c.r, to.r, percent), ++ rxlerp (c.g, to.g, percent), ++ rxlerp (c.b, to.b, percent), ++ rxlerp (c.a, to.a, percent) + ) + ); + } +--- a/src/rxvtutil.h ++++ b/src/rxvtutil.h +@@ -21,7 +21,7 @@ template static inline void clamp_it (T &v, + // linear interpolation + template + static inline T +-lerp (T a, U b, P p) ++rxlerp (T a, U b, P p) + { + return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100; + } diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r10.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r10.ebuild index 04a3cc1..4c398fc 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r10.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # NOTE(gryf): this ebuild differ from official one by using 3rd party patches, @@ -14,34 +14,45 @@ # chars EAPI=8 -inherit autotools desktop systemd prefix +GENTOO_DEPEND_ON_PERL=no +inherit autotools desktop systemd perl-module prefix COLOUR_PATCH_NAME="${PN}-9.31_24-bit-color_aur-9.31-20239117.patch" DESCRIPTION="rxvt clone with xft and unicode support" HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" -SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2 - https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${COLOUR_PATCH_NAME}.xz" +SRC_URI=" + http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2 + https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${COLOUR_PATCH_NAME}.xz +" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="24-bit-color 256-color blink fading-colors +font-styles -font-width gdk-pixbuf iso14755 -line-spacing +mousewheel +perl -smart-resize - -use-space startup-notification unicode3 -wide-glyphs xft" + -use-space startup-notification unicode3 -wide-glyphs xft + ${GENTOO_PERL_USESTRING}" -RDEPEND=">=sys-libs/ncurses-5.7-r6:= +RDEPEND=" dev-libs/libptytty media-libs/fontconfig + >=sys-libs/ncurses-5.7-r6:= x11-libs/libX11 x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - perl? ( dev-lang/perl:= ) + perl? ( + ${GENTOO_PERL_DEPSTRING} + dev-lang/perl:= + ) startup-notification? ( x11-libs/startup-notification ) - xft? ( x11-libs/libXft )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" + xft? ( x11-libs/libXft ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" BDEPEND="virtual/pkgconfig" PATCHES=( @@ -50,6 +61,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.31-enable-wide-glyphs.patch "${FILESDIR}"/${PN}-9.31-perl5.38.patch "${FILESDIR}"/${PN}-9.31-osc-colour-command-termination.patch + "${FILESDIR}"/${PN}-9.31-cxx20.patch "${FILESDIR}"/${PN}-9.31-font-width-fix.patch "${FILESDIR}"/${PN}-9.31-line-spacing-fix.patch "${FILESDIR}"/${PN}-9.31-add-space-to-extent-test-chars.patch @@ -114,6 +126,11 @@ src_compile() { "${S}"/doc/rxvt-tabbed || die } +src_test() { + # Avoid perl-module_src_test (bug #963096) + default +} + src_install() { default