From cfa130d5944650edbdb6e9bc58330f2163ab107d Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 6 Jul 2019 17:53:53 +0200
Subject: 20190706.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 desktop/dwm/dwm.SlackBuild                         |  3 --
 .../dwm/sbo-patches/0001-Prepare-6.2-release.patch | 45 ----------------------
 2 files changed, 48 deletions(-)
 delete mode 100644 desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch

(limited to 'desktop/dwm')

diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild
index 06a0579171..0587f25376 100644
--- a/desktop/dwm/dwm.SlackBuild
+++ b/desktop/dwm/dwm.SlackBuild
@@ -111,9 +111,6 @@ find -L . \
 #  patch -p0 < $CWD/patches/$i
 #done
 
-# Reverse commit to continue support for fontconfig 2.11.1
-patch -R -p1 <$CWD/sbo-patches/0001-Prepare-6.2-release.patch
-
 ## Fix options for our compilers,
 ## thanks to Brenton Earl.
 sed -i \
diff --git a/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch b/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch
deleted file mode 100644
index 22da3facea..0000000000
--- a/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/drw.c b/drw.c
-index c638323..8fd1ca4 100644
---- a/drw.c
-+++ b/drw.c
-@@ -132,6 +132,19 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
- 		die("no font specified.");
- 	}
- 
-+	/* Do not allow using color fonts. This is a workaround for a BadLength
-+	 * error from Xft with color glyphs. Modelled on the Xterm workaround. See
-+	 * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
-+	 * https://lists.suckless.org/dev/1701/30932.html
-+	 * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
-+	 * and lots more all over the internet.
-+	 */
-+	FcBool iscol;
-+	if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
-+		XftFontClose(drw->dpy, xfont);
-+		return NULL;
-+	}
-+
- 	font = ecalloc(1, sizeof(Fnt));
- 	font->xfont = xfont;
- 	font->pattern = pattern;
-@@ -200,7 +213,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
- 	Clr *ret;
- 
- 	/* need at least two colors for a scheme */
--	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr))))
-+	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
- 		return NULL;
- 
- 	for (i = 0; i < clrcount; i++)
-@@ -337,6 +350,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
- 			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
- 			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
- 			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-+			FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
- 
- 			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
- 			FcDefaultSubstitute(fcpattern);
-
---------------false--
-
-
-- 
cgit v1.2.3