diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | dmenu-revert-IME-support.diff | 30 |
3 files changed, 9 insertions, 44 deletions
@@ -1,7 +1,7 @@ pkgbase = dmenu-height pkgdesc = Generic menu for X, with added height setting - pkgver = 4.9 - pkgrel = 3 + pkgver = 5.0 + pkgrel = 1 url = http://tools.suckless.org/dmenu/ arch = x86_64 license = MIT @@ -11,12 +11,10 @@ pkgbase = dmenu-height depends = freetype2 provides = dmenu conflicts = dmenu - source = https://dl.suckless.org/tools/dmenu-4.9.tar.gz + source = https://dl.suckless.org/tools/dmenu-5.0.tar.gz source = https://tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-4.9.diff - source = dmenu-revert-IME-support.diff - sha256sums = b3971f4f354476a37b2afb498693649009b201550b0c7c88e866af8132b64945 + sha256sums = fe18e142c4dbcf71ba5757dbbdea93b1c67d58fc206fc116664f4336deef6ed3 sha256sums = 4f7f6f46b23cbc3f38bcc7eff24a0cb74b8bc8651c2de29aa3adc4f16b4dc06c - sha256sums = 433c3d66554f68258bd9140fdbbd75be8934e27cf0b2cc3becf08f3bc1c8b091 pkgname = dmenu-height @@ -1,8 +1,8 @@ # vim:ts=4:sw=4:expandtab # Maintainer: milaq <micha.laqua@gmail.com> pkgname=dmenu-height -pkgver=4.9 -pkgrel=3 +pkgver=5.0 +pkgrel=1 pkgdesc="Generic menu for X, with added height setting" arch=('x86_64') url="http://tools.suckless.org/dmenu/" @@ -11,15 +11,12 @@ provides=('dmenu') depends=('sh' 'libxinerama' 'libxft' 'freetype2') conflicts=('dmenu') source=("https://dl.suckless.org/tools/dmenu-$pkgver.tar.gz" - "https://tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-4.9.diff" - "dmenu-revert-IME-support.diff") -sha256sums=('b3971f4f354476a37b2afb498693649009b201550b0c7c88e866af8132b64945' - '4f7f6f46b23cbc3f38bcc7eff24a0cb74b8bc8651c2de29aa3adc4f16b4dc06c' - '433c3d66554f68258bd9140fdbbd75be8934e27cf0b2cc3becf08f3bc1c8b091') + "https://tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-4.9.diff") +sha256sums=('fe18e142c4dbcf71ba5757dbbdea93b1c67d58fc206fc116664f4336deef6ed3' + '4f7f6f46b23cbc3f38bcc7eff24a0cb74b8bc8651c2de29aa3adc4f16b4dc06c') prepare() { cd "$srcdir/dmenu-$pkgver" patch -p1 -i "$srcdir/dmenu-lineheight-4.9.diff" - patch -p1 -i "$srcdir/dmenu-revert-IME-support.diff" } build() { diff --git a/dmenu-revert-IME-support.diff b/dmenu-revert-IME-support.diff deleted file mode 100644 index a7eb982a0af5..000000000000 --- a/dmenu-revert-IME-support.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/dmenu.c b/dmenu.c -index 6b8f51b..d7597c6 100644 ---- a/dmenu.c -+++ b/dmenu.c -@@ -553,7 +553,7 @@ run(void) - XEvent ev; - - while (!XNextEvent(dpy, &ev)) { -- if (XFilterEvent(&ev, None)) -+ if (XFilterEvent(&ev, win)) - continue; - switch(ev.type) { - case Expose: -@@ -665,7 +665,6 @@ setup(void) - XNClientWindow, win, XNFocusWindow, win, NULL); - - XMapRaised(dpy, win); -- XSetInputFocus(dpy, win, RevertToParent, CurrentTime); - if (embed) { - XSelectInput(dpy, parentwin, FocusChangeMask); - if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { -@@ -731,8 +730,6 @@ main(int argc, char *argv[]) - - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); -- if (!XSetLocaleModifiers("")) -- fputs("warning: no locale modifiers support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); |