commit: 883ee03b7dd0ae18fa66395624421555e176246a Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Wed Apr 10 17:27:18 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Wed Apr 10 17:27:18 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=883ee03b
x11-terms/rxvt-unicode: ~arch now supported with main tree Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> x11-terms/rxvt-unicode/Manifest | 1 - .../files/rxvt-unicode-9.22-font-width-fix.patch | 38 ---------- .../rxvt-unicode-9.22-line-spaceing-fix.patch | 40 ---------- x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild | 88 ---------------------- 4 files changed, 167 deletions(-) diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index ab3f3b6..4eafb1e 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -1,2 +1 @@ DIST rxvt-unicode-9.21.tar.bz2 925293 SHA256 75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b SHA512 d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776 WHIRLPOOL 92499cfa0ca154d3cbe1d7b6525e01de6a5d14677a28c605a6b676c88f1d9bc0f6cd663a1f1d8b003ac7cc46a9c6fbe49ff9adc7b3dd63eb345c80de9038a6ad -DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-font-width-fix.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-font-width-fix.patch deleted file mode 100644 index b495778..0000000 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-font-width-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3a0f53449431004b50125cef17803d4431c6affa Mon Sep 17 00:00:00 2001 -From: -Date: Wed, 10 Apr 2019 01:30:24 -0500 -Subject: [PATCH 1/2] don't use g.width as a width of a character! - ---- - src/rxvtfont.C | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/rxvtfont.C b/src/rxvtfont.C -index 1914539..90377a7 100644 ---- a/src/rxvtfont.C -+++ b/src/rxvtfont.C -@@ -1267,12 +1267,21 @@ rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) - XGlyphInfo g; - XftTextExtents16 (disp, f, &ch, 1, &g); - -+/* -+ * bukind: don't use g.width as a width of a character! -+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial -+ - g.width -= g.x; - - int wcw = WCWIDTH (ch); - if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; - - if (width < g.width ) width = g.width; -+ */ -+ int wcw = WCWIDTH (ch); -+ if (wcw > 1) g.xOff = g.xOff / wcw; -+ if (width < g.xOff) width = g.xOff; -+ - if (height < g.height ) height = g.height; - if (glheight < g.height - g.y) glheight = g.height - g.y; - } --- -2.21.0 - diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-line-spaceing-fix.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-line-spaceing-fix.patch deleted file mode 100644 index cf1d918..0000000 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-line-spaceing-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0a3f38b4f7199391437edf903bb803a90cd4f2f3 Mon Sep 17 00:00:00 2001 -From: -Date: Wed, 10 Apr 2019 01:31:16 -0500 -Subject: [PATCH 2/2] use ascent, descent and height from XftFont *f instead of - FT_Face face. - ---- - src/rxvtfont.C | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/rxvtfont.C b/src/rxvtfont.C -index 90377a7..e80aa63 100644 ---- a/src/rxvtfont.C -+++ b/src/rxvtfont.C -@@ -1239,11 +1239,22 @@ rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) - - FT_Face face = XftLockFace (f); - -+/* -+ * use ascent, descent and height from XftFont *f instead of FT_Face face. -+ * this somehow reproduces the behaviour of the line height as seen on xterm. -+ - ascent = (face->size->metrics.ascender + 63) >> 6; - descent = (-face->size->metrics.descender + 63) >> 6; - height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); - width = 0; - -+ */ -+ -+ ascent = f->ascent; -+ descent = f->descent; -+ height = max (ascent + descent, f->height); -+ width = 0; -+ - bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; - - XftUnlockFace (f); --- -2.21.0 - diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild deleted file mode 100644 index c843400..0000000 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils - -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"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" -IUSE=" - 256-color blink fading-colors +font-styles iso14755 +mousewheel +perl - pixbuf startup-notification unicode3 xft -" -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r6:= - kernel_Darwin? ( dev-perl/Mac-Pasteboard ) - media-libs/fontconfig - perl? ( dev-lang/perl:= ) - pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) - startup-notification? ( x11-libs/startup-notification ) - x11-libs/libX11 - x11-libs/libXrender - xft? ( x11-libs/libXft ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -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-spaceing-fix.patch -) - -src_prepare() { - default - - # kill the rxvt-unicode terminfo file - #192083 - sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" - - eautoreconf -} - -src_configure() { - # --enable-everything goes first: the order of the arguments matters - econf \ - --enable-everything \ - $(use_enable 256-color) \ - $(use_enable blink text-blink) \ - $(use_enable fading-colors fading) \ - $(use_enable font-styles) \ - $(use_enable iso14755) \ - $(use_enable mousewheel) \ - $(use_enable perl) \ - $(use_enable pixbuf) \ - $(use_enable startup-notification) \ - $(use_enable unicode3) \ - $(use_enable xft) \ - $(use_enable !elibc_musl utmp) \ - $(use_enable !elibc_musl wtmp) \ - $(use_enable !elibc_musl lastlog) -} - -src_compile() { - default - - sed -i \ - -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \ - "${S}"/doc/rxvt-tabbed || die -} - -src_install() { - default - - dodoc \ - README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed - - make_desktop_entry urxvt rxvt-unicode utilities-terminal \ - "System;TerminalEmulator" -}
