use upstream lineheight patch again

3 files changed, 7 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8430607f1ef8..ad184b01eeb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dmenu-height
 	pkgdesc = Generic menu for X, with added height setting
 	pkgver = 4.9
-	pkgrel = 1
+	pkgrel = 2
 	url = http://tools.suckless.org/dmenu/
 	arch = x86_64
 	license = MIT
@@ -12,9 +12,9 @@ pkgbase = dmenu-height
 	provides = dmenu
 	conflicts = dmenu
 	source = https://dl.suckless.org/tools/dmenu-4.9.tar.gz
-	source = dmenu-lineheight.diff
+	source = https://tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-4.9.diff
 	sha256sums = b3971f4f354476a37b2afb498693649009b201550b0c7c88e866af8132b64945
-	sha256sums = 724fcbe8f3c6e4392d3b6a0a4fa6e34c0a3641745e296eed902e561926529d97
+	sha256sums = 4f7f6f46b23cbc3f38bcc7eff24a0cb74b8bc8651c2de29aa3adc4f16b4dc06c
 
 pkgname = dmenu-height
 
diff --git a/PKGBUILD b/PKGBUILD
index c6110b3aa872..68beead2d57e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: milaq <micha.laqua@gmail.com>
 pkgname=dmenu-height
 pkgver=4.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Generic menu for X, with added height setting"
 arch=('x86_64')
 url="http://tools.suckless.org/dmenu/"
@@ -11,12 +11,12 @@ provides=('dmenu')
 depends=('sh' 'libxinerama' 'libxft' 'freetype2')
 conflicts=('dmenu')
 source=("https://dl.suckless.org/tools/dmenu-$pkgver.tar.gz"
-        "dmenu-lineheight.diff")
+        "https://tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-4.9.diff")
 sha256sums=('b3971f4f354476a37b2afb498693649009b201550b0c7c88e866af8132b64945'
-            '724fcbe8f3c6e4392d3b6a0a4fa6e34c0a3641745e296eed902e561926529d97')
+            '4f7f6f46b23cbc3f38bcc7eff24a0cb74b8bc8651c2de29aa3adc4f16b4dc06c')
 prepare() {
     cd "$srcdir/dmenu-$pkgver"
-    patch -p1 -i "$srcdir/dmenu-lineheight.diff"
+    patch -p1 -i "$srcdir/dmenu-lineheight-4.9.diff"
 }
 
 build() {
diff --git a/dmenu-lineheight.diff b/dmenu-lineheight.diff
deleted file mode 100644
index 0941c0eba8c5..000000000000
--- a/dmenu-lineheight.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index a9122f7..6d936b7 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -16,4 +16,5 @@
- /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
- static unsigned int lines      = 0;
-+static unsigned int lineheight = 0;         /* -h option; minimum height of a menu line     */
- 
- /*
-diff --git a/dmenu.1 b/dmenu.1
-index d3ab805..9fe4434 100644
---- a/dmenu.1
-+++ b/dmenu.1
-@@ -50,6 +50,9 @@ dmenu matches menu items case insensitively.
- .BI \-l " lines"
- dmenu lists items vertically, with the given number of lines.
- .TP
-+.BI \-h " height"
-+dmenu uses a menu line of at least 'height' pixels tall, but no less than 8.
-+.TP
- .BI \-m " monitor"
- dmenu is displayed on the monitor number supplied. Monitor numbers are starting
- from 0.
-diff --git a/dmenu.c b/dmenu.c
-index a07f8e3..25832a7 100644
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -130,7 +130,7 @@ drawmenu(void)
- {
- 	unsigned int curpos;
- 	struct item *item;
--	int x = 0, y = 0, w;
-+	int x = 0, y = 0, fh = drw->fonts->h, w;
- 
- 	drw_setscheme(drw, scheme[SchemeNorm]);
- 	drw_rect(drw, 0, 0, mw, mh, 1, 1);
-@@ -146,9 +146,9 @@ drawmenu(void)
- 	drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
- 
-	curpos = TEXTW(text) - TEXTW(&text[cursor]);
- 	if ((curpos += lrpad / 2 - 1) < w) {
- 		drw_setscheme(drw, scheme[SchemeNorm]);
--		drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
-+		drw_rect(drw, x + curpos, 2 + (bh-fh)/2, 2, fh - 4, 1, 0);
- 	}
- 
- 	if (lines > 0) {
-@@ -676,7 +676,8 @@ setup(void)
- 	utf8 = XInternAtom(dpy, "UTF8_STRING", False);
- 
- 	/* calculate menu geometry */
- 	bh = drw->fonts->h + 2;
-+	bh = MAX(bh,lineheight);	/* make a menu line AT LEAST 'lineheight' tall */
- 	lines = MAX(lines, 0);
- 	mh = (lines + 1) * bh;
- #ifdef XINERAMA
-@@ -754,6 +755,7 @@ setup(void)
- usage(void)
- {
- 	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-+	      "             [-h height]\n"
- 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
- 	exit(1);
- }
-@@ -787,6 +789,10 @@ main(int argc, char *argv[])
- 			prompt = argv[++i];
- 		else if (!strcmp(argv[i], "-fn"))  /* font or font set */
- 			fonts[0] = argv[++i];
-+		else if(!strcmp(argv[i], "-h")) { /* minimum height of one menu line */
-+			lineheight = atoi(argv[++i]);
-+			lineheight = MAX(lineheight,8); /* reasonable default in case of value too small/negative */
-+		}
- 		else if (!strcmp(argv[i], "-nb"))  /* normal background color */
- 			normbgcolor = argv[++i];
- 		else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */