Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xorgproto for openSUSE:Factory checked in at 2021-05-02 18:35:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorgproto (Old) and /work/SRC/openSUSE:Factory/.xorgproto.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorgproto" Sun May 2 18:35:12 2021 rev:6 rq:889520 version:2021.4 Changes: -------- --- /work/SRC/openSUSE:Factory/xorgproto/xorgproto.changes 2021-03-02 12:26:00.823347164 +0100 +++ /work/SRC/openSUSE:Factory/.xorgproto.new.1947/xorgproto.changes 2021-05-02 18:35:19.905148324 +0200 @@ -1,0 +2,17 @@ +Fri Apr 30 09:04:25 UTC 2021 - Stefan Dirsch <sndir...@suse.com> + +- xorgproto 2021.4 +The big new feature in this release is Olivier's addition that makes up +XFixes 6: the new ClientDisconnectMode. An X server that is started on +demand (Xwayland) should ideally also terminate when the last client +disconnects. However, some X11 clients that provide system services will +linger around forever, preventing that shutdown. + +With the new XFixes request, a client can designate itself as +to-be-terminated and the X server can ignore those clients when counting the +number of remaining clients. If no other clients are left, the server can +shut down. + +Note that this requires changes to the X server and each client to work. + +------------------------------------------------------------------- Old: ---- xorgproto-2021.3.tar.bz2 New: ---- xorgproto-2021.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorgproto.spec ++++++ --- /var/tmp/diff_new_pack.9iPJG4/_old 2021-05-02 18:35:20.345146449 +0200 +++ /var/tmp/diff_new_pack.9iPJG4/_new 2021-05-02 18:35:20.345146449 +0200 @@ -17,7 +17,7 @@ Name: xorgproto -Version: 2021.3 +Version: 2021.4 Release: 0 URL: http://xorg.freedesktop.org/ Summary: The X11 Protocol collection ++++++ xorgproto-2021.3.tar.bz2 -> xorgproto-2021.4.tar.bz2 ++++++ ++++ 2482 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/xorgproto-2021.3/Makefile.am new/xorgproto-2021.4/Makefile.am --- old/xorgproto-2021.3/Makefile.am 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/Makefile.am 2021-04-30 01:51:47.000000000 +0200 @@ -1,3 +1,24 @@ +SED = sed + +XORGRELSTRING = @PACKAGE_STRING@ + XORGMANNAME = X Version 11 + +MAN_SUBSTS = \ + -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ + -e 's|__datadir__|$(datadir)|g' \ + -e 's|__libdir__|$(libdir)|g' \ + -e 's|__sysconfdir__|$(sysconfdir)|g' \ + -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' + +SUFFIXES = .$(MISC_MAN_SUFFIX) .man + +.man.$(MISC_MAN_SUFFIX): man + $(MKDIR_P) man + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + applewmdir = $(includedir)/X11/extensions applewm_HEADERS = \ include/X11/extensions/applewmconst.h \ @@ -14,16 +35,6 @@ bigreqsprotopkgconfigdir = $(datadir)/pkgconfig bigreqsprotopkgconfig_DATA = bigreqsproto.pc -if LEGACY -XCalibrateincludedir = $(includedir)/X11/extensions -XCalibrateinclude_HEADERS = \ - include/X11/extensions/xcalibrateproto.h \ - include/X11/extensions/xcalibratewire.h - -calibrateprotopkgconfigdir = $(datadir)/pkgconfig -calibrateprotopkgconfig_DATA = xcalibrateproto.pc -endif - compositedir = $(includedir)/X11/extensions composite_HEADERS = \ include/X11/extensions/composite.h \ @@ -66,16 +77,6 @@ dri3protopkgconfigdir = $(datadir)/pkgconfig dri3protopkgconfig_DATA = dri3proto.pc -if LEGACY -eviedir = $(includedir)/X11/extensions -evie_HEADERS = \ - include/X11/extensions/evieproto.h \ - include/X11/extensions/Xeviestr.h - -evieprotopkgconfigdir = $(datadir)/pkgconfig -evieprotopkgconfig_DATA = evieproto.pc -endif - fixesdir = $(includedir)/X11/extensions fixes_HEADERS = \ include/X11/extensions/xfixesproto.h \ @@ -84,17 +85,6 @@ fixesprotopkgconfigdir = $(datadir)/pkgconfig fixesprotopkgconfig_DATA = fixesproto.pc -if LEGACY -fontcachedir = $(includedir)/X11/extensions -fontcache_HEADERS = \ - include/X11/extensions/fontcache.h \ - include/X11/extensions/fontcacheP.h \ - include/X11/extensions/fontcachstr.h - -fontcacheprotopkgconfigdir = $(datadir)/pkgconfig -fontcacheprotopkgconfig_DATA = fontcacheproto.pc -endif - fontsdir = $(includedir)/X11/fonts fonts_HEADERS = \ include/X11/fonts/font.h \ @@ -144,23 +134,6 @@ kbprotopkgconfigdir = $(datadir)/pkgconfig kbprotopkgconfig_DATA = kbproto.pc -if LEGACY -lg3ddir = $(includedir)/X11/extensions -lg3d_HEADERS = \ - include/X11/extensions/lgewire.h - -lg3dprotopkgconfigdir = $(datadir)/pkgconfig -lg3dprotopkgconfig_DATA = lg3dproto.pc - -xproxymngdir = $(includedir)/X11/PM -xproxymng_HEADERS = \ - include/X11/PM/PM.h \ - include/X11/PM/PMproto.h - -pmprotopkgconfigdir = $(datadir)/pkgconfig -pmprotopkgconfig_DATA = xproxymngproto.pc -endif - presentdir = $(includedir)/X11/extensions present_HEADERS = \ include/X11/extensions/presentproto.h \ @@ -169,41 +142,6 @@ presentprotopkgconfigdir = $(datadir)/pkgconfig presentprotopkgconfig_DATA = presentproto.pc -if LEGACY -printdir = $(includedir)/X11/extensions -print_HEADERS = \ - include/X11/extensions/Print.h \ - include/X11/extensions/Printstr.h - -printprotopkgconfigdir = $(datadir)/pkgconfig -printprotopkgconfig_DATA = printproto.pc - -miscmandir = $(MISC_MAN_DIR) -miscman_DATA = man/Xprint.$(MISC_MAN_SUFFIX) -CLEANFILES = $(miscman_DATA) -endif - -SED = sed - -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__datadir__|$(datadir)|g' \ - -e 's|__libdir__|$(libdir)|g' \ - -e 's|__sysconfdir__|$(sysconfdir)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' - -SUFFIXES = .$(MISC_MAN_SUFFIX) .man - -.man.$(MISC_MAN_SUFFIX): man - $(MKDIR_P) man - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - randrdir = $(includedir)/X11/extensions randr_HEADERS = \ include/X11/extensions/randr.h \ @@ -244,21 +182,6 @@ scrnsaverprotopkgconfigdir = $(datadir)/pkgconfig scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc -if LEGACY -trapdir = $(includedir)/X11/extensions -trap_HEADERS = \ - include/X11/extensions/xtrapbits.h \ - include/X11/extensions/xtrapddmi.h \ - include/X11/extensions/xtrapdi.h \ - include/X11/extensions/xtrapemacros.h \ - include/X11/extensions/xtraplib.h \ - include/X11/extensions/xtraplibp.h \ - include/X11/extensions/xtrapproto.h - -trapprotopkgconfigdir = $(datadir)/pkgconfig -trapprotopkgconfig_DATA = trapproto.pc -endif - videodir = $(includedir)/X11/extensions video_HEADERS = \ include/X11/extensions/Xv.h \ @@ -272,16 +195,6 @@ videoprotopkgconfigdir = $(datadir)/pkgconfig videoprotopkgconfig_DATA = videoproto.pc -if LEGACY -windowswmdir = $(includedir)/X11/extensions -windowswm_HEADERS = \ - include/X11/extensions/windowswm.h \ - include/X11/extensions/windowswmstr.h - -windowswmprotopkgconfigdir = $(datadir)/pkgconfig -windowswmprotopkgconfig_DATA = windowswmproto.pc -endif - xprotodir = $(includedir)/X11 xproto_HEADERS = \ include/X11/ap_keysym.h \ @@ -397,7 +310,96 @@ xf86driprotopkgconfigdir = $(datadir)/pkgconfig xf86driprotopkgconfig_DATA = xf86driproto.pc +xf86vidmodedir = $(includedir)/X11/extensions +xf86vidmode_HEADERS = \ + include/X11/extensions/xf86vm.h \ + include/X11/extensions/xf86vmproto.h \ + include/X11/extensions/xf86vmstr.h + +xf86vidmodeprotopkgconfigdir = $(datadir)/pkgconfig +xf86vidmodeprotopkgconfig_DATA = xf86vidmodeproto.pc + +xineramadir = $(includedir)/X11/extensions +xinerama_HEADERS = \ + include/X11/extensions/panoramiXproto.h + +xineramaprotopkgconfigdir = $(datadir)/pkgconfig +xineramaprotopkgconfig_DATA = xineramaproto.pc + if LEGACY +XCalibrateincludedir = $(includedir)/X11/extensions +XCalibrateinclude_HEADERS = \ + include/X11/extensions/xcalibrateproto.h \ + include/X11/extensions/xcalibratewire.h + +calibrateprotopkgconfigdir = $(datadir)/pkgconfig +calibrateprotopkgconfig_DATA = xcalibrateproto.pc + +eviedir = $(includedir)/X11/extensions +evie_HEADERS = \ + include/X11/extensions/evieproto.h \ + include/X11/extensions/Xeviestr.h + +evieprotopkgconfigdir = $(datadir)/pkgconfig +evieprotopkgconfig_DATA = evieproto.pc + +fontcachedir = $(includedir)/X11/extensions +fontcache_HEADERS = \ + include/X11/extensions/fontcache.h \ + include/X11/extensions/fontcacheP.h \ + include/X11/extensions/fontcachstr.h + +fontcacheprotopkgconfigdir = $(datadir)/pkgconfig +fontcacheprotopkgconfig_DATA = fontcacheproto.pc + +lg3ddir = $(includedir)/X11/extensions +lg3d_HEADERS = \ + include/X11/extensions/lgewire.h + +lg3dprotopkgconfigdir = $(datadir)/pkgconfig +lg3dprotopkgconfig_DATA = lg3dproto.pc + +xproxymngdir = $(includedir)/X11/PM +xproxymng_HEADERS = \ + include/X11/PM/PM.h \ + include/X11/PM/PMproto.h + +pmprotopkgconfigdir = $(datadir)/pkgconfig +pmprotopkgconfig_DATA = xproxymngproto.pc + +printdir = $(includedir)/X11/extensions +print_HEADERS = \ + include/X11/extensions/Print.h \ + include/X11/extensions/Printstr.h + +printprotopkgconfigdir = $(datadir)/pkgconfig +printprotopkgconfig_DATA = printproto.pc + +miscmandir = $(MISC_MAN_DIR) +miscman_DATA = man/Xprint.$(MISC_MAN_SUFFIX) +CLEANFILES = $(miscman_DATA) + +trapdir = $(includedir)/X11/extensions +trap_HEADERS = \ + include/X11/extensions/xtrapbits.h \ + include/X11/extensions/xtrapddmi.h \ + include/X11/extensions/xtrapdi.h \ + include/X11/extensions/xtrapemacros.h \ + include/X11/extensions/xtraplib.h \ + include/X11/extensions/xtraplibp.h \ + include/X11/extensions/xtrapproto.h + +trapprotopkgconfigdir = $(datadir)/pkgconfig +trapprotopkgconfig_DATA = trapproto.pc + +windowswmdir = $(includedir)/X11/extensions +windowswm_HEADERS = \ + include/X11/extensions/windowswm.h \ + include/X11/extensions/windowswmstr.h + +windowswmprotopkgconfigdir = $(datadir)/pkgconfig +windowswmprotopkgconfig_DATA = windowswmproto.pc + xf86miscdir = $(includedir)/X11/extensions xf86misc_HEADERS = \ include/X11/extensions/xf86misc.h \ @@ -415,22 +417,6 @@ xf86rushprotopkgconfig_DATA = xf86rushproto.pc endif -xf86vidmodedir = $(includedir)/X11/extensions -xf86vidmode_HEADERS = \ - include/X11/extensions/xf86vm.h \ - include/X11/extensions/xf86vmproto.h \ - include/X11/extensions/xf86vmstr.h - -xf86vidmodeprotopkgconfigdir = $(datadir)/pkgconfig -xf86vidmodeprotopkgconfig_DATA = xf86vidmodeproto.pc - -xineramadir = $(includedir)/X11/extensions -xinerama_HEADERS = \ - include/X11/extensions/panoramiXproto.h - -xineramaprotopkgconfigdir = $(datadir)/pkgconfig -xineramaprotopkgconfig_DATA = xineramaproto.pc - SUBDIRS=specs dist_doc_DATA = \ @@ -501,3 +487,11 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-legacy + +if HAVE_PYTHON +AM_TESTS_ENVIRONMENT = \ + INCLUDESDIR=$(top_srcdir)/include +TESTS = scripts/keysym-generator.py +TEST_EXTENSIONS = .py +PY_LOG_COMPILER = $(PYTHON) +endif 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/xorgproto-2021.3/configure.ac new/xorgproto-2021.4/configure.ac --- old/xorgproto-2021.3/configure.ac 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/configure.ac 2021-04-30 01:51:47.000000000 +0200 @@ -22,7 +22,8 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([xorgproto], [2021.3], +# keep version in sync with meson.build +AC_INIT([xorgproto], [2021.4], [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -37,6 +38,9 @@ XORG_WITH_XSLTPROC XORG_CHECK_SGML_DOCTOOLS(1.8) +AM_PATH_PYTHON([3.6], , [:]) +AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) + AC_CANONICAL_HOST AC_ARG_ENABLE(legacy, 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/xorgproto-2021.3/fixesproto.pc.in new/xorgproto-2021.4/fixesproto.pc.in --- old/xorgproto-2021.3/fixesproto.pc.in 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/fixesproto.pc.in 2021-04-30 01:51:47.000000000 +0200 @@ -3,6 +3,6 @@ Name: FixesProto Description: X Fixes extension headers -Version: 5.0 +Version: 6.0 Cflags: -I${includedir} Requires: xextproto >= 7.0.99.1 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/xorgproto-2021.3/fixesproto.txt new/xorgproto-2021.4/fixesproto.txt --- old/xorgproto-2021.3/fixesproto.txt 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/fixesproto.txt 2021-04-30 01:51:47.000000000 +0200 @@ -640,6 +640,63 @@ Errors: Barrier +************* XFIXES VERSION 6 OR BETTER *********** + +13. Disconnect mode + +The X11 server is capable of terminating itself once all X11 clients are +gone. + +Yet, in a typical user session, there are a number of X11 clients running +continuously (e.g. Xsettings daemon, IBus, etc.). Those always-running +clients will prevent the X11 server from terminating, because the actual +number of X11 clients will never drop to 0. + +Disconnect mode allows the X11 clients themselves to specify that they +should not be accounted for when checking the remaining clients prior +to terminate the X11 server. + +This can be particularly useful for Wayland compositors which are able to +start Xwayland on demand, as this allows Xwayland to terminate automatically +when the relevant X11 clients have quit. + +13.1 Types + + XFixesClientDisconnectFlags + + XFixesClientDisconnectFlagDefault: 0 + XFixesClientDisconnectFlagTerminate: 1 << 0 + + XFixesClientDisconnectFlagDefault is the default behavior for + regular clients, i.e. the X11 server won't terminate as long as such + clients are still connected. + + XFixesClientDisconnectFlagTerminate indicates to the X11 server that + it can ignore the client and terminate itself even though the client + is still connected to the X11 server. + +13.2 Requests + +SetClientDisconnectMode + + disconnect-mode: CARD32 + + Sets the disconnect mode for the client. + + The disconnect-mode is a bit mask of XFixesClientDisconnectFlags. + + +GetClientDisconnectMode + + Gets the disconnect mode for the client. + + -> + + disconnect-mode: CARD32 + + The disconnect-mode is a bit mask of XFixesClientDisconnectFlags. + + 99. Future compatibility This extension is not expected to remain fixed. Future changes will 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/xorgproto-2021.3/include/X11/extensions/xfixesproto.h new/xorgproto-2021.4/include/X11/extensions/xfixesproto.h --- old/xorgproto-2021.3/include/X11/extensions/xfixesproto.h 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/include/X11/extensions/xfixesproto.h 2021-04-30 01:51:47.000000000 +0200 @@ -532,6 +532,40 @@ #define sz_xXFixesDestroyPointerBarrierReq 8 +/*************** Version 6.0 ******************/ + +typedef struct { + CARD8 reqType; + CARD8 xfixesReqType; + CARD16 length; + CARD32 disconnect_mode; +} xXFixesSetClientDisconnectModeReq; + +#define sz_xXFixesSetClientDisconnectModeReq 8 + +typedef struct { + CARD8 reqType; + CARD8 xfixesReqType; + CARD16 length; +} xXFixesGetClientDisconnectModeReq; + +#define sz_xXFixesGetClientDisconnectModeReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad0; + CARD16 sequenceNumber; + CARD32 length; + CARD32 disconnect_mode; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; +} xXFixesGetClientDisconnectModeReply; + +#define sz_xXFixesGetClientDisconnectModeReply 32 + #undef Barrier #undef Region #undef Picture 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/xorgproto-2021.3/include/X11/extensions/xfixeswire.h new/xorgproto-2021.4/include/X11/extensions/xfixeswire.h --- old/xorgproto-2021.3/include/X11/extensions/xfixeswire.h 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/include/X11/extensions/xfixeswire.h 2021-04-30 01:51:47.000000000 +0200 @@ -48,7 +48,7 @@ #define _XFIXESWIRE_H_ #define XFIXES_NAME "XFIXES" -#define XFIXES_MAJOR 5 +#define XFIXES_MAJOR 6 #define XFIXES_MINOR 0 /*************** Version 1 ******************/ @@ -89,8 +89,11 @@ /*************** Version 5 ******************/ #define X_XFixesCreatePointerBarrier 31 #define X_XFixesDestroyPointerBarrier 32 +/*************** Version 6 ******************/ +#define X_XFixesSetClientDisconnectMode 33 +#define X_XFixesGetClientDisconnectMode 34 -#define XFixesNumberRequests (X_XFixesDestroyPointerBarrier+1) +#define XFixesNumberRequests (X_XFixesGetClientDisconnectMode+1) /* Selection events share one event number */ #define XFixesSelectionNotify 0 @@ -136,4 +139,11 @@ #define BarrierNegativeX (1L << 2) #define BarrierNegativeY (1L << 3) +/*************** Version 6 ******************/ + +/* The default server behaviour */ +#define XFixesClientDisconnectFlagDefault 0 +/* The server may disconnect this client to shut down */ +#define XFixesClientDisconnectFlagTerminate (1L << 0) + #endif /* _XFIXESWIRE_H_ */ 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/xorgproto-2021.3/include/X11/keysymdef.h new/xorgproto-2021.4/include/X11/keysymdef.h --- old/xorgproto-2021.3/include/X11/keysymdef.h 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/include/X11/keysymdef.h 2021-04-30 01:51:47.000000000 +0200 @@ -2138,8 +2138,8 @@ #define XK_dintegral 0x100222C /* U+222C DOUBLE INTEGRAL */ #define XK_tintegral 0x100222D /* U+222D TRIPLE INTEGRAL */ #define XK_because 0x1002235 /* U+2235 BECAUSE */ -#define XK_approxeq 0x1002248 /* U+2245 ALMOST EQUAL TO */ -#define XK_notapproxeq 0x1002247 /* U+2247 NOT ALMOST EQUAL TO */ +#define XK_approxeq 0x1002248 /*(U+2248 ALMOST EQUAL TO)*/ +#define XK_notapproxeq 0x1002247 /*(U+2247 NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO)*/ #define XK_notidentical 0x1002262 /* U+2262 NOT IDENTICAL TO */ #define XK_stricteq 0x1002263 /* U+2263 STRICTLY EQUIVALENT TO */ #endif /* XK_MATHEMATICAL */ 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/xorgproto-2021.3/include/X11/meson.build new/xorgproto-2021.4/include/X11/meson.build --- old/xorgproto-2021.3/include/X11/meson.build 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/include/X11/meson.build 2021-04-30 01:51:47.000000000 +0200 @@ -18,15 +18,13 @@ else error('Your fd_set is too weird.') endif -custom_target('Xpoll.h', - capture : true, - install : true, - install_dir : get_option('includedir') + '/X11', - input : 'Xpoll.h.in', - output : 'Xpoll.h', - command : [ sed, - 's/@USE_FDS_BITS@/' + fds_bits + '/g', - '@INPUT@']) +xpoll_config = configuration_data() +xpoll_config.set('USE_FDS_BITS', fds_bits) +configure_file(input : 'Xpoll.h.in', + output : 'Xpoll.h', + install : true, + install_dir : get_option('includedir') + '/X11', + configuration: xpoll_config) install_headers( 'ap_keysym.h', 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/xorgproto-2021.3/meson.build new/xorgproto-2021.4/meson.build --- old/xorgproto-2021.3/meson.build 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/meson.build 2021-04-30 01:51:47.000000000 +0200 @@ -18,9 +18,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -project('xorgproto', 'c', license : 'MIT', version : '2021.3') +# keep version in sync with configure.ac +project('xorgproto', 'c', license : 'MIT', version : '2021.4') cc = meson.get_compiler('c') -sed = find_program('sed') pcs = [ 'applewmproto', @@ -67,6 +67,22 @@ ) endforeach + +docs = files('compositeproto.txt', + 'damageproto.txt', + 'dri2proto.txt', + 'dri3proto.txt', + 'fixesproto.txt', + 'PM_spec', + 'presentproto.txt', + 'randrproto.txt', + 'renderproto.txt', + 'resproto.txt', + 'xv-protocol-v2.txt') +install_data(docs, + install_dir: get_option('datadir') / 'doc' / 'xorgproto') + + if get_option('legacy') == true legacy_pcs = [ 'evieproto', 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/xorgproto-2021.3/scripts/keysym-generator.py new/xorgproto-2021.4/scripts/keysym-generator.py --- old/xorgproto-2021.3/scripts/keysym-generator.py 2021-02-25 02:26:24.000000000 +0100 +++ new/xorgproto-2021.4/scripts/keysym-generator.py 2021-04-30 01:51:47.000000000 +0200 @@ -13,12 +13,23 @@ import argparse import logging +import os import sys import re -import libevdev import subprocess from pathlib import Path +try: + import libevdev +except ModuleNotFoundError as e: + print(f"Error: {e}", file=sys.stderr) + print( + "One or more python modules are missing. Please install those " + "modules and re-run this tool." + ) + sys.exit(77) + + logging.basicConfig(level=logging.DEBUG, format="%(levelname)s: %(message)s") logger = logging.getLogger("ksgen") @@ -385,9 +396,10 @@ """ paths = tuple(Path.cwd().glob("**/XF86keysym.h")) if not paths: - path = Path("/usr/include/X11/XF86keysym.h") + fallbackdir = Path(os.getenv("INCLUDESDIR") or "/usr/include/") + path = fallbackdir / "X11" / "XF86keysym.h" if not path.exists(): - die("Unable to find XF86keysym.h in CWD or /usr") + die(f"Unable to find XF86keysym.h in CWD or {fallbackdir}") else: if len(paths) > 1: die("Multiple XF86keysym.h in CWD, please use --header") @@ -409,7 +421,7 @@ subparsers = parser.add_subparsers(help="command-specific help", dest="command") parser_verify = subparsers.add_parser( - "verify", help="Verify the XF86keysym.h matches requirements" + "verify", help="Verify the XF86keysym.h matches requirements (default)" ) parser_verify.set_defaults(func=verify) @@ -443,7 +455,8 @@ ns.header = Path(ns.header) if ns.command is None: - parser.error("Invalid or missing command") + print("No command specified, defaulting to verify'") + ns.func = verify sys.exit(ns.func(ns)) 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/xorgproto-2021.3/test-driver new/xorgproto-2021.4/test-driver --- old/xorgproto-2021.3/test-driver 1970-01-01 01:00:00.000000000 +0100 +++ new/xorgproto-2021.4/test-driver 2021-04-30 01:51:50.000000000 +0200 @@ -0,0 +1,148 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2018-03-07.03; # UTC + +# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + *) break;; + esac + shift +done + +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End:
