diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | patchfile | 25 |
3 files changed, 32 insertions, 18 deletions
@@ -1,7 +1,7 @@ pkgbase = dmenu-bud pkgdesc = Generic menu for X. Patched to fit i3menu - pkgver = 5.2 - pkgrel = 2 + pkgver = 5.2.1 + pkgrel = 1 url = https://github.com/budRich/dmenu arch = x86_64 license = MIT @@ -19,8 +19,8 @@ pkgbase = dmenu-bud source = https://dl.suckless.org/tools/dmenu-5.2.tar.gz source = patchfile sha512sums = 7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3 - sha512sums = d9ca2a491804144fa80bbd46d80f11883be8bb84395e748129b1062193243b6b604d2cb065c32c90a8e49073eda406ef88652a254654250cc2fff4d7933048dc + sha512sums = 4d8a8b3f4c5785d45a6f8a2f5fcaf24126d3a46fe678c4702dc63b930d6375e30526f84184ae70005ea4404300af07e62690aa8cb3d183366c2942ce197e498e b2sums = f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d - b2sums = aff1060fe22d7169b27162d7ce4d65bdcc73f9cb6d2fa62a2d47de44939ae8d090debf9041b9556fb6d674f7adb4fe09217cfa1223c607f21e0bac539008472d + b2sums = 2d267a10bb0fe1c515fbc3ae3239f5413861be5c4fdc81ef4acfcfc4b6fcf2ebf4f6d50b2d7b1a009ef925f68a0db58e03cb5fb5b685539a186a476abd2a4019 pkgname = dmenu-bud @@ -1,8 +1,9 @@ # Maintainer: bud pkgname=dmenu-bud -pkgver=5.2 -pkgrel=2 +pkgver=5.2.1 +_upstream_ver=5.2 +pkgrel=1 pkgdesc='Generic menu for X. Patched to fit i3menu' url='https://github.com/budRich/dmenu' arch=('x86_64') @@ -10,14 +11,14 @@ license=('MIT') depends=('sh' 'glibc' 'coreutils' 'libx11' 'libxinerama' 'libxft' 'freetype2' 'fontconfig' 'libfontconfig.so') provides=(dmenu) conflicts=(dmenu) -source=(https://dl.suckless.org/tools/dmenu-${pkgver}.tar.gz patchfile) +source=(https://dl.suckless.org/tools/dmenu-${_upstream_ver}.tar.gz patchfile) sha512sums=('7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3' - 'd9ca2a491804144fa80bbd46d80f11883be8bb84395e748129b1062193243b6b604d2cb065c32c90a8e49073eda406ef88652a254654250cc2fff4d7933048dc') + '4d8a8b3f4c5785d45a6f8a2f5fcaf24126d3a46fe678c4702dc63b930d6375e30526f84184ae70005ea4404300af07e62690aa8cb3d183366c2942ce197e498e') b2sums=('f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d' - 'aff1060fe22d7169b27162d7ce4d65bdcc73f9cb6d2fa62a2d47de44939ae8d090debf9041b9556fb6d674f7adb4fe09217cfa1223c607f21e0bac539008472d') + '2d267a10bb0fe1c515fbc3ae3239f5413861be5c4fdc81ef4acfcfc4b6fcf2ebf4f6d50b2d7b1a009ef925f68a0db58e03cb5fb5b685539a186a476abd2a4019') prepare() { - cd dmenu-${pkgver} + cd dmenu-${_upstream_ver} patch -p1 -i ../patchfile echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk echo "CFLAGS+=${CFLAGS}" >> config.mk @@ -25,7 +26,7 @@ prepare() { } build() { - cd dmenu-${pkgver} + cd dmenu-${_upstream_ver} make \ X11INC=/usr/include/X11 \ X11LIB=/usr/lib/X11 \ @@ -33,7 +34,7 @@ build() { } package() { - cd dmenu-${pkgver} + cd dmenu-${_upstream_ver} make PREFIX=/usr DESTDIR="${pkgdir}" install install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/patchfile b/patchfile index 44d93f3a30ff..307aa95d6d2c 100644 --- a/patchfile +++ b/patchfile @@ -49,7 +49,7 @@ index 323f93c..6b83752 100644 .TP .B Return diff --git a/dmenu.c b/dmenu.c -index 62f1089..f0ae44c 100644 +index 62f1089..f427aea 100644 --- a/dmenu.c +++ b/dmenu.c @@ -27,6 +27,7 @@ @@ -127,7 +127,22 @@ index 62f1089..f0ae44c 100644 } draw: -@@ -677,6 +687,16 @@ setup(void) +@@ -636,7 +646,13 @@ setup(void) + /* calculate menu geometry */ + bh = drw->fonts->h + 2; + lines = MAX(lines, 0); +- mh = (lines + 1) * bh; ++ ++ if (bl_h != NotSet) { ++ lines = MIN(bl_h/(bh+1), lines); ++ mh = bl_h; ++ } else ++ mh = (lines + 1) * bh; ++ + #ifdef XINERAMA + i = 0; + if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { +@@ -677,6 +693,14 @@ setup(void) y = topbar ? 0 : wa.height - mh; mw = wa.width; } @@ -138,13 +153,11 @@ index 62f1089..f0ae44c 100644 + y = bl_y; + if (bl_w != NotSet) + mw = bl_w; -+ if (bl_h != NotSet) -+ mh = bl_h; + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; inputw = mw / 3; /* input width: ~33% of monitor width */ match(); -@@ -717,7 +737,8 @@ static void +@@ -717,7 +741,8 @@ static void usage(void) { die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" @@ -154,7 +167,7 @@ index 62f1089..f0ae44c 100644 } int -@@ -759,6 +780,19 @@ main(int argc, char *argv[]) +@@ -759,6 +784,19 @@ main(int argc, char *argv[]) colors[SchemeSel][ColFg] = argv[++i]; else if (!strcmp(argv[i], "-w")) /* embedding window id */ embed = argv[++i]; |