gnu: xinit: Update to 1.4.4.

* gnu/packages/patches/xinit-startx-mcookie-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister patch.
* gnu/packages/xorg.scm (xinit): Update to 1.4.4
[source]: Remove patch.

Closes: #2772
Fixes: #2763
Change-Id: I1adc645ea9e9f1d897dc1f461aa58ad00bd7f6f9
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>

gnu/local.mk

@@ -2460,7 +2460,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch	\
   %D%/packages/patches/xfce4-settings-defaults.patch		\
   %D%/packages/patches/xgboost-use-system-dmlc-core.patch	\
-  %D%/packages/patches/xinit-startx-mcookie-path.patch		\
   %D%/packages/patches/xiphos-glib.patch                        \
   %D%/packages/patches/xmonad-dynamic-linking.patch		\
   %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch		\

gnu/packages/patches/xinit-startx-mcookie-path.patch

@@ -1,23 +0,0 @@
-This patch fixes two bugs in upstream mcookie detection: 1) If mcookie is not
-detected, we still need to set HAS_COOKIE_HANDLER and MK_COOKIE, and 2) the
-value for MK_COOKIE must be a string in order to disallow further preprocessor
-expansions.
-
-In particular for 2, if we fail to surround the path in quotes, our path
-contains the token "linux", which gcc further expands, creating an invalid
-path.
-
---- a/configure.ac	2025-03-08 16:48:34.476791744 +0900
-+++ b/configure.ac	2025-03-08 16:48:30.208791623 +0900
-@@ -157,8 +157,10 @@
-     fi
- fi
- if test "x$MCOOKIE" != x ; then
--	STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="$(MCOOKIE)"'
-+	STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="'"'"'$(MCOOKIE)'"'"'"'
- 	AC_MSG_NOTICE([startx will depend on "$MCOOKIE" to generate xauth cookies])
-+else
-+	STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE='
- fi
- AC_SUBST(STARTX_COOKIE_FLAGS)
- 

gnu/packages/xorg.scm

@@ -44,6 +44,7 @@
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2025 宋文武 <iyzsong@envs.net>
 ;;; Copyright © 2025 B. Wilson <elaexuotee@wilsonb.com>
+;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6202,16 +6203,13 @@ The XCB util-wm module provides the following libraries:
 (define-public xinit
   (package
     (name "xinit")
-    (version "1.4.3")
+    (version "1.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://xorg/individual/app/xinit-"
                                   version ".tar.xz"))
               (sha256
-               (base32
-                "0npx32mi035xkz26gp7raps5xsq4v7rgayy1q794h4d3lqhryh46"))
-              (patches
-                (search-patches "xinit-startx-mcookie-path.patch"))))
+               (base32 "1ygymifhg500sx1ybk8x4d1zn4g4ywvlnyvqwcf9hzsc2rx7r920"))))
     (build-system gnu-build-system)
     (inputs (list libx11 util-linux xorgproto))
     (native-inputs (list pkg-config))