SliTaz Repositories

     1.1 --- a/broadcom-wl-pae/receipt	Tue Sep 30 07:43:04 2025 +0000
     1.2 +++ b/broadcom-wl-pae/receipt	Tue Sep 30 08:15:48 2025 +0000
     1.3 @@ -40,6 +40,7 @@
     1.4  016-linux51.patch
     1.5  017-linux56.patch
     1.6  018-linux59.patch
     1.7 +fix_time_macros_gcc10.patch
     1.8  EOT
     1.9  
    1.10      KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/broadcom-wl-pae/stuff/fix_time_macros_gcc10.patch	Tue Sep 30 08:15:48 2025 +0000
     2.3 @@ -0,0 +1,22 @@
     2.4 +--- a/src/wl/sys/wl_linux.c
     2.5 ++++ b/src/wl/sys/wl_linux.c
     2.6 +@@ -728,7 +728,7 @@
     2.7 + 		WL_ALL_PASSIVE_ENAB(wl) ?  ", Passive Mode" : "", EPI_VERSION_STR);
     2.8 + 
     2.9 + #ifdef BCMDBG
    2.10 +-	printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
    2.11 ++	printf(" (Compiled in " SRCBASE ")");
    2.12 + #endif 
    2.13 + 	printf("\n");
    2.14 + 
    2.15 +@@ -2087,8 +2087,8 @@
    2.16 + void
    2.17 + wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
    2.18 + {
    2.19 +-	bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
    2.20 +-		__DATE__, __TIME__, EPI_VERSION_STR);
    2.21 ++	bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
    2.22 ++		EPI_VERSION_STR);
    2.23 + }
    2.24 + 
    2.25 + #if defined(BCMDBG)

     3.1 --- a/broadcom-wl/receipt	Tue Sep 30 07:43:04 2025 +0000
     3.2 +++ b/broadcom-wl/receipt	Tue Sep 30 08:15:48 2025 +0000
     3.3 @@ -39,6 +39,7 @@
     3.4  016-linux51.patch
     3.5  017-linux56.patch
     3.6  018-linux59.patch
     3.7 +fix_time_macros_gcc10.patch
     3.8  EOT
     3.9  
    3.10      KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/broadcom-wl/stuff/fix_time_macros_gcc10.patch	Tue Sep 30 08:15:48 2025 +0000
     4.3 @@ -0,0 +1,22 @@
     4.4 +--- a/src/wl/sys/wl_linux.c
     4.5 ++++ b/src/wl/sys/wl_linux.c
     4.6 +@@ -728,7 +728,7 @@
     4.7 + 		WL_ALL_PASSIVE_ENAB(wl) ?  ", Passive Mode" : "", EPI_VERSION_STR);
     4.8 + 
     4.9 + #ifdef BCMDBG
    4.10 +-	printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
    4.11 ++	printf(" (Compiled in " SRCBASE ")");
    4.12 + #endif 
    4.13 + 	printf("\n");
    4.14 + 
    4.15 +@@ -2087,8 +2087,8 @@
    4.16 + void
    4.17 + wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
    4.18 + {
    4.19 +-	bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
    4.20 +-		__DATE__, __TIME__, EPI_VERSION_STR);
    4.21 ++	bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
    4.22 ++		EPI_VERSION_STR);
    4.23 + }
    4.24 + 
    4.25 + #if defined(BCMDBG)

     5.1 --- a/busybox-slish/receipt	Tue Sep 30 07:43:04 2025 +0000
     5.2 +++ b/busybox-slish/receipt	Tue Sep 30 08:15:48 2025 +0000
     5.3 @@ -15,6 +15,9 @@
     5.4  # I dont want to compile all BB packages just for a basic build!
     5.5  #
     5.6  compile_rules() {
     5.7 +	# Patch to be build with new glibc (stime removed)
     5.8 +	patch -p1 < $stuff/busybox-remove-stime.patch
     5.9 +
    5.10  	sed -i 's|uname -m|echo i486|' Makefile
    5.11  	cp $stuff/busybox-${VERSION%.*}.config .config
    5.12  	make oldconfig && 

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/busybox-slish/stuff/busybox-remove-stime.patch	Tue Sep 30 08:15:48 2025 +0000
     6.3 @@ -0,0 +1,61 @@
     6.4 +--- a/coreutils/date.c
     6.5 ++++ b/coreutils/date.c
     6.6 +@@ -267,6 +267,9 @@
     6.7 + 		time(&ts.tv_sec);
     6.8 + #endif
     6.9 + 	}
    6.10 ++#if !ENABLE_FEATURE_DATE_NANO
    6.11 ++ ts.tv_nsec = 0;
    6.12 ++#endif
    6.13 + 	localtime_r(&ts.tv_sec, &tm_time);
    6.14 + 
    6.15 + 	/* If date string is given, update tm_time, and maybe set date */
    6.16 +@@ -289,11 +292,12 @@
    6.17 + 		if (date_str[0] != '@')
    6.18 + 			tm_time.tm_isdst = -1;
    6.19 + 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
    6.20 ++		ts.tv_nsec = 0;
    6.21 + 
    6.22 + 		maybe_set_utc(opt);
    6.23 + 
    6.24 + 		/* if setting time, set it */
    6.25 +-		if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
    6.26 ++		if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
    6.27 + 			bb_perror_msg("can't set date");
    6.28 + 		}
    6.29 + 	}
    6.30 +--- a/libbb/missing_syscalls.c
    6.31 ++++ b/libbb/missing_syscalls.c
    6.32 +@@ -16,14 +16,6 @@
    6.33 + 	return syscall(__NR_getsid, pid);
    6.34 + }
    6.35 + 
    6.36 +-int stime(const time_t *t)
    6.37 +-{
    6.38 +-	struct timeval tv;
    6.39 +-	tv.tv_sec = *t;
    6.40 +-	tv.tv_usec = 0;
    6.41 +-	return settimeofday(&tv, NULL);
    6.42 +-}
    6.43 +-
    6.44 + int sethostname(const char *name, size_t len)
    6.45 + {
    6.46 + 	return syscall(__NR_sethostname, name, len);
    6.47 +--- a/util-linux/rdate.c
    6.48 ++++ b/util-linux/rdate.c
    6.49 +@@ -67,9 +67,13 @@
    6.50 + 		time(&current_time);
    6.51 + 		if (current_time == remote_time)
    6.52 + 			bb_error_msg("current time matches remote time");
    6.53 +-		else
    6.54 +-			if (stime(&remote_time) < 0)
    6.55 ++		else {
    6.56 ++			struct timespec ts;
    6.57 ++			ts.tv_sec = remote_time;
    6.58 ++			ts.tv_nsec = 0;
    6.59 ++			if (clock_settime(CLOCK_REALTIME, &ts) < 0)
    6.60 + 				bb_perror_msg_and_die("can't set time of day");
    6.61 ++		}
    6.62 + 	}
    6.63 + 
    6.64 + 	if (flags != 1) /* not lone -s */

     7.1 --- a/gcc49/receipt	Tue Sep 30 07:43:04 2025 +0000
     7.2 +++ b/gcc49/receipt	Tue Sep 30 08:15:48 2025 +0000
     7.3 @@ -56,6 +56,8 @@
     7.4  
     7.5  	# Patch sanitizer only on x86_64
     7.6  	case $ARCH in
     7.7 +		i?86)
     7.8 +			patch -p1 < $stuff/build_with_glibc-2.31.patch ;;
     7.9  		x86_64)
    7.10  			patch -p1 < $stuff/fix_sanitizer.patch ;;
    7.11  	esac

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/gcc49/stuff/build_with_glibc-2.31.patch	Tue Sep 30 08:15:48 2025 +0000
     8.3 @@ -0,0 +1,38 @@
     8.4 +--- gcc-4.9.4/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc  2020-03-21 17:37:23.620440276 +0100
     8.5 ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc  2020-03-21 17:36:36.520276053 +0100
     8.6 +@@ -939,7 +939,11 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
     8.7 + CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
     8.8 + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
     8.9 + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
    8.10 ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
    8.11 ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
    8.12 ++   on many architectures.  */
    8.13 + CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
    8.14 ++#endif
    8.15 + CHECK_SIZE_AND_OFFSET(ipc_perm, __seq);
    8.16 + 
    8.17 + CHECK_TYPE_SIZE(shmid_ds);
    8.18 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h	2014-10-14 21:26:42.000000000 +0200
    8.19 ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h	2020-03-21 13:03:32.238797548 +0100
    8.20 +@@ -154,20 +154,13 @@ namespace __sanitizer {
    8.21 +     u64 __unused1;
    8.22 +     u64 __unused2;
    8.23 + #elif defined(__sparc__)
    8.24 +-# if defined(__arch64__)
    8.25 +     unsigned mode;
    8.26 +-    unsigned short __pad1;
    8.27 +-# else
    8.28 +-    unsigned short __pad1;
    8.29 +-    unsigned short mode;
    8.30 +     unsigned short __pad2;
    8.31 +-# endif
    8.32 +     unsigned short __seq;
    8.33 +     unsigned long long __unused1;
    8.34 +     unsigned long long __unused2;
    8.35 + #else
    8.36 +-    unsigned short mode;
    8.37 +-    unsigned short __pad1;
    8.38 ++    unsigned int mode;
    8.39 +     unsigned short __seq;
    8.40 +     unsigned short __pad2;
    8.41 + #if defined(__x86_64__) && !defined(_LP64)

     9.1 --- a/grub2-efi/receipt	Tue Sep 30 07:43:04 2025 +0000
     9.2 +++ b/grub2-efi/receipt	Tue Sep 30 08:15:48 2025 +0000
     9.3 @@ -41,6 +41,10 @@
     9.4  	# see also: http://git.savannah.gnu.org/cgit/grub.git/commit/?id=6643507ce
     9.5  
     9.6  	case $SLITAZ_ARCH in
     9.7 +		i?86)
     9.8 +			# Fix build with gcc10
     9.9 +			# see https://www.mail-archive.com/grub-devel@gnu.org/msg29867.html
    9.10 +			patch -p1 < $stuff/fix-gcc10.patch ;;
    9.11  		x86_64)
    9.12  			sed -i 's|sys/types.h>|&\n#include <sys/sysmacros.h>|' util/getroot.c grub-core/kern/emu/hostdisk.c
    9.13  

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/grub2-efi/stuff/fix-gcc10.patch	Tue Sep 30 08:15:48 2025 +0000
    10.3 @@ -0,0 +1,139 @@
    10.4 +From fe8a83722bf1af7ea3949e6d96e7906407f78d5c Mon Sep 17 00:00:00 2001
    10.5 +From: Michael Chang <mchang@suse.com>
    10.6 +Date: Wed, 25 Mar 2020 13:52:51 +0800
    10.7 +Subject: [PATCH 1/2] mdraid1x_linux: Fix gcc10 error -Werror=array-bounds
    10.8 +
    10.9 +We bumped into the build error while testing gcc-10 pre-release.
   10.10 +
   10.11 +../../grub-core/disk/mdraid1x_linux.c: In function 'grub_mdraid_detect':
   10.12 +../../grub-core/disk/mdraid1x_linux.c:181:15: error: array subscript <unknown> is outside array bounds of 'grub_uint16_t[0]' {aka 'short unsigned int[0]'} [-Werror=array-bounds]
   10.13 +  181 |      (char *) &sb.dev_roles[grub_le_to_cpu32 (sb.dev_number)]
   10.14 +      |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   10.15 +../../grub-core/disk/mdraid1x_linux.c:98:17: note: while referencing 'dev_roles'
   10.16 +   98 |   grub_uint16_t dev_roles[0]; /* Role in array, or 0xffff for a spare, or 0xfffe for faulty.  */
   10.17 +      |                 ^~~~~~~~~
   10.18 +../../grub-core/disk/mdraid1x_linux.c:127:33: note: defined here 'sb'
   10.19 +  127 |       struct grub_raid_super_1x sb;
   10.20 +      |                                 ^~
   10.21 +cc1: all warnings being treated as errors
   10.22 +
   10.23 +Apparently gcc issues the warning when trying to access sb.dev_roles
   10.24 +array's member, since it is a zero length array as the last element of
   10.25 +struct grub_raid_super_1x that is allocated sparsely without extra
   10.26 +chunks for the trailing bits, so the warning looks legitimate in this
   10.27 +regard.
   10.28 +
   10.29 +As the whole thing here is doing offset computation, it is undue to use
   10.30 +syntax that would imply array member access then take address from it
   10.31 +later. Instead we could accomplish the same thing through basic array
   10.32 +pointer arithmetic to pacify the warning.
   10.33 +
   10.34 +Signed-off-by: Michael Chang <mchang@suse.com>
   10.35 +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
   10.36 +---
   10.37 + grub-core/disk/mdraid1x_linux.c | 2 +-
   10.38 + 1 file changed, 1 insertion(+), 1 deletion(-)
   10.39 +
   10.40 +diff --git a/grub-core/disk/mdraid1x_linux.c b/grub-core/disk/mdraid1x_linux.c
   10.41 +index 7cc80d3df..c980feba4 100644
   10.42 +--- a/grub-core/disk/mdraid1x_linux.c
   10.43 ++++ b/grub-core/disk/mdraid1x_linux.c
   10.44 +@@ -178,7 +178,7 @@ grub_mdraid_detect (grub_disk_t disk,
   10.45 + 	return NULL;
   10.46 + 
   10.47 +       if (grub_disk_read (disk, sector, 
   10.48 +-			  (char *) &sb.dev_roles[grub_le_to_cpu32 (sb.dev_number)]
   10.49 ++			  (char *) (sb.dev_roles + grub_le_to_cpu32 (sb.dev_number))
   10.50 + 			  - (char *) &sb,
   10.51 + 			  sizeof (role), &role))
   10.52 + 	return NULL;
   10.53 +-- 
   10.54 +2.16.4
   10.55 +
   10.56 +From 30379c2280c5b4514abafc2492e081209a330cb0 Mon Sep 17 00:00:00 2001
   10.57 +From: Michael Chang <mchang@suse.com>
   10.58 +Date: Wed, 25 Mar 2020 14:28:15 +0800
   10.59 +Subject: [PATCH 2/2] zfs: Fix gcc10 error -Werror=zero-length-bounds
   10.60 +
   10.61 +We bumped into the build error while testing gcc-10 pre-release.
   10.62 +
   10.63 +In file included from ../../include/grub/file.h:22,
   10.64 +		from ../../grub-core/fs/zfs/zfs.c:34:
   10.65 +../../grub-core/fs/zfs/zfs.c: In function 'zap_leaf_lookup':
   10.66 +../../grub-core/fs/zfs/zfs.c:2263:44: error: array subscript '<unknown>' is outside the bounds of an interior zero-length array 'grub_uint16_t[0]' {aka 'short unsigned int[0]'} [-Werror=zero-length-bounds]
   10.67 +2263 |   for (chunk = grub_zfs_to_cpu16 (l->l_hash[LEAF_HASH (blksft, h, l)], endian);
   10.68 +../../include/grub/types.h:241:48: note: in definition of macro 'grub_le_to_cpu16'
   10.69 + 241 | # define grub_le_to_cpu16(x) ((grub_uint16_t) (x))
   10.70 +     |                                                ^
   10.71 +../../grub-core/fs/zfs/zfs.c:2263:16: note: in expansion of macro 'grub_zfs_to_cpu16'
   10.72 +2263 |   for (chunk = grub_zfs_to_cpu16 (l->l_hash[LEAF_HASH (blksft, h, l)], endian);
   10.73 +     |                ^~~~~~~~~~~~~~~~~
   10.74 +In file included from ../../grub-core/fs/zfs/zfs.c:48:
   10.75 +../../include/grub/zfs/zap_leaf.h:72:16: note: while referencing 'l_hash'
   10.76 +  72 |  grub_uint16_t l_hash[0];
   10.77 +     |                ^~~~~~
   10.78 +
   10.79 +Here I'd like to quote from the gcc document [1] which seems best to
   10.80 +explain what is going on here.
   10.81 +
   10.82 +"Although the size of a zero-length array is zero, an array member of
   10.83 +this kind may increase the size of the enclosing type as a result of
   10.84 +tail padding. The offset of a zero-length array member from the
   10.85 +beginning of the enclosing structure is the same as the offset of an
   10.86 +array with one or more elements of the same type. The alignment of a
   10.87 +zero-length array is the same as the alignment of its elements.
   10.88 +
   10.89 +Declaring zero-length arrays in other contexts, including as interior
   10.90 +members of structure objects or as non-member objects, is discouraged.
   10.91 +Accessing elements of zero-length arrays declared in such contexts is
   10.92 +undefined and may be diagnosed."
   10.93 +
   10.94 +The l_hash[0] is apparnetly an interior member to the enclosed structure
   10.95 +while l_entries[0] is the trailing member. And the offending code tries
   10.96 +to access members in l_hash[0] array that triggers the diagnose.
   10.97 +
   10.98 +Given that the l_entries[0] is used to get proper alignment to access
   10.99 +leaf chunks, we can accomplish the same thing through the ALIGN_UP macro
  10.100 +thus eliminating l_entries[0] from the structure. In this way we can
  10.101 +pacify the warning as l_hash[0] now becomes the last member to the
  10.102 +enclosed structure.
  10.103 +
  10.104 +[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
  10.105 +
  10.106 +Signed-off-by: Michael Chang <mchang@suse.com>
  10.107 +---
  10.108 + grub-core/fs/zfs/zfs.c      | 5 ++++-
  10.109 + include/grub/zfs/zap_leaf.h | 1 -
  10.110 + 2 files changed, 4 insertions(+), 2 deletions(-)
  10.111 +
  10.112 +diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
  10.113 +index 2f72e42bf..b5e10fd0b 100644
  10.114 +--- a/grub-core/fs/zfs/zfs.c
  10.115 ++++ b/grub-core/fs/zfs/zfs.c
  10.116 +@@ -141,7 +141,10 @@ ZAP_LEAF_NUMCHUNKS (int bs)
  10.117 + static inline zap_leaf_chunk_t *
  10.118 + ZAP_LEAF_CHUNK (zap_leaf_phys_t *l, int bs, int idx)
  10.119 + {
  10.120 +-  return &((zap_leaf_chunk_t *) (l->l_entries 
  10.121 ++  grub_properly_aligned_t *l_entries;
  10.122 ++
  10.123 ++  l_entries = (grub_properly_aligned_t *) ALIGN_UP((grub_addr_t)l->l_hash, sizeof (grub_properly_aligned_t));
  10.124 ++  return &((zap_leaf_chunk_t *) (l_entries
  10.125 + 				 + (ZAP_LEAF_HASH_NUMENTRIES(bs) * 2)
  10.126 + 				 / sizeof (grub_properly_aligned_t)))[idx];
  10.127 + }
  10.128 +diff --git a/include/grub/zfs/zap_leaf.h b/include/grub/zfs/zap_leaf.h
  10.129 +index 95c67dcba..11447c166 100644
  10.130 +--- a/include/grub/zfs/zap_leaf.h
  10.131 ++++ b/include/grub/zfs/zap_leaf.h
  10.132 +@@ -70,7 +70,6 @@ typedef struct zap_leaf_phys {
  10.133 + 	 */
  10.134 + 
  10.135 + 	grub_uint16_t l_hash[0];
  10.136 +-        grub_properly_aligned_t l_entries[0];
  10.137 + } zap_leaf_phys_t;
  10.138 + 
  10.139 + typedef union zap_leaf_chunk {
  10.140 +-- 
  10.141 +2.16.4
  10.142 +

    11.1 --- a/xorg-server/receipt	Tue Sep 30 07:43:04 2025 +0000
    11.2 +++ b/xorg-server/receipt	Tue Sep 30 08:15:48 2025 +0000
    11.3 @@ -118,6 +118,13 @@
    11.4  	# See https://gitlab.archlinux.org/archlinux/packaging/packages/xorg-server/-/tree/1.20.13-3?ref_type=tags
    11.5  	patch -p1 < $stuff/fix-libshadow.patch
    11.6  
    11.7 +	# Seem issue with gcc10 beed array-bounds ignore
    11.8 +	# see https://bugs.gentoo.org/926355
    11.9 +	case $SLITAZ_ARCH in
   11.10 +		i?86)
   11.11 +			export CFLAGS="$CFLAGS -Wno-error=array-bounds" ;;
   11.12 +	esac
   11.13 +
   11.14  	# Xephyr make possible to use Xorg in a chroot.
   11.15  	./configure \
   11.16  		--prefix=/usr \

    12.1 --- a/xorg-xf86-video-intel/receipt	Tue Sep 30 07:43:04 2025 +0000
    12.2 +++ b/xorg-xf86-video-intel/receipt	Tue Sep 30 08:15:48 2025 +0000
    12.3 @@ -10,12 +10,7 @@
    12.4  WEB_SITE="https://www.x.org/wiki/"
    12.5  
    12.6  SOURCE="xf86-video-intel"
    12.7 -case $SLITAZ_ARCH in
    12.8 -	i?86)
    12.9 -		BRANCH="d39197bb" ;;
   12.10 -	x86_64)
   12.11 -		BRANCH="a511f22c" ;;
   12.12 -esac
   12.13 +BRANCH="a511f22c"
   12.14  TARBALL="$SOURCE-$VERSION-$BRANCH.tar.bz2"
   12.15  WGET_URL="git|https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git"
   12.16  
   12.17 @@ -38,22 +33,6 @@
   12.18  # Rules to configure and make the package.
   12.19  compile_rules()
   12.20  {
   12.21 -	case $SLITAZ_ARCH in
   12.22 -		i?86)
   12.23 -			# Patch from use driver with new Xorg
   12.24 -			# see https://gnats.netbsd.org/51687
   12.25 -			patch -Np1 < $stuff/patch-src_compat-api.h
   12.26 -			patch -Np1 < $stuff/patch-src_legacy_i810_i810__video.c
   12.27 -			patch -Np1 < $stuff/patch-src_sna_sna__accel.c
   12.28 -			patch -Np1 < $stuff/patch-src_sna_sna__acpi.c
   12.29 -			patch -Np1 < $stuff/patch-src_sna_sna__driver.c
   12.30 -			patch -Np1 < $stuff/patch-src_sna_sna.h
   12.31 -			patch -Np1 < $stuff/patch-src_uxa_intel__display.c
   12.32 -			patch -Np1 < $stuff/patch-src_uxa_intel.h
   12.33 -			# see https://lists.x.org/archives/xorg-devel/2018-May/056924.html
   12.34 -			patch -Np1 < $stuff/patch2-src_sna_sna__accel.c
   12.35 -	esac
   12.36 -
   12.37  	# Patch to fix build for i686
   12.38  	# see https://src.fedoraproject.org/rpms/xorg-x11-drv-intel/c/f2e86334f3a168b04afddb57d4bc4f630e59a5e9
   12.39  	patch -Np1 < $stuff/fix_build_i686.patch