depends: xorgproto: update to 2023.2

diff --git a/contrib/depends/packages/libXau.mk b/contrib/depends/packages/libXau.mk
index 74874f613c7916b230a5b0d0cbef33cea44e2b6a..fba1234751f072e1d1698e0f89ddaf164d417e54 100644 (file)
--- a/contrib/depends/packages/libXau.mk
+++ b/contrib/depends/packages/libXau.mk
@@ -3,7 +3,7 @@ $(package)_version=1.0.11
 $(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/
 $(package)_file_name=libXau-$($(package)_version).tar.xz
 $(package)_sha256_hash=f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb
-$(package)_dependencies=xproto
+$(package)_dependencies=xorgproto
 
 # When updating this package, check the default value of
 # --disable-xthreads. It is currently enabled.

diff --git a/contrib/depends/packages/libxcb_util_keysyms.mk b/contrib/depends/packages/libxcb_util_keysyms.mk
index 7871501f5bda611bca98cc97f463def52ea66553..2a6277275ed8d810a7d2cadc9c0aa2b277f96afd 100644 (file)
--- a/contrib/depends/packages/libxcb_util_keysyms.mk
+++ b/contrib/depends/packages/libxcb_util_keysyms.mk
@@ -3,7 +3,7 @@ $(package)_version=0.4.1
 $(package)_download_path=https://xcb.freedesktop.org/dist
 $(package)_file_name=xcb-util-keysyms-$($(package)_version).tar.xz
 $(package)_sha256_hash=7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638
-$(package)_dependencies=libxcb xproto
+$(package)_dependencies=libxcb xorgproto
 
 define $(package)_set_vars
 $(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen

diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index 917b6fb26bdb31e734e07d58bb6f41ecdb823615..ab03407f5737dba7f7316fd681313f18a4075cfa 100644 (file)
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -12,7 +12,7 @@ darwin_native_packages = darwin_sdk native_cctools native_libtapi
 mingw32_packages =
 mingw32_native_packages =
 
-qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig dbus qt
+qt_linux_packages := libxcb xcb_proto libXau xorgproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig dbus qt
 qt_darwin_packages := qt
 qt_mingw32_packages := qt
 

diff --git a/contrib/depends/packages/xproto.mk b/contrib/depends/packages/xorgproto.mk
similarity index 64%
rename from contrib/depends/packages/xproto.mk
rename to contrib/depends/packages/xorgproto.mk
index f18bf020a885d33149cad6e35c34055818686a33..f25d662db6342a6c4d97dc7e8be8220b2ba1c33e 100644 (file)
--- a/contrib/depends/packages/xproto.mk
+++ b/contrib/depends/packages/xorgproto.mk
@@ -1,8 +1,8 @@
-package=xproto
-$(package)_version=7.0.31
-$(package)_download_path=https://xorg.freedesktop.org/releases/individual/proto
-$(package)_file_name=xproto-$($(package)_version).tar.bz2
-$(package)_sha256_hash=c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747
+package=xorgproto
+$(package)_version=2023.2
+$(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto
+$(package)_file_name=xorgproto-$($(package)_version).tar.xz
+$(package)_sha256_hash=b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c
 
 define $(package)_set_vars
   $(package)_config_opts=--without-fop --without-xmlto --without-xsltproc --disable-specs