up to 5.0

diff --git a/dmenu.spec b/dmenu.spec
index 33549e108628939267cbe96dc4919459e4274517..05adc4b7d3301bdcca8d826a828a68a1a988e585 100644 (file)
--- a/dmenu.spec
+++ b/dmenu.spec
@@ -2,15 +2,12 @@ Summary:      dmenu - a generic menu for X
 Summary(hu.UTF-8):     dmenu egy általános menü X-hez
 Summary(pl.UTF-8):     System menu dla X
 Name:          dmenu
-Version:       4.9
-Release:       2
+Version:       5.0
+Release:       1
 License:       MIT
 Group:         Applications
 Source0:       http://dl.suckless.org/tools/%{name}-%{version}.tar.gz
-# Source0-md5: 9a537ec9a3a2ce9f08963d66b56cc030
-Patch0:                fix-crash-when-XOpenIM-returns-NULL.patch
-Patch1:                improve-xopenim-error-message.patch
-Patch2:                revert-IME-support.patch
+# Source0-md5: 614404940441e36fef8ecc533ad9ba96
 URL:           http://tools.suckless.org/dmenu
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel
@@ -38,9 +35,6 @@ użytkownika pozycji menu.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 cat << 'EOF' >> config.mk

diff --git a/fix-crash-when-XOpenIM-returns-NULL.patch b/fix-crash-when-XOpenIM-returns-NULL.patch
deleted file mode 100644 (file)
index 919035a..0000000
--- a/fix-crash-when-XOpenIM-returns-NULL.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f5036b90efd9423d805923a0bc73cd54e30e72ab Mon Sep 17 00:00:00 2001
-From: Hiltjo Posthuma <hiltjo@codemadness.org>
-Date: Tue, 12 Feb 2019 19:10:43 +0100
-Subject: [PATCH 2/5] fix crash when XOpenIM returns NULL
-
-for example when IME variables are set, but the program is not started (yet).
-
-Signed-off-by: Jan Palus <atler@pld-linux.org>
----
- dmenu.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/dmenu.c b/dmenu.c
-index f803149..ae56f4f 100644
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -664,8 +664,17 @@ setup(void)
-                           CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
-       XSetClassHint(dpy, win, &ch);
- 
--      /* open input methods */
--      xim = XOpenIM(dpy, NULL, NULL, NULL);
-+
-+      /* input methods */
-+      if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) {
-+              XSetLocaleModifiers("@im=local");
-+              if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) {
-+                      XSetLocaleModifiers("@im=");
-+                      if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
-+                              die("XOpenIM failed. Could not open input device.\n");
-+              }
-+      }
-+
-       xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
-                       XNClientWindow, win, XNFocusWindow, win, NULL);
- 
--- 
-2.25.1
-

diff --git a/improve-xopenim-error-message.patch b/improve-xopenim-error-message.patch
deleted file mode 100644 (file)
index f596736..0000000
--- a/improve-xopenim-error-message.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a9b1de384ae1ad30805e893af5cd6ea9b87c89da Mon Sep 17 00:00:00 2001
-From: Hiltjo Posthuma <hiltjo@codemadness.org>
-Date: Tue, 12 Feb 2019 22:58:35 +0100
-Subject: [PATCH 4/5] improve xopenim error message
-
-die() already prints a newline.
-
-Signed-off-by: Jan Palus <atler@pld-linux.org>
----
- dmenu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dmenu.c b/dmenu.c
-index ae56f4f..3bfd74d 100644
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -671,7 +671,7 @@ setup(void)
-               if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) {
-                       XSetLocaleModifiers("@im=");
-                       if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
--                              die("XOpenIM failed. Could not open input device.\n");
-+                              die("XOpenIM failed: could not open input device");
-               }
-       }
- 
--- 
-2.25.1
-

diff --git a/revert-IME-support.patch b/revert-IME-support.patch
deleted file mode 100644 (file)
index 909e3a1..0000000
--- a/revert-IME-support.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From db6093f6ec1bb884f7540f2512935b5254750b30 Mon Sep 17 00:00:00 2001
-From: Hiltjo Posthuma <hiltjo@codemadness.org>
-Date: Sun, 3 Mar 2019 13:08:54 +0100
-Subject: [PATCH] revert IME support
-
-dmenu will not handle IME support (st will, atleast for now).
-
-revert parts of commit 377bd37e212b1ec4c03a481245603c6560d0be22
-this commit also broke input focus.
----
- dmenu.c | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/dmenu.c b/dmenu.c
-index 3bfd74d..65f25ce 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 DestroyNotify:
-@@ -666,20 +666,13 @@ setup(void)
- 
- 
-       /* input methods */
--      if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) {
--              XSetLocaleModifiers("@im=local");
--              if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) {
--                      XSetLocaleModifiers("@im=");
--                      if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
--                              die("XOpenIM failed: could not open input device");
--              }
--      }
-+      if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
-+              die("XOpenIM failed: could not open input device");
- 
-       xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
-                       XNClientWindow, win, XNFocusWindow, win, NULL);
- 
-       XMapRaised(dpy, win);
--      XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
-       if (embed) {
-               XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
-               if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
-@@ -745,8 +738,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);
--- 
-2.25.1
-