vars/build.vars: replaces {damage,fixes,gl,input,kb,record,render,x,xcb_,xext}proto with xorgproto v2018.4 (via Redfoxmoon.)

vars/build.vars:native_packages_deps_x11: adds util_macros v1.19.2 (via Redfoxmoon.)
patches/xcb_proto-1.12.local.patch: removes obsolete patch.
patches/xorgproto-2018.4.local.patch: via Redfoxmoon.

2 files changed, 10 insertions, 42 deletions

diff --git a/vars/build.vars b/vars/build.vars
index ea7fe968..4e9a69ae 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -659,33 +659,18 @@ NATIVE_PACKAGES_DEPS_X11_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGE
 NATIVE_PACKAGES_DEPS_X11_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_X11_PACKAGES="
-inputproto kbproto xcb_proto xproto fixesproto recordproto glproto libXau libpthread_stubs xcb
-xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender
-libXft libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile damageproto libXdamage mesa glew
-harfbuzz pixman cairo dbus dbus_glib sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2 gtk3 imlib2 libcaca libxfce4util xfconf libxfce4ui";
+util_macros xorgproto xtrans libpthread_stubs xcb libX11 libXau libXext freetype fontconfig Xrender libXft libXfixes libXi
+libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile libXdamage mesa glew harfbuzz pixman
+cairo dbus dbus_glib sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2 gtk3 imlib2 libcaca libxfce4util xfconf libxfce4ui";
 NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
