Wed Jul 21 21:56:11 2021 UTC ()
modular-xorg-server: back out one of the previous patches

The fix needs to go in compiler.h instead, like in xsrc.


(tnn)
diff -r1.111 -r1.112 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.1 -r0 pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_bsd__pci.c
cvs diff -r1.111 -r1.112 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2021/07/21 21:50:29 1.111
+++ pkgsrc/x11/modular-xorg-server/distinfo 2021/07/21 21:56:10 1.112
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1$NetBSD: distinfo,v 1.111 2021/07/21 21:50:29 tnn Exp $ 1$NetBSD: distinfo,v 1.112 2021/07/21 21:56:10 tnn Exp $
2 2
3SHA1 (xorg-server-1.20.12.tar.xz) = 2ff90fdccfe285e03ebb4805067bcdae557861ea 3SHA1 (xorg-server-1.20.12.tar.xz) = 2ff90fdccfe285e03ebb4805067bcdae557861ea
4RMD160 (xorg-server-1.20.12.tar.xz) = 04c946f6243ebb0d96f0ab4a9c53b982d2285a71 4RMD160 (xorg-server-1.20.12.tar.xz) = 04c946f6243ebb0d96f0ab4a9c53b982d2285a71
5SHA512 (xorg-server-1.20.12.tar.xz) = 98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406 5SHA512 (xorg-server-1.20.12.tar.xz) = 98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406
6Size (xorg-server-1.20.12.tar.xz) = 5143456 bytes 6Size (xorg-server-1.20.12.tar.xz) = 5143456 bytes
7SHA1 (patch-configure) = 4c2d439e622ec14ec2f8a3a2f556c67e60259f82 7SHA1 (patch-configure) = 4c2d439e622ec14ec2f8a3a2f556c67e60259f82
8SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3 8SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
9SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 9SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
10SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 10SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
11SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 11SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
12SHA1 (patch-hw_xfree86_os-support_bsd_alpha__video.c) = deb410b82c461ce36c15651795bf62370a56d5a4 12SHA1 (patch-hw_xfree86_os-support_bsd_alpha__video.c) = deb410b82c461ce36c15651795bf62370a56d5a4
13SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 13SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
14SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 14SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
15SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230 15SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
16SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 16SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
17SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60 17SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
18SHA1 (patch-hw_xfree86_os-support_bus_bsd__pci.c) = 62b410e1777c7bb95386b8510b3738fff5e088f1 
19SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400 18SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
20SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e 19SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
21SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 20SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
22SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0 21SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0
23SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f 22SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
File Deleted: pkgsrc/x11/modular-xorg-server/patches/Attic/patch-hw_xfree86_os-support_bus_bsd__pci.c