Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bemenu for openSUSE:Factory checked in at 2021-06-09 21:52:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bemenu (Old) and /work/SRC/openSUSE:Factory/.bemenu.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bemenu" Wed Jun 9 21:52:57 2021 rev:8 rq:898693 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bemenu/bemenu.changes 2021-06-01 10:35:51.108648590 +0200 +++ /work/SRC/openSUSE:Factory/.bemenu.new.32437/bemenu.changes 2021-06-09 21:53:20.750586366 +0200 @@ -1,0 +2,6 @@ +Wed Jun 9 09:00:48 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 0.6.2: + * Handle multiple seats (more) correctly + +------------------------------------------------------------------- Old: ---- 0.6.1.tar.gz New: ---- 0.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bemenu.spec ++++++ --- /var/tmp/diff_new_pack.TJVETb/_old 2021-06-09 21:53:21.146587071 +0200 +++ /var/tmp/diff_new_pack.TJVETb/_new 2021-06-09 21:53:21.146587071 +0200 @@ -18,7 +18,7 @@ %define bcond_with curses Name: bemenu -Version: 0.6.1 +Version: 0.6.2 Release: 0 Summary: Dynamic menu library and client program inspired by dmenu License: MIT ++++++ 0.6.1.tar.gz -> 0.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bemenu-0.6.1/GNUmakefile new/bemenu-0.6.2/GNUmakefile --- old/bemenu-0.6.1/GNUmakefile 2021-05-23 07:14:35.000000000 +0200 +++ new/bemenu-0.6.2/GNUmakefile 2021-06-09 02:20:23.000000000 +0200 @@ -45,7 +45,7 @@ ln -fs $(full) $@ $(pkgconfigs): %: VERSION %.in - sed "s/@VERSION@/$(VERSION)/;s,@PREFIX@,$(PREFIX),;s,@LIBDIR@,$(libdir)," $(addsuffix .in, $@) > $@ + sed "s/@VERSION@/$(VERSION)/;s,@PREFIX@,$(PREFIX),;s,@LIBDIR@,$(libdir),;s,@INCLUDEDIR@,$(includedir)," $(addsuffix .in, $@) > $@ bemenu.1: man/bemenu.1.in sed 's,@LIBDIR@,$(PREFIX)$(libdir),' $< > $@ @@ -56,6 +56,7 @@ $(bins): %: | $(libs) $(LINK.c) $(filter %.c %.a,$^) $(LDLIBS) -L. -lbemenu -o $@ +cdl.a: private override LDFLAGS += -fPIC cdl.a: lib/3rdparty/cdl.c lib/3rdparty/cdl.h libbemenu.so: private override LDLIBS += -ldl @@ -84,10 +85,13 @@ lib/renderers/wayland/xdg-output-unstable-v1.c: lib/renderers/wayland/xdg-output-unstable-v1.xml wayland-scanner private-code < $^ > $@ +xdg-shell.a: private override LDFLAGS += -fPIC xdg-shell.a: private override CPPFLAGS += $(shell pkg-config --cflags-only-I wayland-client) xdg-shell.a: lib/renderers/wayland/xdg-shell.c +wlr-layer-shell.a: private override LDFLAGS += -fPIC wlr-layer-shell.a: private override CPPFLAGS += $(shell pkg-config --cflags-only-I wayland-client) wlr-layer-shell.a: lib/renderers/wayland/wlr-layer-shell-unstable-v1.c lib/renderers/wayland/wlr-layer-shell-unstable-v1.h +xdg-output.a: private override LDFLAGS += -fPIC xdg-output.a: private override CPPFLAGS += $(shell pkg-config --cflags-only-I wayland-client) xdg-output.a: lib/renderers/wayland/xdg-output-unstable-v1.c lib/renderers/wayland/xdg-output-unstable-v1.h bemenu-renderer-wayland.so: private override LDLIBS += $(shell pkg-config --libs wayland-client cairo pango pangocairo xkbcommon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bemenu-0.6.1/VERSION new/bemenu-0.6.2/VERSION --- old/bemenu-0.6.1/VERSION 2021-05-23 07:14:35.000000000 +0200 +++ new/bemenu-0.6.2/VERSION 2021-06-09 02:20:23.000000000 +0200 @@ -1 +1 @@ -0.6.1 +0.6.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bemenu-0.6.1/bemenu.pc.in new/bemenu-0.6.2/bemenu.pc.in --- old/bemenu-0.6.1/bemenu.pc.in 2021-05-23 07:14:35.000000000 +0200 +++ new/bemenu-0.6.2/bemenu.pc.in 2021-06-09 02:20:23.000000000 +0200 @@ -1,7 +1,9 @@ prefix=@PREFIX@ libdir=${prefix}@LIBDIR@ +includedir=${prefix}@INCLUDEDIR@ Name: bemenu Description: Dynamic menu library Version: @VERSION@ Libs: -L${libdir} -lbemenu +Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bemenu-0.6.1/lib/renderers/curses/curses.c new/bemenu-0.6.2/lib/renderers/curses/curses.c --- old/bemenu-0.6.1/lib/renderers/curses/curses.c 2021-05-23 07:14:35.000000000 +0200 +++ new/bemenu-0.6.2/lib/renderers/curses/curses.c 2021-06-09 02:20:23.000000000 +0200 @@ -296,31 +296,12 @@ assert(unicode); *unicode = 0; curses.polled_once = true; - bool alt = false; if (!curses.stdscreen || curses.should_terminate) return BM_KEY_NONE; get_wch((wint_t*)unicode); - // alt is sent as esc, so read another character to determine if this is alt+char. - if (*unicode == 27){ - nodelay(curses.stdscreen, true); - int ch = getch(); - if (ch != ERR){ - printf("alt-%d\n", ch); - *unicode = ch; - alt = true; - } - nodelay(curses.stdscreen, false); - } - - // some terminals set high ascii bit when pressing alt - if (*unicode & (1 << 7)) { - *unicode &= ~(1 << 7); - alt = true; - } - switch (*unicode) { #if KEY_RESIZE case KEY_RESIZE: @@ -406,37 +387,6 @@ terminate(); return BM_KEY_RETURN; - case 49: - if (alt) { terminate(); return BM_KEY_CUSTOM_1; } - break; - case 50: - if (alt) { terminate(); return BM_KEY_CUSTOM_2; } - break; - case 51: - if (alt) { terminate(); return BM_KEY_CUSTOM_3; } - break; - case 52: - if (alt) { terminate(); return BM_KEY_CUSTOM_4; } - break; - case 53: - if (alt) { terminate(); return BM_KEY_CUSTOM_5; } - break; - case 54: - if (alt) { terminate(); return BM_KEY_CUSTOM_6; } - break; - case 55: - if (alt) { terminate(); return BM_KEY_CUSTOM_7; } - break; - case 56: - if (alt) { terminate(); return BM_KEY_CUSTOM_8; } - break; - case 57: - if (alt) { terminate(); return BM_KEY_CUSTOM_9; } - break; - case 48: - if (alt) { terminate(); return BM_KEY_CUSTOM_10; } - break; - case 7: /* C-g */ case 27: /* Escape */ terminate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bemenu-0.6.1/lib/renderers/wayland/registry.c new/bemenu-0.6.2/lib/renderers/wayland/registry.c --- old/bemenu-0.6.1/lib/renderers/wayland/registry.c 2021-05-23 07:14:35.000000000 +0200 +++ new/bemenu-0.6.2/lib/renderers/wayland/registry.c 2021-06-09 02:20:23.000000000 +0200 @@ -215,11 +215,13 @@ { struct input *input = data; - if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !input->keyboard) { + if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !input->seat) { + input->seat = seat; input->keyboard = wl_seat_get_keyboard(seat); wl_keyboard_add_listener(input->keyboard, &keyboard_listener, data); - } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && input->keyboard) { + } else if (seat == input->seat && !(caps & WL_SEAT_CAPABILITY_KEYBOARD)) { wl_keyboard_destroy(input->keyboard); + input->seat = NULL; input->keyboard = NULL; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bemenu-0.6.1/lib/renderers/wayland/wayland.h new/bemenu-0.6.2/lib/renderers/wayland/wayland.h --- old/bemenu-0.6.1/lib/renderers/wayland/wayland.h 2021-05-23 07:14:35.000000000 +0200 +++ new/bemenu-0.6.2/lib/renderers/wayland/wayland.h 2021-06-09 02:20:23.000000000 +0200 @@ -46,6 +46,7 @@ struct input { int *repeat_fd; + struct wl_seat *seat; struct wl_keyboard *keyboard; struct xkb xkb;
