From 91ca898ef29efe0304d37eabbe3fcb2a13c603dd Mon Sep 17 00:00:00 2001
From: gryf <git@vimja.com>
Date: Tue, 26 Jan 2021 17:02:05 +0100
Subject: [PATCH] Correct patches for urxvt.

---
 ...rxvt-unicode-9.22-enable-wide-glyphs.patch | 29 -------------------
 .../rxvt-unicode-9.22-line-spacing-fix.patch  | 25 ----------------
 .../rxvt-unicode/rxvt-unicode-9.22-r10.ebuild |  2 +-
 3 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-enable-wide-glyphs.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-enable-wide-glyphs.patch
index 69f6457..be366ea 100644
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-enable-wide-glyphs.patch
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-enable-wide-glyphs.patch
@@ -176,32 +176,6 @@ diff -ur rxvt-unicode-9.22-a/src/rxvtfont.C rxvt-unicode-9.22-b/src/rxvtfont.C
            ep->y = y_ + ascent;
  
            if (extents.xOff == 0)
-diff -ur rxvt-unicode-9.22-a/src/rxvtfont.C.orig rxvt-unicode-9.22-b/src/rxvtfont.C.orig
---- rxvt-unicode-9.22-a/src/rxvtfont.C.orig	2021-01-26 13:38:12.669879617 +0100
-+++ rxvt-unicode-9.22-b/src/rxvtfont.C.orig	2021-01-26 13:39:13.257880354 +0100
-@@ -1239,11 +1239,22 @@
- 
-       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);
 diff -ur rxvt-unicode-9.22-a/src/screen.C rxvt-unicode-9.22-b/src/screen.C
 --- rxvt-unicode-9.22-a/src/screen.C	2016-01-18 20:35:08.000000000 +0100
 +++ rxvt-unicode-9.22-b/src/screen.C	2021-01-26 13:41:32.889882053 +0100
@@ -295,6 +269,3 @@ diff -ur rxvt-unicode-9.22-a/src/xdefaults.C rxvt-unicode-9.22-b/src/xdefaults.C
  #if ENABLE_COMBINING
                                      "combining,"
  #endif
-Only in rxvt-unicode-9.22-b/src: xdefaults.C.orig
-Only in rxvt-unicode-9.22-b: wide-glyphs-after.png
-Only in rxvt-unicode-9.22-b: wide-glyphs-before.png
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-line-spacing-fix.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-line-spacing-fix.patch
index 74a7de1..19588dd 100644
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-line-spacing-fix.patch
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-line-spacing-fix.patch
@@ -24,28 +24,3 @@ diff -ur rxvt-unicode-9.22-a/src/rxvtfont.C rxvt-unicode-9.22-b/src/rxvtfont.C
        bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
  
        XftUnlockFace (f);
-diff -ur rxvt-unicode-9.22-a/src/rxvtfont.C.orig rxvt-unicode-9.22-b/src/rxvtfont.C.orig
---- rxvt-unicode-9.22-a/src/rxvtfont.C.orig	2015-09-07 16:49:33.000000000 +0200
-+++ rxvt-unicode-9.22-b/src/rxvtfont.C.orig	2021-01-26 13:38:12.669879617 +0100
-@@ -1267,12 +1267,21 @@
-           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;
-         }
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r10.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r10.ebuild
index 9400c61..32a4983 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r10.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r10.ebuild
@@ -37,11 +37,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
 	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
 	"${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch
+	"${WORKDIR}"/${COLOUR_PATCH_NAME}
 	"${FILESDIR}"/${PN}-9.22-font-width-fix.patch
 	"${FILESDIR}"/${PN}-9.22-line-spacing-fix.patch
 	"${FILESDIR}"/${PN}-9.22-enable-wide-glyphs.patch
 	"${FILESDIR}"/${PN}-9.22-add-space-to-extent_test_chars.patch
-	"${WORKDIR}"/${COLOUR_PATCH_NAME}
 )
 DOCS=(
 	Changes