xorgproto: Branch 'refs/tags/xorgproto-2021.5' - 3 commits

[GitLab Mirror]

Rebased ref, commits from common ancestor:
commit 57acac1d4c7967f4661fb1c9f86f48f34a46c48d
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Wed Sep 15 18:55:35 2021 +0300

    xorgproto 2021.5
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/configure.ac b/configure.ac
index 37290e7..a6008fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
 # keep version in sync with meson.build
-AC_INIT([xorgproto], [2021.4.99.2],
+AC_INIT([xorgproto], [2021.5],
         [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff --git a/meson.build b/meson.build
index 8694521..5c15cc9 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@
 # SOFTWARE.
 
 # keep version in sync with configure.ac
-project('xorgproto', 'c', license : 'MIT', version : '2021.4.99.2')
+project('xorgproto', 'c', license : 'MIT', version : '2021.5')
 cc = meson.get_compiler('c')
 
 pcs = [
commit d9518ce2793b70a7a6e7ba13ccb5b0de6065c0c9
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Wed Sep 15 18:55:34 2021 +0300

    specs: Specify XI 2.4 as released
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index ef3097c..325d3e1 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -15,7 +15,7 @@ Authors:
 History 
 -------
 
-- v2.4, (not released): Touchpad gesture support added
+- v2.4, September 2021: Touchpad gesture support added
 - v2.3, December 2012: Pointer barrier events added
 - v2.2, March 2012: Multitouch support added
 - v2.1, December 2011: new raw event behaviour, smooth scrolling support
commit a0ed054ee2c334941dfe9eaa7bcfdbbe6907e1b5
Author: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
Date:   Tue Jun 15 14:25:01 2021 +0100

    Define LONG64 if __SIZEOF_LONG__ indicates 64-bit long
    
    All modern compilers (GCC>=4.6, Clang>=3.0) define this macro, so we can
    use it to detect 64-bit longs without adding to the architecture list.
    
    This change allows me to successfully run a simple X11 window on a
    64-bit FreeBSD RISC-V QEMU VM via SSH forwarding. Without this change
    I get an error that DISPLAY cannot be opened.
    
    Signed-off-by: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>

diff --git a/include/X11/Xmd.h b/include/X11/Xmd.h
index 492465e..68c45db 100644
--- a/include/X11/Xmd.h
+++ b/include/X11/Xmd.h
@@ -57,7 +57,11 @@ SOFTWARE.
 #  include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
 # endif
 
-# if defined (_LP64) || defined(__LP64__) || \
+#if defined(__SIZEOF_LONG__)
+# if __SIZEOF_LONG__ == 8
+#  define LONG64				/* 32/64-bit architecture */
+# endif
+# elif defined (_LP64) || defined(__LP64__) || \
      defined(__alpha) || defined(__alpha__) || \
      defined(__ia64__) || defined(ia64) || \
      defined(__sparc64__) || \