xorgproto: inline patch due to errors fetching from AUR (#470698)

2026-04-04 23:33:38 +00:00
parent c53d6142cf b58bbed865
commit b54ed736c7
2 changed files with 15 additions and 4 deletions
@@ -0,0 +1,14 @@
+--- xorgproto-2018.4.orig/include/X11/meson.build	2018-02-28 16:45:07.000000000 +0000
+++ xorgproto-2018.4/include/X11/meson.build	2019-01-26 02:34:52.763165148 +0000
+@@ -10,8 +10,10 @@
+     endif
+ endforeach
+ 
+ # generated headers. try not to make more of these, please.
+-if cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers)
+if cc.get_define('_WIN32') == '1' and cc.get_define('CYGWIN') != '1'
+    fds_bits = 'dummy'
+elif cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers)
+     fds_bits = 'fds_bits'
+ elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers)
+     fds_bits = '__fds_bits'
@@ -21,10 +21,7 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    # small fix for mingw
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/meson.patch?h=mingw-w64-xorgproto&id=7b817efc3144a50e6766817c4ca7242f8ce49307";
-      sha256 = "sha256-Izzz9In53W7CC++k1bLr78iSrmxpFm1cH8qcSpptoUQ=";
-    })
+    ./meson.patch
  ];

  strictDeps = true;