Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package setxkbmap for openSUSE:Factory checked in at 2023-05-16 14:16:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/setxkbmap (Old) and /work/SRC/openSUSE:Factory/.setxkbmap.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "setxkbmap" Tue May 16 14:16:07 2023 rev:10 rq:1087318 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/setxkbmap/setxkbmap.changes 2022-04-05 19:54:52.386621791 +0200 +++ /work/SRC/openSUSE:Factory/.setxkbmap.new.1533/setxkbmap.changes 2023-05-16 14:27:14.107676342 +0200 @@ -1,0 +2,10 @@ +Tue May 16 01:25:57 UTC 2023 - Stefan Dirsch <[email protected]> + +- Update to version 1.3.4 + * gitlab CI: stop requiring Signed-off-by in commits + * Be more careful about querying randr + * Fix "Xwayland" spelling + * Check for the XWAYLAND extension + * Route the Xwayland warning through stderr + +------------------------------------------------------------------- Old: ---- setxkbmap-1.3.3.tar.xz New: ---- setxkbmap-1.3.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ setxkbmap.spec ++++++ --- /var/tmp/diff_new_pack.u1krgz/_old 2023-05-16 14:27:14.483678492 +0200 +++ /var/tmp/diff_new_pack.u1krgz/_new 2023-05-16 14:27:14.487678515 +0200 @@ -1,7 +1,7 @@ # # spec file for package setxkbmap # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: setxkbmap -Version: 1.3.3 +Version: 1.3.4 Release: 0 Summary: Utility to change the keyboard layout in X License: MIT ++++++ setxkbmap-1.3.3.tar.xz -> setxkbmap-1.3.4.tar.xz ++++++ ++++ 2770 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/setxkbmap-1.3.3/ChangeLog new/setxkbmap-1.3.4/ChangeLog --- old/setxkbmap-1.3.3/ChangeLog 2022-04-03 22:45:45.000000000 +0200 +++ new/setxkbmap-1.3.4/ChangeLog 2023-05-15 03:58:28.000000000 +0200 @@ -1,3 +1,60 @@ +commit 094d979324efca8bbb2ad3756ee947c2d2b41a79 +Author: Peter Hutterer <[email protected]> +Date: Mon May 15 11:55:03 2023 +1000 + + setxkbmap 1.3.4 + +commit 2d3ed3d74cdd4ef6dcf503162a72243ce7a96fb0 +Author: Olivier Fourdan <[email protected]> +Date: Tue May 9 09:33:36 2023 +0200 + + Check for the XWAYLAND extension + + With Xwayland 23.1 and above, the definitive way of checking for an + Xwayland server is to check for the "XWAYLAND" extension. + + Keep the old XRandR method for compatibility with older versions of + Xwayland. + + Signed-off-by: Olivier Fourdan <[email protected]> + +commit 9fa24c7ca57665f15dcd1cbe02208bd727e507f7 +Author: Olivier Fourdan <[email protected]> +Date: Tue May 9 09:23:26 2023 +0200 + + Fix "Xwayland" spelling + + It's Xwayland, not XWayland. + + Signed-off-by: Olivier Fourdan <[email protected]> + +commit 32fa355d4d3b9945d02acc776a57feb17c2bcc50 +Author: Peter Hutterer <[email protected]> +Date: Wed Nov 16 11:47:40 2022 +1000 + + Route the Xwayland warning through stderr + + Otherwise we cannot pipe setxkmap -print into anything + +commit dbde2b209b70d9cdc8a66e3cc73e2d28a8e13797 +Author: Julien Cristau <[email protected]> +Date: Mon Apr 25 15:41:26 2022 +0200 + + Be more careful about querying randr + + Check for extension version and number of outputs: + XRRGetScreenResourcesCurrent was added in v1.3. Also, there's no + guarantee it returns any outputs, and we don't want to die with a + BadRROutput error. + +commit 818582b435bc1807b87e547e53c488986286ff1f +Author: Alan Coopersmith <[email protected]> +Date: Mon Apr 25 09:12:16 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <[email protected]> + commit ac1a150bb7c6af8377074e946f1ca6233a345ac9 Author: Alan Coopersmith <[email protected]> Date: Sun Apr 3 13:42:22 2022 -0700 @@ -204,7 +261,7 @@ Signed-off-by: Peter Hutterer <[email protected]> commit f5ffd59830ff5f4a4f337d56e7e8b4a1930a46e8 -Author: Stéphane Aulery <[email protected]> +Author: Stéphane Aulery <[email protected]> Date: Tue Jul 2 00:06:55 2013 +0200 Ensure consistency between the manpage and the output of the -h option @@ -1005,7 +1062,7 @@ configure cache, you cache it, and the cached value is probably wrong. commit e04d3454c2e7b0390ccf61d9f6e0ca3d2a04dfb6 -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Wed Jul 6 20:33:26 2005 +0000 Build system for setxkbmap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/setxkbmap-1.3.3/configure.ac new/setxkbmap-1.3.4/configure.ac --- old/setxkbmap-1.3.3/configure.ac 2022-04-03 22:45:37.000000000 +0200 +++ new/setxkbmap-1.3.4/configure.ac 2023-05-15 03:58:23.000000000 +0200 @@ -24,7 +24,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([setxkbmap], - [1.3.3], + [1.3.4], [https://gitlab.freedesktop.org/xorg/app/setxkbmap/issues], [setxkbmap]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/setxkbmap-1.3.3/setxkbmap.c new/setxkbmap-1.3.4/setxkbmap.c --- old/setxkbmap-1.3.3/setxkbmap.c 2022-04-03 22:45:37.000000000 +0200 +++ new/setxkbmap-1.3.4/setxkbmap.c 2023-05-15 03:58:23.000000000 +0200 @@ -1075,24 +1075,35 @@ Bool rc = False; XRRScreenResources *resources = NULL; XRROutputInfo *output = NULL; + int opcode, event_base, error_base, major, minor; - /* There is no definitive way of checking for an XWayland server, - * but the two working methods are: + /* With Xwayland 23.1 and above, the definitive way of checking for an + * Xwayland server is to check for the "XWAYLAND" extension. + */ + if (XQueryExtension(dpy, "XWAYLAND", &opcode, &event_base, &error_base)) { + rc = True; + goto out; + } + + /* For previous versions of Xwayland, there is no definitive way of checking + * for an Xwayland server, but the two working methods are: * - RandR output names in Xwayland are XWAYLAND0, XWAYLAND1, etc. * - XI devices are xwayland-pointer:10, xwayland-keyboard:11 * Let's go with the XRandR check here because it's slightly less * code to write. */ - int event_base, error_base, major, minor; if (!XRRQueryExtension(dpy, &event_base, &error_base) || !XRRQueryVersion(dpy, &major, &minor)) { /* e.g. Xnest, but definitely not Xwayland */ goto out; } + if (major < 1 || (major == 1 && minor < 3)) { + goto out; + } resources = XRRGetScreenResourcesCurrent(dpy, DefaultRootWindow(dpy)); - if (!resources) { + if (!resources || resources->noutput < 1) { goto out; } @@ -1119,7 +1130,7 @@ exit(1); if (is_xwayland()) - MSG("WARNING: Running setxkbmap against an XWayland server\n"); + ERR("WARNING: Running setxkbmap against an Xwayland server\n"); settings.locale.value = setlocale(LC_ALL, settings.locale.value); settings.locale.src = FROM_SERVER;
