Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xorgproto for openSUSE:Factory checked in at 2023-06-12 15:25:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorgproto (Old) and /work/SRC/openSUSE:Factory/.xorgproto.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorgproto" Mon Jun 12 15:25:05 2023 rev:12 rq:1091981 version:2023.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xorgproto/xorgproto.changes 2023-02-01 16:40:44.386257286 +0100 +++ /work/SRC/openSUSE:Factory/.xorgproto.new.15902/xorgproto.changes 2023-06-12 15:25:42.830790179 +0200 @@ -1,0 +2,14 @@ +Sat Jun 10 11:04:09 UTC 2023 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 2023.1 +This release introduces a couple of new options for existing extensions: + + * A new option PresentOptionAsyncMayTear for the Present extension, + * A new flag XFixesClientDisconnectFlagForceTerminate to the XFixes + XFixesClientDisconnectFlags intended to be used by screen lockers, + where the server must exit if the screen locker does. + +The other changes include various fixes, clarifications and keysym +definitions updates: + +------------------------------------------------------------------- Old: ---- xorgproto-2022.2.tar.xz xorgproto-2022.2.tar.xz.sig New: ---- xorgproto-2023.1.tar.xz xorgproto-2023.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorgproto.spec ++++++ --- /var/tmp/diff_new_pack.dJRbhR/_old 2023-06-12 15:25:44.626800805 +0200 +++ /var/tmp/diff_new_pack.dJRbhR/_new 2023-06-12 15:25:44.630800829 +0200 @@ -26,7 +26,7 @@ %define srcname xorgproto Name: %{srcname}%{psuffix} -Version: 2022.2 +Version: 2023.1 Release: 0 %if "%{flavor}" == "doc" Summary: The X11 Protocol collection (documentation) ++++++ xorgproto-2022.2.tar.xz -> xorgproto-2023.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/COPYING-compositeproto new/xorgproto-2023.1/COPYING-compositeproto --- old/xorgproto-2022.2/COPYING-compositeproto 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/COPYING-compositeproto 2023-06-05 14:17:30.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2006, Oracle and/or its affiliates. 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/xorgproto-2022.2/COPYING-evieproto new/xorgproto-2023.1/COPYING-evieproto --- old/xorgproto-2022.2/COPYING-evieproto 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/COPYING-evieproto 2023-06-05 14:17:30.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2003, Oracle and/or its affiliates. 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/xorgproto-2022.2/COPYING-fixesproto new/xorgproto-2023.1/COPYING-fixesproto --- old/xorgproto-2022.2/COPYING-fixesproto 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/COPYING-fixesproto 2023-06-05 14:17:30.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2006, Oracle and/or its affiliates. Copyright 2010 Red Hat, Inc. Permission is hereby granted, free of charge, to any person obtaining a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/COPYING-printproto new/xorgproto-2023.1/COPYING-printproto --- old/xorgproto-2022.2/COPYING-printproto 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/COPYING-printproto 2023-06-05 14:17:30.000000000 +0200 @@ -1,6 +1,6 @@ (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. -(c) Copyright 1996, Oracle and/or its affiliates. All rights reserved. +(c) Copyright 1996, Oracle and/or its affiliates. (c) Copyright 1996 Novell, Inc. (c) Copyright 1996 Digital Equipment Corp. (c) Copyright 1996 Fujitsu Limited diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/COPYING-x11proto new/xorgproto-2023.1/COPYING-x11proto --- old/xorgproto-2022.2/COPYING-x11proto 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/COPYING-x11proto 2023-06-05 14:17:31.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1991, Oracle and/or its affiliates. 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/xorgproto-2022.2/Makefile.am new/xorgproto-2023.1/Makefile.am --- old/xorgproto-2022.2/Makefile.am 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/Makefile.am 2023-06-05 14:17:31.000000000 +0200 @@ -19,6 +19,8 @@ $(MKDIR_P) man $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +dist_doc_DATA = + applewmdir = $(includedir)/X11/extensions applewm_HEADERS = \ include/X11/extensions/applewmconst.h \ @@ -43,6 +45,8 @@ compositeprotopkgconfigdir = $(datadir)/pkgconfig compositeprotopkgconfig_DATA = compositeproto.pc +dist_doc_DATA += compositeproto.txt + damagedir = $(includedir)/X11/extensions damage_HEADERS = \ include/X11/extensions/damageproto.h \ @@ -51,6 +55,8 @@ damageprotopkgconfigdir = $(datadir)/pkgconfig damageprotopkgconfig_DATA = damageproto.pc +dist_doc_DATA += damageproto.txt + dmxdir = $(includedir)/X11/extensions dmx_HEADERS = \ include/X11/extensions/dmx.h \ @@ -70,6 +76,8 @@ dri2protopkgconfigdir = $(datadir)/pkgconfig dri2protopkgconfig_DATA = dri2proto.pc +dist_doc_DATA += dri2proto.txt + dri3dir = $(includedir)/X11/extensions dri3_HEADERS = \ include/X11/extensions/dri3proto.h @@ -77,6 +85,8 @@ dri3protopkgconfigdir = $(datadir)/pkgconfig dri3protopkgconfig_DATA = dri3proto.pc +dist_doc_DATA += dri3proto.txt + fixesdir = $(includedir)/X11/extensions fixes_HEADERS = \ include/X11/extensions/xfixesproto.h \ @@ -85,6 +95,8 @@ fixesprotopkgconfigdir = $(datadir)/pkgconfig fixesprotopkgconfig_DATA = fixesproto.pc +dist_doc_DATA += fixesproto.txt + fontsdir = $(includedir)/X11/fonts fonts_HEADERS = \ include/X11/fonts/font.h \ @@ -142,6 +154,8 @@ presentprotopkgconfigdir = $(datadir)/pkgconfig presentprotopkgconfig_DATA = presentproto.pc +dist_doc_DATA += presentproto.txt + randrdir = $(includedir)/X11/extensions randr_HEADERS = \ include/X11/extensions/randr.h \ @@ -150,6 +164,8 @@ randrprotopkgconfigdir = $(datadir)/pkgconfig randrprotopkgconfig_DATA = randrproto.pc +dist_doc_DATA += randrproto.txt + recorddir = $(includedir)/X11/extensions record_HEADERS = \ include/X11/extensions/recordconst.h \ @@ -167,6 +183,8 @@ renderprotopkgconfigdir = $(datadir)/pkgconfig renderprotopkgconfig_DATA = renderproto.pc +dist_doc_DATA += renderproto.txt + resourcedir = $(includedir)/X11/extensions resource_HEADERS = \ include/X11/extensions/XResproto.h @@ -174,6 +192,8 @@ resourceprotopkgconfigdir = $(datadir)/pkgconfig resourceprotopkgconfig_DATA = resourceproto.pc +dist_doc_DATA += resproto.txt + scrnsaverdir = $(includedir)/X11/extensions scrnsaver_HEADERS = \ include/X11/extensions/saver.h \ @@ -195,6 +215,8 @@ videoprotopkgconfigdir = $(datadir)/pkgconfig videoprotopkgconfig_DATA = videoproto.pc +dist_doc_DATA += xv-protocol-v2.txt + xprotodir = $(includedir)/X11 xproto_HEADERS = \ include/X11/ap_keysym.h \ @@ -333,6 +355,8 @@ xwaylandprotopkgconfigdir = $(datadir)/pkgconfig xwaylandprotopkgconfig_DATA = xwaylandproto.pc +dist_doc_DATA += xwaylandproto.txt + if LEGACY XCalibrateincludedir = $(includedir)/X11/extensions XCalibrateinclude_HEADERS = \ @@ -374,6 +398,8 @@ pmprotopkgconfigdir = $(datadir)/pkgconfig pmprotopkgconfig_DATA = xproxymngproto.pc +dist_doc_DATA += PM_spec + printdir = $(includedir)/X11/extensions print_HEADERS = \ include/X11/extensions/Print.h \ @@ -426,20 +452,6 @@ SUBDIRS=specs -dist_doc_DATA = \ - compositeproto.txt \ - damageproto.txt \ - dri2proto.txt \ - dri3proto.txt \ - fixesproto.txt \ - PM_spec \ - presentproto.txt \ - randrproto.txt \ - renderproto.txt \ - resproto.txt \ - xv-protocol-v2.txt \ - xwaylandproto.txt - EXTRA_DIST = \ COPYING-applewmproto \ COPYING-bigreqsproto \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/Makefile.in new/xorgproto-2023.1/Makefile.in --- old/xorgproto-2022.2/Makefile.in 2022-08-11 02:16:36.000000000 +0200 +++ new/xorgproto-2023.1/Makefile.in 2023-06-05 14:17:34.000000000 +0200 @@ -91,13 +91,14 @@ host_triplet = @host@ @LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h @LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h +@LEGACY_TRUE@am__append_3 = PM_spec subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(dist_doc_DATA) \ + $(am__configure_deps) $(am__dist_doc_DATA_DIST) \ $(am__XCalibrateinclude_HEADERS_DIST) $(applewm_HEADERS) \ $(bigreqs_HEADERS) $(compat_HEADERS) $(composite_HEADERS) \ $(damage_HEADERS) $(dmx_HEADERS) $(dri2_HEADERS) \ @@ -244,6 +245,10 @@ "$(DESTDIR)$(xf86vidmodedir)" "$(DESTDIR)$(xineramadir)" \ "$(DESTDIR)$(xprotodir)" "$(DESTDIR)$(xproxymngdir)" \ "$(DESTDIR)$(xwaylandprotodir)" +am__dist_doc_DATA_DIST = compositeproto.txt damageproto.txt \ + dri2proto.txt dri3proto.txt fixesproto.txt presentproto.txt \ + randrproto.txt renderproto.txt resproto.txt xv-protocol-v2.txt \ + xwaylandproto.txt PM_spec DATA = $(applewmprotopkgconfig_DATA) $(bigreqsprotopkgconfig_DATA) \ $(calibrateprotopkgconfig_DATA) \ $(compositeprotopkgconfig_DATA) $(damageprotopkgconfig_DATA) \ @@ -730,6 +735,10 @@ XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 SUFFIXES = .$(MISC_MAN_SUFFIX) .man +dist_doc_DATA = compositeproto.txt damageproto.txt dri2proto.txt \ + dri3proto.txt fixesproto.txt presentproto.txt randrproto.txt \ + renderproto.txt resproto.txt xv-protocol-v2.txt \ + xwaylandproto.txt $(am__append_3) applewmdir = $(includedir)/X11/extensions applewm_HEADERS = \ include/X11/extensions/applewmconst.h \ @@ -1084,20 +1093,6 @@ @LEGACY_TRUE@xf86rushprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@xf86rushprotopkgconfig_DATA = xf86rushproto.pc SUBDIRS = specs -dist_doc_DATA = \ - compositeproto.txt \ - damageproto.txt \ - dri2proto.txt \ - dri3proto.txt \ - fixesproto.txt \ - PM_spec \ - presentproto.txt \ - randrproto.txt \ - renderproto.txt \ - resproto.txt \ - xv-protocol-v2.txt \ - xwaylandproto.txt - EXTRA_DIST = \ COPYING-applewmproto \ COPYING-bigreqsproto \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/configure new/xorgproto-2023.1/configure --- old/xorgproto-2022.2/configure 2022-08-11 02:16:36.000000000 +0200 +++ new/xorgproto-2023.1/configure 2023-06-05 14:17:33.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for xorgproto 2022.2. +# Generated by GNU Autoconf 2.71 for xorgproto 2023.1. # # Report bugs to <https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues>. # @@ -672,8 +672,8 @@ # Identity of this package. PACKAGE_NAME='xorgproto' PACKAGE_TARNAME='xorgproto' -PACKAGE_VERSION='2022.2' -PACKAGE_STRING='xorgproto 2022.2' +PACKAGE_VERSION='2023.1' +PACKAGE_STRING='xorgproto 2023.1' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues' PACKAGE_URL='' @@ -1441,7 +1441,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorgproto 2022.2 to adapt to many kinds of systems. +\`configure' configures xorgproto 2023.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1512,7 +1512,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorgproto 2022.2:";; + short | recursive ) echo "Configuration of xorgproto 2023.1:";; esac cat <<\_ACEOF @@ -1634,7 +1634,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorgproto configure 2022.2 +xorgproto configure 2023.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1902,7 +1902,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorgproto $as_me 2022.2, which was +It was created by xorgproto $as_me 2023.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3171,7 +3171,7 @@ # Define the identity of the package. PACKAGE='xorgproto' - VERSION='2022.2' + VERSION='2023.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -12911,7 +12911,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorgproto $as_me 2022.2, which was +This file was extended by xorgproto $as_me 2023.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12970,7 +12970,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xorgproto config.status 2022.2 +xorgproto config.status 2023.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/configure.ac new/xorgproto-2023.1/configure.ac --- old/xorgproto-2022.2/configure.ac 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/configure.ac 2023-06-05 14:17:31.000000000 +0200 @@ -23,7 +23,7 @@ AC_PREREQ([2.60]) # keep version in sync with meson.build -AC_INIT([xorgproto], [2022.2], +AC_INIT([xorgproto], [2023.1], [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues]) AM_INIT_AUTOMAKE([foreign dist-xz]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/dri3proto.txt new/xorgproto-2023.1/dri3proto.txt --- old/xorgproto-2022.2/dri3proto.txt 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/dri3proto.txt 2023-06-05 14:17:31.000000000 +0200 @@ -623,7 +623,7 @@ ââââ DRI3GetSupportedModifiers 1 CARD8 major opcode - 1 7 DRI3 opcode + 1 6 DRI3 opcode 2 3 length 4 Window window 1 CARD8 depth @@ -645,7 +645,7 @@ ââââ DRI3PixmapFromBuffers 1 CARD8 major opcode - 1 8 DRI3 opcode + 1 7 DRI3 opcode 2 8 length 4 Pixmap pixmap 4 Window window @@ -672,7 +672,7 @@ ââââ DRI3BuffersFromPixmap 1 CARD8 major opcode - 1 9 DRI3 opcode + 1 8 DRI3 opcode 2 2 length 4 Pixmap pixmap â¶ @@ -696,7 +696,7 @@ ââââ DRI3SetDRMDeviceInUse 1 CARD8 major opcode - 1 10 DRI3 opcode + 1 9 DRI3 opcode 2 4 length 4 Window window 4 CARD32 drmMajor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/fixesproto.pc.in new/xorgproto-2023.1/fixesproto.pc.in --- old/xorgproto-2022.2/fixesproto.pc.in 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/fixesproto.pc.in 2023-06-05 14:17:31.000000000 +0200 @@ -3,6 +3,6 @@ Name: FixesProto Description: X Fixes extension headers -Version: 6.0 +Version: 6.1 Cflags: -I${includedir} Requires: xextproto >= 7.0.99.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/fixesproto.txt new/xorgproto-2023.1/fixesproto.txt --- old/xorgproto-2022.2/fixesproto.txt 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/fixesproto.txt 2023-06-05 14:17:31.000000000 +0200 @@ -1,5 +1,5 @@ The XFIXES Extension - Version 5.0 + Version 6.1 Document Revision 1 2010-11-15 Keith Packard @@ -666,15 +666,41 @@ XFixesClientDisconnectFlagDefault: 0 XFixesClientDisconnectFlagTerminate: 1 << 0 + XFixesClientDisconnectFlagForceTerminate: 1 << 1 XFixesClientDisconnectFlagDefault is the default behavior for - regular clients, i.e. the X11 server won't terminate as long as such - clients are still connected. + regular clients: the X11 server won't terminate as long as such + clients are still connected and no other clients trigger + termination. 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. + If XFixesClientDisconnectFlagForceTerminate is set at the time the + client disconnects, the X11 server MUST terminate and/or reset without + delivering further events to clients, even if other clients that have + not set XFixesClientDisconnectFlagTerminate are still connected. + Screen lockers SHOULD use this flag to ensure that the screen does not + unlock if they exit, which would create a security vulnerability. + Programs SHOULD NOT use this flag unless unexpected termination would + create a security vulnerability or other severe problem. + + Because XFixesClientDisconnectFlagForceTerminate allows the client to + cause the server to terminate, it is subject to security checks to + prevent unauthorized use. Servers that support the X Access Control + Extension (XACE) MUST deny attempts to set + XFixesClientDisconnectFlagForceTerminate, unless the client has + DixManageAccess to the server. Servers that support the SECURITY + extension MUST forbid untrusted clients from setting + XFixesClientDisconnectFlagForceTerminate. Servers MAY refuse to allow + clients to set this flag for other reasons. For instance, a server + might only allow the flag to be set by local clients. If the server + refuses to allow the client to set this flag, an Access error results. + + XFixesClientDisconnectFlagForceTerminate is only available in XFixes + versions 6.1 and better. + 13.2 Requests SetClientDisconnectMode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/Sunkeysym.h new/xorgproto-2023.1/include/X11/Sunkeysym.h --- old/xorgproto-2022.2/include/X11/Sunkeysym.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/Sunkeysym.h 2023-06-05 14:17:31.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1991, Oracle and/or its affiliates. * * 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/xorgproto-2022.2/include/X11/Xfuncproto.h new/xorgproto-2023.1/include/X11/Xfuncproto.h --- old/xorgproto-2022.2/include/X11/Xfuncproto.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/Xfuncproto.h 2023-06-05 14:17:31.000000000 +0200 @@ -163,19 +163,6 @@ # define _X_ATTRIBUTE_PRINTF(x,y) #endif -/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable - argument macros, must be only used inside #ifdef _X_NONNULL guards, as - many legacy X clients are compiled in C89 mode still. */ -#if __has_attribute(nonnull) \ - && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ -#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) -#elif __has_attribute(nonnull) \ - || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) -#define _X_NONNULL(args...) __attribute__((nonnull(args))) -#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ -#define _X_NONNULL(...) /* */ -#endif - /* requires xproto >= 7.0.22 */ #if __has_attribute(__unused__) \ || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/Xos.h new/xorgproto-2023.1/include/X11/Xos.h --- old/xorgproto-2022.2/include/X11/Xos.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/Xos.h 2023-06-05 14:17:31.000000000 +0200 @@ -60,7 +60,7 @@ */ # include <string.h> -# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__) +# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__) # include <strings.h> # else # ifndef index diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/extensions/Print.h new/xorgproto-2023.1/include/X11/extensions/Print.h --- old/xorgproto-2022.2/include/X11/extensions/Print.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/Print.h 2023-06-05 14:17:31.000000000 +0200 @@ -27,7 +27,7 @@ ** ** (c) Copyright 1996 Hewlett-Packard Company ** (c) Copyright 1996 International Business Machines Corp. - ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved. + ** (c) Copyright 1996, Oracle and/or its affiliates. ** (c) Copyright 1996 Novell, Inc. ** (c) Copyright 1996 Digital Equipment Corp. ** (c) Copyright 1996 Fujitsu Limited diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/extensions/Printstr.h new/xorgproto-2023.1/include/X11/extensions/Printstr.h --- old/xorgproto-2022.2/include/X11/extensions/Printstr.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/Printstr.h 2023-06-05 14:17:31.000000000 +0200 @@ -13,7 +13,7 @@ ** ** (c) Copyright 1996 Hewlett-Packard Company ** (c) Copyright 1996 International Business Machines Corp. - ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved. + ** (c) Copyright 1996, Oracle and/or its affiliates. ** (c) Copyright 1996 Novell, Inc. ** (c) Copyright 1996 Digital Equipment Corp. ** (c) Copyright 1996 Fujitsu Limited diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/extensions/XvMCproto.h new/xorgproto-2023.1/include/X11/extensions/XvMCproto.h --- old/xorgproto-2022.2/include/X11/extensions/XvMCproto.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/XvMCproto.h 2023-06-05 14:17:31.000000000 +0200 @@ -27,14 +27,14 @@ CARD32 mc_type; CARD32 flags; } xvmcSurfaceInfo; -#define sz_xvmcSurfaceInfo 24; +#define sz_xvmcSurfaceInfo 24 typedef struct { CARD8 reqType; CARD8 xvmcReqType; CARD16 length; } xvmcQueryVersionReq; -#define sz_xvmcQueryVersionReq 4; +#define sz_xvmcQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ @@ -56,7 +56,7 @@ CARD16 length; CARD32 port; } xvmcListSurfaceTypesReq; -#define sz_xvmcListSurfaceTypesReq 8; +#define sz_xvmcListSurfaceTypesReq 8 typedef struct { BYTE type; /* X_Reply */ @@ -83,7 +83,7 @@ CARD16 height; CARD32 flags; } xvmcCreateContextReq; -#define sz_xvmcCreateContextReq 24; +#define sz_xvmcCreateContextReq 24 typedef struct { BYTE type; /* X_Reply */ @@ -106,7 +106,7 @@ CARD16 length; CARD32 context_id; } xvmcDestroyContextReq; -#define sz_xvmcDestroyContextReq 8; +#define sz_xvmcDestroyContextReq 8 typedef struct { CARD8 reqType; @@ -115,7 +115,7 @@ CARD32 surface_id; CARD32 context_id; } xvmcCreateSurfaceReq; -#define sz_xvmcCreateSurfaceReq 12; +#define sz_xvmcCreateSurfaceReq 12 typedef struct { BYTE type; /* X_Reply */ @@ -137,7 +137,7 @@ CARD16 length; CARD32 surface_id; } xvmcDestroySurfaceReq; -#define sz_xvmcDestroySurfaceReq 8; +#define sz_xvmcDestroySurfaceReq 8 typedef struct { @@ -150,7 +150,7 @@ CARD16 width; CARD16 height; } xvmcCreateSubpictureReq; -#define sz_xvmcCreateSubpictureReq 20; +#define sz_xvmcCreateSubpictureReq 20 typedef struct { BYTE type; /* X_Reply */ @@ -174,7 +174,7 @@ CARD16 length; CARD32 subpicture_id; } xvmcDestroySubpictureReq; -#define sz_xvmcDestroySubpictureReq 8; +#define sz_xvmcDestroySubpictureReq 8 typedef struct { CARD8 reqType; @@ -183,7 +183,7 @@ CARD32 port; CARD32 surface_type_id; } xvmcListSubpictureTypesReq; -#define sz_xvmcListSubpictureTypesReq 12; +#define sz_xvmcListSubpictureTypesReq 12 typedef struct { BYTE type; /* X_Reply */ @@ -207,7 +207,7 @@ CARD32 shmKey; CARD32 magic; } xvmcGetDRInfoReq; -#define sz_xvmcGetDRInfoReq 16; +#define sz_xvmcGetDRInfoReq 16 typedef struct { BYTE type; /* X_Reply */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/extensions/composite.h new/xorgproto-2023.1/include/X11/extensions/composite.h --- old/xorgproto-2022.2/include/X11/extensions/composite.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/composite.h 2023-06-05 14:17:31.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, Oracle and/or its affiliates. * * 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/xorgproto-2022.2/include/X11/extensions/compositeproto.h new/xorgproto-2023.1/include/X11/extensions/compositeproto.h --- old/xorgproto-2022.2/include/X11/extensions/compositeproto.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/compositeproto.h 2023-06-05 14:17:31.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, Oracle and/or its affiliates. * * 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/xorgproto-2022.2/include/X11/extensions/evieproto.h new/xorgproto-2023.1/include/X11/extensions/evieproto.h --- old/xorgproto-2022.2/include/X11/extensions/evieproto.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/evieproto.h 2023-06-05 14:17:31.000000000 +0200 @@ -1,6 +1,6 @@ /************************************************************ -Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2003, Oracle and/or its affiliates. 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/xorgproto-2022.2/include/X11/extensions/presenttokens.h new/xorgproto-2023.1/include/X11/extensions/presenttokens.h --- old/xorgproto-2022.2/include/X11/extensions/presenttokens.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/presenttokens.h 2023-06-05 14:17:31.000000000 +0200 @@ -45,11 +45,15 @@ #define PresentOptionCopy (1 << 1) #define PresentOptionUST (1 << 2) #define PresentOptionSuboptimal (1 << 3) +#define PresentOptionAsyncMayTear (1 << 4) #define PresentAllOptions (PresentOptionAsync | \ PresentOptionCopy | \ PresentOptionUST | \ - PresentOptionSuboptimal) + PresentOptionSuboptimal | \ + PresentOptionAsyncMayTear) + +#define PresentAllAsyncOptions (PresentOptionAsync | PresentOptionAsyncMayTear) /* Present capabilities */ @@ -57,10 +61,14 @@ #define PresentCapabilityAsync 1 #define PresentCapabilityFence 2 #define PresentCapabilityUST 4 +#define PresentCapabilityAsyncMayTear 8 #define PresentAllCapabilities (PresentCapabilityAsync | \ PresentCapabilityFence | \ - PresentCapabilityUST) + PresentCapabilityUST | \ + PresentCapabilityAsyncMayTear) + +#define PresentAllAsyncCapabilities (PresentCapabilityAsync | PresentCapabilityAsyncMayTear) /* Events */ #define PresentConfigureNotify 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/extensions/xfixesproto.h new/xorgproto-2023.1/include/X11/extensions/xfixesproto.h --- old/xorgproto-2022.2/include/X11/extensions/xfixesproto.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/xfixesproto.h 2023-06-05 14:17:31.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, Oracle and/or its affiliates. * Copyright 2010 Red Hat, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/extensions/xfixeswire.h new/xorgproto-2023.1/include/X11/extensions/xfixeswire.h --- old/xorgproto-2022.2/include/X11/extensions/xfixeswire.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/extensions/xfixeswire.h 2023-06-05 14:17:31.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, Oracle and/or its affiliates. * Copyright 2010 Red Hat, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -146,4 +146,9 @@ /* The server may disconnect this client to shut down */ #define XFixesClientDisconnectFlagTerminate (1L << 0) +/*************** Version 6.1 ******************/ + +/* The server must terminate if this client exits */ +#define XFixesClientDisconnectFlagForceTerminate (1L << 1) + #endif /* _XFIXESWIRE_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/include/X11/keysymdef.h new/xorgproto-2023.1/include/X11/keysymdef.h --- old/xorgproto-2022.2/include/X11/keysymdef.h 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/include/X11/keysymdef.h 2023-06-05 14:17:31.000000000 +0200 @@ -414,12 +414,6 @@ #define XK_dead_belowcomma 0xfe6e #define XK_dead_currency 0xfe6f -/* extra dead elements for German T3 layout */ -#define XK_dead_lowline 0xfe90 -#define XK_dead_aboveverticalline 0xfe91 -#define XK_dead_belowverticalline 0xfe92 -#define XK_dead_longsolidusoverlay 0xfe93 - /* dead vowels for universal syllable entry */ #define XK_dead_a 0xfe80 #define XK_dead_A 0xfe81 @@ -431,8 +425,10 @@ #define XK_dead_O 0xfe87 #define XK_dead_u 0xfe88 #define XK_dead_U 0xfe89 -#define XK_dead_small_schwa 0xfe8a -#define XK_dead_capital_schwa 0xfe8b +#define XK_dead_schwa 0xfe8a +#define XK_dead_SCHWA 0xfe8b +#define XK_dead_small_schwa 0xfe8a /* deprecated, remove in 2025 */ +#define XK_dead_capital_schwa 0xfe8b /* deprecated, remove in 2025 */ #define XK_dead_greek 0xfe8c @@ -650,7 +646,8 @@ #define XK_diaeresis 0x00a8 /* U+00A8 DIAERESIS */ #define XK_copyright 0x00a9 /* U+00A9 COPYRIGHT SIGN */ #define XK_ordfeminine 0x00aa /* U+00AA FEMININE ORDINAL INDICATOR */ -#define XK_guillemotleft 0x00ab /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_guillemetleft 0x00ab /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_guillemotleft 0x00ab /* deprecated misspelling */ #define XK_notsign 0x00ac /* U+00AC NOT SIGN */ #define XK_hyphen 0x00ad /* U+00AD SOFT HYPHEN */ #define XK_registered 0x00ae /* U+00AE REGISTERED SIGN */ @@ -665,8 +662,10 @@ #define XK_periodcentered 0x00b7 /* U+00B7 MIDDLE DOT */ #define XK_cedilla 0x00b8 /* U+00B8 CEDILLA */ #define XK_onesuperior 0x00b9 /* U+00B9 SUPERSCRIPT ONE */ -#define XK_masculine 0x00ba /* U+00BA MASCULINE ORDINAL INDICATOR */ -#define XK_guillemotright 0x00bb /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_ordmasculine 0x00ba /* U+00BA MASCULINE ORDINAL INDICATOR */ +#define XK_masculine 0x00ba /* deprecated inconsistent name */ +#define XK_guillemetright 0x00bb /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_guillemotright 0x00bb /* deprecated misspelling */ #define XK_onequarter 0x00bc /* U+00BC VULGAR FRACTION ONE QUARTER */ #define XK_onehalf 0x00bd /* U+00BD VULGAR FRACTION ONE HALF */ #define XK_threequarters 0x00be /* U+00BE VULGAR FRACTION THREE QUARTERS */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/meson.build new/xorgproto-2023.1/meson.build --- old/xorgproto-2022.2/meson.build 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/meson.build 2023-06-05 14:17:31.000000000 +0200 @@ -19,7 +19,8 @@ # SOFTWARE. # keep version in sync with configure.ac -project('xorgproto', 'c', license : 'MIT', version : '2022.2') +project('xorgproto', 'c', license : 'MIT', version : '2023.1', + meson_version : '>=0.56.0') cc = meson.get_compiler('c') pcs = [ @@ -74,7 +75,6 @@ 'dri2proto.txt', 'dri3proto.txt', 'fixesproto.txt', - 'PM_spec', 'presentproto.txt', 'randrproto.txt', 'renderproto.txt', @@ -106,6 +106,9 @@ configuration : pc_data, ) endforeach + legacy_docs = files('PM_spec') + install_data(legacy_docs, + install_dir: get_option('datadir') / 'doc' / 'xorgproto') endif ext_xorgproto = declare_dependency( @@ -114,7 +117,7 @@ subdir('include') -keysymfile = join_paths(meson.source_root(), 'include', 'X11', 'XF86keysym.h') +keysymfile = meson.project_source_root() / 'include' / 'X11' / 'XF86keysym.h' test('evdev-keysym-check', find_program('scripts/keysym-generator.py'), args: ['-v', '--header', keysymfile, 'verify']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/presentproto.txt new/xorgproto-2023.1/presentproto.txt --- old/xorgproto-2022.2/presentproto.txt 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/presentproto.txt 2023-06-05 14:17:31.000000000 +0200 @@ -57,11 +57,13 @@ PRESENTOPTION { PresentOptionAsync, PresentOptionCopy, PresentOptionUST, - PresentOptionSuboptimal } + PresentOptionSuboptimal, + PresentOptionAsyncMayTear } PRESENTCAPABILITY { PresentCapabilityAsync, PresentCapabilityFence, - PresentCapabilityUST } + PresentCapabilityUST, + PresentCapabilityAsyncMayTear } PRESENTCOMPLETEKIND { PresentCompleteKindPixmap, PresentCompleteKindMSCNotify } @@ -129,7 +131,7 @@ It is the clients responsibility to ensure that the server supports a version which is compatible with its expectations. - Backwards compatible changes included addition of new + Backwards compatible changes include addition of new requests. â â â â â â â @@ -215,7 +217,16 @@ If 'options' contains PresentOptionAsync, and the 'target-msc' is less than or equal to the current msc for 'window', then the operation will be performed as soon as possible, not - necessarily waiting for the next vertical blank interval. + necessarily waiting for the next vertical blank interval. If + the target-crtc does not support PresentCapabilityAsyncMayTear, + this may result in tearing. + + If the target-crtc supports PresentCapabilityAsyncMayTear, + 'options' contains PresentOptionAsyncMayTear, and the 'target-msc' + is less than or equal to the current msc for 'window', then + the operation will be performed as soon as possible, not + necessarily waiting for the next vertical blank interval, and + possibly resulting in tearing. If 'options' contains PresentOptionCopy, then 'pixmap' will be idle, and 'idle-fence' triggered as soon as the operation occurs. @@ -265,7 +276,7 @@ Delivers a PresentCompleteNotifyEvent with kind PresentCompleteKindNotifyMSC after the time specified by - 'target-msc', 'divisor' and 'remainder'). + 'target-msc', 'divisor' and 'remainder'. 'serial' is an arbitrary client-specified value which will be returned in the event so that the client can associate the @@ -315,13 +326,23 @@ 'target' is a WINDOW, then the target CRTC is selected by the X server from among the CRTCs on the screen specified by the window. - PresentCapabilityAsync means that the target device can flip - the scanout buffer mid-frame instead of waiting for a vertical - blank interval. The precise latency between the flip request - and the actual scanout transition is not defined by this + PresentCapabilityAsyncMayTear means that the target device may be + able to flip the scanout buffer mid-frame instead of waiting for + a vertical blank interval. The precise latency between the flip + request and the actual scanout transition is not defined by this specification, but is intended to be no more than a few scanlines. + If PresentCapabilityAsyncMayTear is not supported, + PresentCapabilityAsync means the same as + PresentCapabilityAsyncMayTear described above. + + If PresentCapabilityAsyncMayTear is supported, + PresentCapabilityAsync means that even if there is already a flip + pending in the target device, it may be possible to replace that + flip before the next vertical blank interval. The scanout buffer + does not change mid-frame though, i.e. there is no tearing. + PresentCapabilityFence means that the target device can take advantage of SyncFences in the Present operations to improve GPU throughput. The driver must operate correctly in the @@ -546,7 +567,7 @@ requests, however Present uses X pixmaps to refer to the new window contents instead of the DRI2 buffer attachments. -Present and DRI3 are designed in conjunction to replace DRI2 +Present and DRI3 are designed in conjunction to replace DRI2. 10.4 XvMC / Xv @@ -584,6 +605,7 @@ 2 PresentOptionCopy; 4 PresentOptionUST 8 PresentOptionSuboptimal + 16 PresentOptionAsyncMayTear ââââ ââââ @@ -591,6 +613,7 @@ 1 PresentCapabilityAsync 2 PresentCapabilityFence 4 PresentCapabilityUST + 8 PresentCapabilityAsyncMayTear ââââ ââââ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgproto-2022.2/randrproto.txt new/xorgproto-2023.1/randrproto.txt --- old/xorgproto-2022.2/randrproto.txt 2022-08-11 02:16:33.000000000 +0200 +++ new/xorgproto-2023.1/randrproto.txt 2023-06-05 14:17:31.000000000 +0200 @@ -1693,10 +1693,11 @@ If 'name' matches an existing Monitor on the screen, the existing one will be deleted as if RRDeleteMonitor were called. - For each output in 'info.outputs, each one is removed from all - pre-existing Monitors. If removing the output causes the list of - outputs for that Monitor to become empty, then that Monitor will - be deleted as if RRDeleteMonitor were called. + If an 'info.output' contains only the automatically generated default + monitor, this is replaced by the new monitor. If the 'info.output' already + contains a user-defined monitor, the new monitor will be added. + This allows to have more than one monitor on an output (e.g. to split an + output into multiple virtual monitors). Only one monitor per screen may be primary. If 'info.primary' is true, then the primary value will be set to false on all @@ -1719,6 +1720,10 @@ 'name' must match the name of a Monitor on the screen, or a Value error results. + If the last user-defined monitor is removed from an 'info.output', + the automatically generated default monitor will be restored. It is not + possible to delete the automatically generated default monitor. + RRDeleteMonitor generates a ConfigureNotify event on the root window of the screen. ++++++ xorgproto.keyring ++++++ --- /var/tmp/diff_new_pack.dJRbhR/_old 2023-06-12 15:25:45.018803124 +0200 +++ /var/tmp/diff_new_pack.dJRbhR/_new 2023-06-12 15:25:45.022803148 +0200 @@ -21,4 +21,56 @@ 4NfV7rNc057K1nL2GgCeKApWRgGVzaOkAp0P5tQulaDD6zM= =7uBX -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=L9d5 +-----END PGP PUBLIC KEY BLOCK-----