From fa01382e2e2952f17f92fd54057315984ab07db1 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 18 Dec 2024 10:04:29 +0000 Subject: [PATCH] xorg-server: update to 21.1.15 log: https://gitlab.freedesktop.org/xorg/xserver/-/compare/xorg-server-21.1.14...xorg-server-21.1.15 --- packages/x11/xserver/xorg-server/package.mk | 4 +-- ...org-server-1560-fix-cast-for-gcc14-1.patch | 33 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 packages/x11/xserver/xorg-server/patches/xorg-server-1560-fix-cast-for-gcc14-1.patch diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 468019d186..b6bef7e589 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xorg-server" -PKG_VERSION="21.1.14" -PKG_SHA256="8f2102cebdc4747d1656c1099ef610f5063c7422c24a177e300de569b354ee35" +PKG_VERSION="21.1.15" +PKG_SHA256="841c82901282902725762df03adbbcd68153d4cdfb0d61df0cfd73ad677ae089" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="https://www.x.org/releases/individual/xserver/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1560-fix-cast-for-gcc14-1.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1560-fix-cast-for-gcc14-1.patch deleted file mode 100644 index 711582e6a6..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xorg-server-1560-fix-cast-for-gcc14-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 70c7dafbd54f94a2a0f1d113cb5536ade62585fb Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Wed, 22 May 2024 04:47:12 +0000 -Subject: [PATCH] os/access: fix pointer type mismatch - -Fixes compile error with gcc-14.1.0 - -../os/access.c: In function 'siHostnameAddrMatch': -../os/access.c:1873:27: error: assignment to 'const char **' from incompatible pointer type 'char **' [-Wincompatible-pointer-types] - 1873 | for (addrlist = hp->h_addr_list; *addrlist; addrlist++) - | ^ - -Signed-off-by: Rudi Heitbaum rudi@heitbaum.com ---- - os/access.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/os/access.c b/os/access.c -index c7a2ab8c56..e694cd7925 100644 ---- a/os/access.c -+++ b/os/access.c -@@ -1882,7 +1882,7 @@ siHostnameAddrMatch(int family, void *addr, int len, - if ((hp = _XGethostbyname(hostname, hparams)) != NULL) { - #ifdef h_addr /* new 4.3bsd version of gethostent */ - /* iterate over the addresses */ -- for (addrlist = hp->h_addr_list; *addrlist; addrlist++) -+ for (addrlist = (const char **) hp->h_addr_list; *addrlist; addrlist++) - #else - addrlist = &hp->h_addr; - #endif --- -GitLab -