-: ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d};
-: ${PKG_INPUTPROTO_VERSION:=2.3.2};
-: ${PKG_INPUTPROTO_URL:=https://www.x.org/releases/individual/proto/inputproto-${PKG_INPUTPROTO_VERSION}.tar.bz2};
-: ${PKG_KBPROTO_SHA256SUM:=f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857};
-: ${PKG_KBPROTO_VERSION:=1.0.7};
-: ${PKG_KBPROTO_URL:=https://www.x.org/releases/individual/proto/kbproto-${PKG_KBPROTO_VERSION}.tar.bz2};
-: ${PKG_XCB_PROTO_SHA256SUM:=5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906};
-: ${PKG_XCB_PROTO_VERSION:=1.12};
-: ${PKG_XCB_PROTO_URL:=https://www.x.org/releases/individual/xcb/xcb-proto-${PKG_XCB_PROTO_VERSION}.tar.bz2};
-: ${PKG_XPROTO_SHA256SUM:=c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747};
-: ${PKG_XPROTO_VERSION:=7.0.31};
-: ${PKG_XPROTO_URL:=https://www.x.org/releases/individual/proto/xproto-${PKG_XPROTO_VERSION}.tar.bz2};
-: ${PKG_FIXESPROTO_SHA256SUM:=67865a0e3cdc7dec1fd676f0927f7011ad4036c18eb320a2b41dbd56282f33b8};
-: ${PKG_FIXESPROTO_VERSION:=5.0};
-: ${PKG_FIXESPROTO_URL:=https://x.org/releases/individual/proto/fixesproto-${PKG_FIXESPROTO_VERSION}.tar.gz};
-: ${PKG_RECORDPROTO_SHA256SUM:=a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370};
-: ${PKG_RECORDPROTO_VERSION:=1.14.2};
-: ${PKG_RECORDPROTO_URL:=http://www.x.org/releases/individual/proto/recordproto-${PKG_RECORDPROTO_VERSION}.tar.bz2};
-: ${PKG_GLPROTO_SHA256SUM:=9d8130fec2b98bd032db7730fa092dd9dec39f3de34f4bb03ceb43b9903dbc96};
-: ${PKG_GLPROTO_VERSION:=1.4.17};
-: ${PKG_GLPROTO_URL:=https://www.x.org/releases/individual/proto/glproto-${PKG_GLPROTO_VERSION}.tar.gz};
+: ${PKG_UTIL_MACROS_SHA256SUM:=d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712};
+: ${PKG_UTIL_MACROS_VERSION:=1.19.2};
+: ${PKG_UTIL_MACROS_URL:=https://www.x.org/archive/individual/util/util-macros-${PKG_UTIL_MACROS_VERSION}.tar.bz2};
+: ${PKG_XORGPROTO_SHA256SUM:=fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0};
+: ${PKG_XORGPROTO_VERSION:=2018.4};
+: ${PKG_XORGPROTO_URL:=https://www.x.org/releases/individual/proto/xorgproto-${PKG_XORGPROTO_VERSION}.tar.bz2};
+: ${PKG_XORGPROTO_CONFIGURE_ARGS_EXTRA:="--disable-specs --enable-legacy"};
 : ${PKG_LIBXAU_SHA256SUM:=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2};
 : ${PKG_LIBXAU_VERSION:=1.0.8};
 : ${PKG_LIBXAU_URL:=https://www.x.org/releases/individual/lib/libXau-${PKG_LIBXAU_VERSION}.tar.bz2};
@@ -697,9 +682,6 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_XCB_URL:=https://www.x.org/releases/individual/xcb/libxcb-${PKG_XCB_VERSION}.tar.bz2};
 : ${PKG_XCB_CONFIGURE_ARGS_EXTRA:=--disable-randr};
 : ${PKG_XCB_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
-: ${PKG_XEXTPROTO_SHA256SUM:=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0};
-: ${PKG_XEXTPROTO_VERSION:=7.3.0};
-: ${PKG_XEXTPROTO_URL:=https://www.x.org/releases/individual/proto/xextproto-${PKG_XEXTPROTO_VERSION}.tar.bz2};
 : ${PKG_XTRANS_SHA256SUM:=adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301};
 : ${PKG_XTRANS_VERSION:=1.3.5};
 : ${PKG_XTRANS_URL:=https://www.x.org/releases/individual/lib/xtrans-${PKG_XTRANS_VERSION}.tar.bz2};
@@ -717,9 +699,6 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_FONTCONFIG_URL:=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_FONTCONFIG_VERSION}.tar.bz2};
 : ${PKG_FONTCONFIG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
 : ${PKG_FONTCONFIG_CONFIGURE_ARGS_EXTRA:=--disable-docs};
-: ${PKG_RENDERPROTO_SHA256SUM:=06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537};
-: ${PKG_RENDERPROTO_VERSION:=0.11.1};
-: ${PKG_RENDERPROTO_URL:=https://www.x.org/releases/individual/proto/renderproto-${PKG_RENDERPROTO_VERSION}.tar.bz2};
 : ${PKG_XRENDER_SHA256SUM:=c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949};
 : ${PKG_XRENDER_VERSION:=0.9.10};
 : ${PKG_XRENDER_URL:=https://www.x.org/releases/individual/lib/libXrender-${PKG_XRENDER_VERSION}.tar.bz2};
@@ -759,9 +738,6 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_LIBXKBFILE_SHA256SUM:=51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a};
 : ${PKG_LIBXKBFILE_VERSION:=1.0.9};
 : ${PKG_LIBXKBFILE_URL:=https://www.x.org/releases/individual/lib/libxkbfile-${PKG_LIBXKBFILE_VERSION}.tar.bz2};
-: ${PKG_DAMAGEPRORO_SHA256SUM:=5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b};
-: ${PKG_DAMAGEPROTO_VERSION:=1.2.1};
-: ${PKG_DAMAGEPROTO_URL:=https://www.x.org/releases/individual/proto/damageproto-${PKG_DAMAGEPROTO_VERSION}.tar.bz2};
 : ${PKG_LIBXDAMAGE_SHA256SUM:=7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad};
 : ${PKG_LIBXDAMAGE_VERSION:=1.1.4};
 : ${PKG_LIBXDAMAGE_URL:=https://x.org/releases/individual/lib/libXdamage-${PKG_LIBXDAMAGE_VERSION}.tar.bz2};
diff --git a/vars/xcb.vars b/vars/xcb.vars
deleted file mode 100644
index c734a4dd..00000000
--- a/vars/xcb.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set -o errexit -o noglob are assumed.
-#
-
-: ${PKG_XCB_CONFIG_CACHE_EXTRA:="
-ac_cv_search_sendmsg=no"};
-
-# vim:filetype=sh