[mingw-glib2] Include <stdint.h>, required by valgrind.h only on Rawhide.

Richard W.M. Jones rjones at fedoraproject.org
Fri May 16 13:43:04 UTC 2014


commit 45af503c31678eccd7e66911d3dd94e572be45fe
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri May 16 09:21:06 2014 -0400

    Include <stdint.h>, required by valgrind.h only on Rawhide.

 glib-update-valgrind-h-stdint.patch |   10 ++++++++++
 mingw-glib2.spec                    |    7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/glib-update-valgrind-h-stdint.patch b/glib-update-valgrind-h-stdint.patch
new file mode 100644
index 0000000..7ec334b
--- /dev/null
+++ b/glib-update-valgrind-h-stdint.patch
@@ -0,0 +1,10 @@
+--- ./glib-2.40.0/glib/valgrind.h.old	2014-05-16 09:19:32.211000000 -0400
++++ ./glib-2.40.0/glib/valgrind.h	2014-05-16 09:19:50.043000000 -0400
+@@ -93,6 +93,7 @@
+ 
+ 
+ #include <stdarg.h>
++#include <stdint.h>
+ 
+ /* Nb: this file might be included in a file compiled with -ansi.  So
+    we can't use C++ style "//" comments nor the "asm" keyword (instead
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index 770751b..9cae16b 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-glib2
 Version:        2.40.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -58,6 +58,7 @@ Patch5:         glib-prefer-constructors-over-DllMain.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=730198
 # We can drop this at next glib release.
 Patch6:         glib-update-valgrind-h.patch
+Patch7:         glib-update-valgrind-h-stdint.patch
 
 
 %description
@@ -105,6 +106,7 @@ Static version of the MinGW Windows GLib2 library.
 %patch3 -p0
 %patch5 -p1
 %patch6 -p1
+%patch7 -p2
 
 
 %build
@@ -285,8 +287,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
-* Thu May 15 2014 Richard W.M. Jones <rjones at redhat.com> - 2.40.0-2
+* Thu May 15 2014 Richard W.M. Jones <rjones at redhat.com> - 2.40.0-3
 - Fix valgrind support (RHBZ#1095664, GNOME bug 730198).
+- Include <stdint.h>, required by valgrind.h only on Rawhide.
 
 * Sat Mar 29 2014 Kalev Lember <kalevlember at gmail.com> - 2.40.0-1
 - Update to 2.40.0


More information about the scm-commits mailing list