--- /dev/null
+diff -ur xpyb-1.3.1/src/py_client.py xpyb-1.3.1/src/py_client.py
+--- xpyb-1.3.1/src/py_client.py 2012-03-24 01:24:40.000000000 +0400
++++ xpyb-1.3.1/src/py_client.py 2018-03-08 10:13:48.342758718 +0300
+@@ -585,7 +585,8 @@
+ 'union' : py_union,
+ 'request' : py_request,
+ 'event' : py_event,
+- 'error' : py_error
++ 'error' : py_error,
++ 'eventstruct' : lambda *a, **k: None
+ }
+
+ # Boilerplate below this point
--- /dev/null
+diff -ruN xpyb-1.3.1_ORIG/src/py_client.py xpyb-1.3.1/src/py_client.py
+--- xpyb-1.3.1_ORIG/src/py_client.py 2013-11-17 12:57:05.157530931 +0100
++++ xpyb-1.3.1/src/py_client.py 2013-11-17 12:57:52.221530100 +0100
+@@ -19,6 +19,7 @@
+ 'INT8': 'b', 'int8_t': 'b',
+ 'INT16': 'h', 'int16_t': 'h',
+ 'INT32': 'i', 'int32_t': 'i',
++ 'INT64': 'i', 'int64_t': 'i',
+ 'BYTE': 'B',
+ 'BOOL': 'B',
+ 'char': 'b',
--- /dev/null
+--- xpyb-1.3.1/configure.ac.orig 2013-05-21 19:01:51.054962821 +0400
++++ xpyb-1.3.1/configure.ac 2013-05-21 19:05:22.342961464 +0400
+@@ -38,7 +38,8 @@
+
+ # Find the xcbgen Python package
+ AC_MSG_CHECKING([for xcb-proto python dir])
+-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
++XCBPROTO_XCBPYTHONDIR=`$PYTHON -c 'import xcbgen; from os.path import dirname, abspath, join; \
++ print abspath(join(dirname(xcbgen.[__file__]), ".."))'`
+ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
+ AC_SUBST(XCBPROTO_XCBPYTHONDIR)
+