diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index 059884c..21c9bab 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -6,7 +6,11 @@ AUX rxvt-unicode-9.22-enable-wide-glyphs.patch 9098 BLAKE2B 5741ca2d7d38639f5210 AUX rxvt-unicode-9.22-font-width-fix.patch 993 BLAKE2B 40a35433bb78cdec5c6469f9a0d80b608dba39c6ecbb57bcc9bf9999e4ae071793bf843f3efaeef5d0947c8b5f0b8334db3a235d0b3d9db0cd6bf3fba0d408ec SHA512 dd468475ec2eefd36616b59563306cbb1779c9b9634c9bdc8a5119a82a6b6ceeecdb560cc20543cf9ab13feb6dbd621ea7d40b72c598245da630890b73a2e99f AUX rxvt-unicode-9.22-line-spacing-fix.patch 911 BLAKE2B fcd71e94b979987e56459f52f0ddcfac0b6b64df97bc60d22ad3e23195c8a0e6b61227c4157332029f6d9116c6f876f0565bf5ddface2a79cc88876e1be959c2 SHA512 87f7c8847111420846c6b5f925953cc69ae3b765cb2af6702ed86ac5a0e450d8a14fc02731c3210ccc7ab99ea4729c406c1dee15bfde356b3e139b4658792c2b AUX rxvt-unicode-9.22-sgr-mouse-mode-flag.patch 5613 BLAKE2B 28cf8af70841027ba254704b3bb94e2bcf7f8f6743963056c046279aeef4fc8f866711144880ac6a3ad6acd4ed86332f497dff905f3836775579ba5e90328218 SHA512 b6bf180cd25f46fd22841aa8322839886712312341950e3abeeec1a44d73bbec8e7467ce09878c84b86263ab7067443529a89f017e54dceb84b189477e58f10e +AUX rxvt-unicode-9.26-enable-wide-glyphs.patch 9040 BLAKE2B d3b722e81b20c0ff83dc8cfbe39554a6428d11ac8c41b60488935c529818bcf09fae6c0b0b0af9f1ff2e34050dda90d73955d5489b0e8db3262d4497638e0e0a SHA512 4b6b373deed4365cd91d3066453720c5a7a8373f90edfab5a25d5dfaedfbc753b9cfb37b615472dce876d44e9260290a1841bde97c5128c396193449cb8c070d AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7fef1bdf883873fe360816d8736835987a61c1cf0ac1be469aa47f2b74e96d8215a3ac17de896d6a5 SHA512 a77606d11e80c8d117917ab34a6d2ca430c667372ee713cf8519e49df4d972f289399d49bd808a9d31fa343d11c2fd2eb761b813be3f2892784d1dd9c281fc38 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540 +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-r10.ebuild 3405 BLAKE2B 6babcef442d1438f50f55acdd27e9750c3264f5dd46dbf794b2d62c75e58163fdb2d4a0eb0ec145615d395407777504790b56410cb6bc7907a385be32169cd91 SHA512 32b9435c7ff7df0f160eab21cea494de7c755045861f439133170a32e78216d4bc365a1825d09bfd5e56ceca314303e51bfe1e0547cd383143fadda7988c0389 +EBUILD rxvt-unicode-9.26-r10.ebuild 3414 BLAKE2B 7cd995add40946f67cf6b8b4179bd1bf17656a8f531d55b2579400670e57c64c3a1e493d35938562569b8b79a63bdba66918439ca2239de78980240de3d2edc8 SHA512 25cc1bb5932f7d93bbaba9bd7b11318ddc517c5a25273ddeccf31c2c620b83cea66c2ccac6b71ba7cd4ea00a69075a5039a652f3339caa233a745cb31f34a183 diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.26-enable-wide-glyphs.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.26-enable-wide-glyphs.patch new file mode 100644 index 0000000..31fd46d --- /dev/null +++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.26-enable-wide-glyphs.patch @@ -0,0 +1,271 @@ +diff -ur rxvt-unicode-9.26/config.h.in rxvt-unicode-9.26_wide/config.h.in +--- rxvt-unicode-9.26/config.h.in 2020-01-22 14:41:54.000000000 +0100 ++++ rxvt-unicode-9.26_wide/config.h.in 2021-07-13 19:50:20.006549931 +0200 +@@ -18,6 +18,9 @@ + /* Define if you want your background to use the parent window background */ + #undef ENABLE_TRANSPARENCY + ++/* Define if you want to display wide glyphs */ ++#undef ENABLE_WIDE_GLYPHS ++ + /* Define if you want european extended codesets */ + #undef ENCODING_EU + +diff -ur rxvt-unicode-9.26/configure rxvt-unicode-9.26_wide/configure +--- rxvt-unicode-9.26/configure 2021-05-14 15:50:48.000000000 +0200 ++++ rxvt-unicode-9.26_wide/configure 2021-07-13 20:12:01.802581704 +0200 +@@ -744,6 +744,7 @@ + enable_combining + enable_xft + enable_font_styles ++enable_wide_glyphs + enable_pixbuf + enable_startup_notification + enable_transparency +@@ -1425,6 +1426,7 @@ + --enable-combining enable composition of base and combining characters + --enable-xft enable xft support on systems that have it + --enable-font-styles enable bold and italic support ++ --enable-wide-glyphs enable displaying of wide glyphs + --enable-pixbuf enable integration with gdk-pixbuf for background images + --enable-startup-notification enable freedesktop startup notification support + --enable-transparency enable transparent backgrounds +@@ -5182,6 +5184,7 @@ + support_8bitctrls=no + support_iso14755=no + support_styles=no ++ support_wide_glyphs=no + support_perl=no + codesets= + fi +@@ -5210,6 +5213,7 @@ + #support_8bitctrls=yes + support_iso14755=yes + support_styles=yes ++ support_wide_glyphs=yes + support_perl=yes + codesets=all + fi +@@ -5319,6 +5323,14 @@ + fi + + ++# Check whether --enable-wide-glyphs was given. ++if test "${enable_wide_glyphs+set}" = set; then : ++ enableval=$enable_wide_glyphs; if test x$enableval = xyes -o x$enableval = xno; then ++ support_wide_glyphs=$enableval ++ fi ++fi ++ ++ + # Check whether --enable-pixbuf was given. + if test ${enable_pixbuf+y} + then : +@@ -8542,6 +8554,11 @@ + printf "%s\n" "#define ISO_14755 1" >>confdefs.h + + fi ++if test x$support_wide_glyphs = xyes; then ++ ++printf "%s\n" "#define ENABLE_WIDE_GLYPHS 1" >>confdefs.h ++ ++fi + if test x$support_8bitctrls = xyes; then + + printf "%s\n" "#define EIGHT_BIT_CONTROLS 1" >>confdefs.h +diff -ur rxvt-unicode-9.26/configure.ac rxvt-unicode-9.26_wide/configure.ac +--- rxvt-unicode-9.26/configure.ac 2021-05-13 21:40:55.000000000 +0200 ++++ rxvt-unicode-9.26_wide/configure.ac 2021-07-13 19:55:10.702557026 +0200 +@@ -134,6 +134,7 @@ + support_8bitctrls=no + support_iso14755=no + support_styles=no ++ support_wide_glyphs=no + support_perl=no + codesets= + fi +@@ -162,6 +163,7 @@ + #support_8bitctrls=yes + support_iso14755=yes + support_styles=yes ++ support_wide_glyphs=yes + support_perl=yes + codesets=all + fi +@@ -227,6 +229,12 @@ + support_styles=$enableval + fi]) + ++AC_ARG_ENABLE(wide-glyphs, ++ [ --enable-wide-glyphs enable displaying of wide glyphs], ++ [if test x$enableval = xyes -o x$enableval = xno; then ++ support_wide_glyphs=$enableval ++ fi]) ++ + AC_ARG_ENABLE(pixbuf, + [ --enable-pixbuf enable integration with gdk-pixbuf for background images], + [if test x$enableval = xyes -o x$enableval = xno; then +@@ -650,6 +658,9 @@ + if test x$support_styles = xyes; then + AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) + fi ++if test x$support_wide_glyphs = xyes; then ++ AC_DEFINE(ENABLE_WIDE_GLYPHS, 1, Define if you want to display wide glyphs) ++fi + if test x$support_iso14755 = xyes; then + AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) + fi +diff -ur rxvt-unicode-9.26/src/command.C rxvt-unicode-9.26_wide/src/command.C +--- rxvt-unicode-9.26/src/command.C 2021-05-13 21:40:55.000000000 +0200 ++++ rxvt-unicode-9.26_wide/src/command.C 2021-07-13 19:55:52.990558058 +0200 +@@ -237,7 +237,9 @@ + # endif + scr_overlay_set (11, y + 1, ch, r); + ++#if !ENABLE_WIDE_GLYPHS + if (WCWIDTH (ch) >= 2) ++#endif + scr_overlay_set (12, y + 1, NOCHAR, r); + } + +diff -ur rxvt-unicode-9.26/src/rxvtfont.C rxvt-unicode-9.26_wide/src/rxvtfont.C +--- rxvt-unicode-9.26/src/rxvtfont.C 2020-01-20 10:19:11.000000000 +0100 ++++ rxvt-unicode-9.26_wide/src/rxvtfont.C 2021-07-13 19:58:46.890562302 +0200 +@@ -471,6 +471,7 @@ + else + switch (t) + { ++ case ' ': + case '\t': + case ZERO_WIDTH_CHAR: + case NOCHAR: +@@ -1026,8 +1027,10 @@ + + careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; + ++#if !ENABLE_WIDE_GLYPHS + if (careful && !OVERLAP_OK (w, wcw, prop)) + return false; ++#endif + + return true; + } +@@ -1345,12 +1348,14 @@ + + careful = g.x > 0 || w > prop->width * wcw; + ++#if !ENABLE_WIDE_GLYPHS + if (careful && !OVERLAP_OK (w, wcw, prop)) + return false; + + // this weeds out _totally_ broken fonts, or glyphs + if (!OVERLAP_OK (g.xOff, wcw, prop)) + return false; ++#endif + + return true; + } +@@ -1395,6 +1400,10 @@ + + ep->glyph = glyph; + ep->x = x_ + (cwidth - extents.xOff >> 1); ++#if ENABLE_WIDE_GLYPHS ++ /* Left-align to bounding box, do not overlap to the left. */ ++ max_it(ep->x, x_); ++#endif + ep->y = y_ + ascent; + + if (extents.xOff == 0) +diff -ur rxvt-unicode-9.26/src/screen.C rxvt-unicode-9.26_wide/src/screen.C +--- rxvt-unicode-9.26/src/screen.C 2021-05-13 21:40:55.000000000 +0200 ++++ rxvt-unicode-9.26_wide/src/screen.C 2021-07-13 20:01:29.694566276 +0200 +@@ -936,7 +936,61 @@ + # endif + #endif + +- rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); ++ rend_t rend; ++#if ENABLE_WIDE_GLYPHS ++ // Re-use previous font for space characters. ++ // This allows for better display of wider chars with regard to ++ // backtracking (which uses RS_SAME). ++ if (c != ' ') ++ { ++#endif ++ rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); ++#if ENABLE_WIDE_GLYPHS ++ ++ } ++ else ++ { ++ // Code taken from ENABLE_COMBINING - might get refactored. ++ line_t *linep; ++ text_t *tp; ++ rend_t *rp = NULL; ++ ++ if (screen.cur.col > 0) ++ { ++ linep = line; ++ tp = line->t + screen.cur.col - 1; ++ rp = line->r + screen.cur.col - 1; ++ } ++ else if (screen.cur.row > 0 ++ && ROW(screen.cur.row - 1).is_longer ()) ++ { ++ linep = &ROW(screen.cur.row - 1); ++ tp = linep->t + ncol - 1; ++ rp = linep->r + ncol - 1; ++ } ++ ++ if (rp) ++ { ++ // XXX: this font does not show up in iso-14755 mode for the space!? ++ if (*tp == NOCHAR) ++ { ++ while (*tp == NOCHAR && tp > linep->t) ++ tp--, rp--; ++ ++ // first try to find a precomposed character ++ unicode_t n = rxvt_compose (*tp, c); ++ if (n == NOCHAR) ++ n = rxvt_composite.compose (*tp, c); ++ ++ *tp = n; ++ *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); ++ } ++ rend = SET_FONT (rstyle, GET_FONT(*rp)); ++ } ++ else ++ rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); ++ } ++#endif + + // if the character doesn't fit into the remaining columns... + if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) +@@ -2395,7 +2449,12 @@ + text--, count++, xpixel -= fwidth; + + // force redraw after "careful" characters to avoid pixel droppings +- for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) ++ for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1 ++#if ENABLE_WIDE_GLYPHS ++ // But not for spaces. ++ && stp[col + i + 1] != ' ' ++#endif ++ ; i++) + drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; + + // force redraw before "careful" characters to avoid pixel droppings +diff -ur rxvt-unicode-9.26/src/xdefaults.C rxvt-unicode-9.26_wide/src/xdefaults.C +--- rxvt-unicode-9.26/src/xdefaults.C 2019-09-17 22:38:30.000000000 +0200 ++++ rxvt-unicode-9.26_wide/src/xdefaults.C 2021-07-13 20:02:34.230567851 +0200 +@@ -294,6 +294,9 @@ + #if ENABLE_STYLES + "styles," + #endif ++#if ENABLE_WIDE_GLYPHS ++ "wide-glyphs," ++#endif + #if ENABLE_COMBINING + "combining," + #endif diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r10.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r10.ebuild new file mode 100644 index 0000000..991b538 --- /dev/null +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r10.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop flag-o-matic systemd prefix + +COLOUR_PATCH_NAME="${PN}-9.26_24-bit-color_aur-20210516+eautoreconf.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/${PN}/${COLOUR_PATCH_NAME}.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" +IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel + +perl smart-resize startup-notification unicode3 +utmp +wide-glyphs +wtmp xft" + +RDEPEND=">=sys-libs/ncurses-5.7-r6:= + media-libs/fontconfig + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + gdk-pixbuf? ( x11-libs/gdk-pixbuf ) + kernel_Darwin? ( dev-perl/Mac-Pasteboard ) + perl? ( dev-lang/perl:= ) + startup-notification? ( x11-libs/startup-notification ) + xft? ( x11-libs/libXft )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" +# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-07-07) if eautoreconf has to be called + +PATCHES=( + "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch + "${FILESDIR}"/${PN}-9.21-xsubpp.patch + "${FILESDIR}"/${PN}-9.22-font-width-fix.patch + "${FILESDIR}"/${PN}-9.22-line-spacing-fix.patch + "${FILESDIR}"/${PN}-9.26-enable-wide-glyphs.patch + "${FILESDIR}"/${PN}-9.22-add-space-to-extent_test_chars.patch +) +DOCS=( + Changes + README.FAQ + doc/README.xvt + doc/changes.txt + doc/etc/${PN}.term{cap,info} + doc/rxvt-tabbed +) + +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" + + # use xsubpp from Prefix - #506500 + hprefixify -q '"' -w "/xsubpp/" src/Makefile.in +} + +src_configure() { + # --enable-everything goes first: the order of the arguments matters + local myconf=( + --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 smart-resize) \ + $(use_enable startup-notification) + $(use_enable unicode3) + $(use_enable utmp) + $(use_enable wide-glyphs) \ + $(use_enable wtmp) + $(use_enable xft) + ) + econf "${myconf[@]}" +} + +src_compile() { + default + + sed -i \ + -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \ + "${S}"/doc/rxvt-tabbed || die +} + +src_install() { + default + + systemd_douserunit "${FILESDIR}"/urxvtd.service + systemd_douserunit "${FILESDIR}"/urxvtd.socket + + make_desktop_entry urxvt rxvt-unicode utilities-terminal \ + "System;TerminalEmulator" +} + +pkg_postinst() { + if use 24-bit-color; then + ewarn + ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE." + ewarn "You may or may not encounter visual glitches or stability issues. When in doubt," + ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)." + ewarn + fi +}