summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2019-04-20 20:15:18 +0200
committer Matteo Bernardini2019-12-07 19:16:21 +0100
commit0d41e419b8f498f74cdfd047231f7df37fbf0311 (patch)
tree4b7a14f6f9aab3d677eec1a71d4291c86fc6a7fb
parent4b7b01aae75cc2cc8db1eedc90b43f8400bef53e (diff)
downloadslackbuilds-dwm.tar.gz
desktop/dwm: Remove a patch not necessary on current.dwm
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--desktop/dwm/dwm.SlackBuild3
-rw-r--r--desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch45
2 files changed, 0 insertions, 48 deletions
diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild
index 4d74682d80..275853fcdf 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--
-
-