annotate src/mingw-pkg-config-1-gnu-printf.patch @ 5893:53a6c7df43f8

Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents c366dab2350c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5761
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 diff -Naur a/glib/configure.ac b/glib/configure.ac
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 --- a/glib/configure.ac 2015-09-21 15:38:33.000000000 +0300
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 +++ b/glib/configure.ac 2015-09-22 09:09:02.118820700 +0300
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 @@ -567,7 +567,7 @@
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 ])
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 fi
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 -AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8], [
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 +AS_IF([test x$ac_cv_sizeof_long_long = x8], [
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 # long long is a 64 bit integer.
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 AC_MSG_CHECKING(for format to printf and scanf a guint64)
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 AC_CACHE_VAL(glib_cv_long_long_format,[
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 @@ -589,8 +589,8 @@
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 AS_IF([ test -n "$glib_cv_long_long_format"], [
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 AC_MSG_RESULT(%${glib_cv_long_long_format}u)
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long])
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 - if test x"$glib_cv_long_long_format" = xI64; then
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 - AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64])
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 + if test x"$glib_cv_long_long_format" = xll; then
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 + AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format ll])
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 fi
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 ], [AC_MSG_RESULT(none)])
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 ],[ test x$ac_cv_sizeof___int64 = x8], [
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 @@ -3177,8 +3177,8 @@
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 glib_msize_type='LONG'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 ;;
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 "long long"|__int64)
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 - gsize_modifier='"I64"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 - gsize_format='"I64u"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 + gsize_modifier='"z"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 + gsize_format='"zu"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 glib_msize_type='INT64'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 ;;
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 esac
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 @@ -3200,8 +3200,8 @@
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 glib_mssize_type='LONG'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 ;;
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 "long long"|__int64)
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 - gssize_modifier='"I64"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 - gssize_format='"I64i"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 + gssize_modifier='"z"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 + gssize_format='"zi"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 glib_mssize_type='INT64'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 ;;
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 esac
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 @@ -3230,9 +3230,9 @@
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47 ;;
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 $ac_cv_sizeof_long_long)
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 glib_intptr_type_define='long long'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 - gintptr_modifier='"I64"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51 - gintptr_format='"I64i"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 - guintptr_format='"I64u"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 + gintptr_modifier='"ll"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54 + gintptr_format='"lli"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55 + guintptr_format='"llu"'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 glib_gpi_cast='(gint64)'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 glib_gpui_cast='(guint64)'
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58 ;;
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59 diff -Naur a/glib/glib/gmacros.h b/glib/glib/gmacros.h
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60 --- a/glib/glib/gmacros.h 2015-08-19 06:35:30.000000000 +0300
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61 +++ b/glib/glib/gmacros.h 2015-09-22 09:09:02.118820700 +0300
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 @@ -79,9 +79,9 @@
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
65 #define G_GNUC_PRINTF( format_idx, arg_idx ) \
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
66 - __attribute__((__format__ (__printf__, format_idx, arg_idx)))
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
67 + __attribute__((__format__ (gnu_printf, format_idx, arg_idx)))
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
68 #define G_GNUC_SCANF( format_idx, arg_idx ) \
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
69 - __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
70 + __attribute__((__format__ (gnu_scanf, format_idx, arg_idx)))
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
71 #define G_GNUC_FORMAT( arg_idx ) \
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
72 __attribute__((__format_arg__ (arg_idx)))
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
73 #define G_GNUC_NORETURN \
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
74 diff -Naur a/glib/glib/gpoll.h b/glib/glib/gpoll.h
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
75 --- a/glib/glib/gpoll.h 2014-12-20 00:49:48.000000000 +0300
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
76 +++ b/glib/glib/gpoll.h 2015-09-22 09:09:02.118820700 +0300
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
77 @@ -108,7 +108,7 @@
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
78 */
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
79 #ifdef G_OS_WIN32
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
80 #if GLIB_SIZEOF_VOID_P == 8
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
81 -#define G_POLLFD_FORMAT "%#I64x"
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
82 +#define G_POLLFD_FORMAT "%#llx"
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
83 #else
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
84 #define G_POLLFD_FORMAT "%#x"
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
85 #endif
c366dab2350c mingw-w64: update to v8.0.2
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
86