Hello community, here is the log from the commit of package dmenu for openSUSE:Factory checked in at 2020-09-25 16:35:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmenu (Old) and /work/SRC/openSUSE:Factory/.dmenu.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dmenu" Fri Sep 25 16:35:00 2020 rev:17 rq:836552 version:5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/dmenu/dmenu.changes 2020-09-03 01:18:09.536558912 +0200 +++ /work/SRC/openSUSE:Factory/.dmenu.new.4249/dmenu.changes 2020-09-25 16:35:56.500125078 +0200 @@ -1,0 +2,12 @@ +Sun Sep 20 18:58:08 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 5.0: + * no change compared to 4.9 with the extra patches +- remove 0001-Close-when-the-embedding-window-is-destroyed.patch + 0002-fix-crash-when-XOpenIM-returns-NULL.patch + 0003-make-dmenu_path-script-executable.patch + 0004-improve-xopenim-error-message.patch + 0005-revert-IME-support.patch + 0006-Fix-memory-leaks-in-drw.patch (upstream) + +------------------------------------------------------------------- Old: ---- 0001-Close-when-the-embedding-window-is-destroyed.patch 0002-fix-crash-when-XOpenIM-returns-NULL.patch 0003-make-dmenu_path-script-executable.patch 0004-improve-xopenim-error-message.patch 0005-revert-IME-support.patch 0006-Fix-memory-leaks-in-drw.patch dmenu-4.9.tar.gz New: ---- dmenu-5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmenu.spec ++++++ --- /var/tmp/diff_new_pack.MZC17D/_old 2020-09-25 16:35:58.128126523 +0200 +++ /var/tmp/diff_new_pack.MZC17D/_new 2020-09-25 16:35:58.132126527 +0200 @@ -17,7 +17,7 @@ Name: dmenu -Version: 4.9 +Version: 5.0 Release: 0 Summary: A generic and efficient menu for X License: MIT @@ -25,13 +25,6 @@ URL: https://tools.suckless.org/dmenu/ Source: http://dl.suckless.org/tools/%{name}-%{version}.tar.gz Patch0: dmenu-optflags.patch -# These patches are taken from upstream at https://git.suckless.org/dmenu/ -Patch1: 0001-Close-when-the-embedding-window-is-destroyed.patch -Patch2: 0002-fix-crash-when-XOpenIM-returns-NULL.patch -Patch3: 0003-make-dmenu_path-script-executable.patch -Patch4: 0004-improve-xopenim-error-message.patch -Patch5: 0005-revert-IME-support.patch -Patch6: 0006-Fix-memory-leaks-in-drw.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(x11) ++++++ dmenu-4.9.tar.gz -> dmenu-5.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmenu-4.9/LICENSE new/dmenu-5.0/LICENSE --- old/dmenu-4.9/LICENSE 2019-02-02 13:55:02.000000000 +0100 +++ new/dmenu-5.0/LICENSE 2020-09-02 18:37:07.000000000 +0200 @@ -8,8 +8,8 @@ © 2009 Markus Schnalke <[email protected]> © 2009 Evan Gates <[email protected]> © 2010-2012 Connor Lane Smith <[email protected]> -© 2014-2019 Hiltjo Posthuma <[email protected]> -© 2015-2018 Quentin Rameau <[email protected]> +© 2014-2020 Hiltjo Posthuma <[email protected]> +© 2015-2019 Quentin Rameau <[email protected]> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmenu-4.9/config.mk new/dmenu-5.0/config.mk --- old/dmenu-4.9/config.mk 2019-02-02 13:55:02.000000000 +0100 +++ new/dmenu-5.0/config.mk 2020-09-02 18:37:07.000000000 +0200 @@ -1,5 +1,5 @@ # dmenu version -VERSION = 4.9 +VERSION = 5.0 # paths PREFIX = /usr/local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmenu-4.9/dmenu.c new/dmenu-5.0/dmenu.c --- old/dmenu-4.9/dmenu.c 2019-02-02 13:55:02.000000000 +0100 +++ new/dmenu-5.0/dmenu.c 2020-09-02 18:37:07.000000000 +0200 @@ -553,9 +553,14 @@ XEvent ev; while (!XNextEvent(dpy, &ev)) { - if (XFilterEvent(&ev, None)) + if (XFilterEvent(&ev, win)) continue; switch(ev.type) { + case DestroyNotify: + if (ev.xdestroywindow.window != win) + break; + cleanup(); + exit(1); case Expose: if (ev.xexpose.count == 0) drw_map(drw, win, 0, 0, mw, mh); @@ -659,15 +664,17 @@ 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) + 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); + XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { for (i = 0; i < du && dws[i] != win; ++i) XSelectInput(dpy, dws[i], FocusChangeMask); @@ -731,8 +738,6 @@ 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); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmenu-4.9/drw.c new/dmenu-5.0/drw.c --- old/dmenu-4.9/drw.c 2019-02-02 13:55:02.000000000 +0100 +++ new/dmenu-5.0/drw.c 2020-09-02 18:37:07.000000000 +0200 @@ -95,6 +95,7 @@ { XFreePixmap(drw->dpy, drw->drawable); XFreeGC(drw->dpy, drw->gc); + drw_fontset_free(drw->fonts); free(drw); }
