[mingw-gdb] Update to 7.4.50 20120603 snapshot

[Erik van Pienbroek]

commit 0c8ae1c26a29f6085a46519ddc60b427f4f9667f
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Jun 15 20:00:52 2012 +0200

    Update to 7.4.50 20120603 snapshot
    
    and applied patch from Jan Kratochvil to fix compile failure

 .gitignore                           |    1 +
 gdb-use-correct-sprintf-format.patch |   46 ++++++++++++++++++++++++++++++++++
 mingw-gdb.spec                       |   18 +++++++++----
 sources                              |    2 +-
 4 files changed, 60 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dca9771..0bf166a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gdb-7.2.tar.bz2
 /gdb-7.3.tar.bz2
 /gdb-7.4.tar.bz2
+/gdb-7.4.50.20120603.tar.bz2
diff --git a/gdb-use-correct-sprintf-format.patch b/gdb-use-correct-sprintf-format.patch
new file mode 100644
index 0000000..f604b5d
--- /dev/null
+++ b/gdb-use-correct-sprintf-format.patch
@@ -0,0 +1,46 @@
+2012-06-15  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* common/buffer.c: Include inttypes.h and stdint.h.
+	(buffer_xml_printf): Use PRId64, PRIu64, PRIx64 and PRIo64.
+
+--- a/gdb/common/buffer.c
++++ b/gdb/common/buffer.c
+@@ -25,10 +25,12 @@
+ 
+ #include "xml-utils.h"
+ #include "buffer.h"
++#include "inttypes.h"
+ 
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <stdint.h>
+ 
+ void
+ buffer_grow (struct buffer *buffer, const char *data, size_t size)
+@@ -139,16 +141,20 @@ buffer_xml_printf (struct buffer *buffer, const char *format, ...)
+ 		  switch (*f)
+ 		    {
+ 		    case 'd':
+-		      sprintf (str, "%lld", va_arg (ap, long long));
++		      sprintf (str, "%" PRId64,
++			       (int64_t) va_arg (ap, long long));
+ 		      break;
+ 		    case 'u':
+-		      sprintf (str, "%llu", va_arg (ap, unsigned long long));
++		      sprintf (str, "%" PRIu64,
++			       (uint64_t) va_arg (ap, unsigned long long));
+ 		      break;
+ 		    case 'x':
+-		      sprintf (str, "%llx", va_arg (ap, unsigned long long));
++		      sprintf (str, "%" PRIx64,
++			       (uint64_t) va_arg (ap, unsigned long long));
+ 		      break;
+ 		    case 'o':
+-		      sprintf (str, "%llo", va_arg (ap, unsigned long long));
++		      sprintf (str, "%" PRIo64,
++			       (uint64_t) va_arg (ap, unsigned long long));
+ 		      break;
+ 		    default:
+ 		      str = 0;
+
diff --git a/mingw-gdb.spec b/mingw-gdb.spec
index 42f4c34..24794bb 100644
--- a/mingw-gdb.spec
+++ b/mingw-gdb.spec
@@ -1,10 +1,7 @@
-%?mingw_package_header
-
-%global mingw_build_win32 1
-%global mingw_build_win64 1
+%{?mingw_package_header}
 
 Name:           mingw-gdb
-Version:        7.4
+Version:        7.4.50.20120603
 Release:        1%{?dist}
 Summary:        MinGW Windows port of the GDB debugger
 
@@ -12,7 +9,11 @@ Summary:        MinGW Windows port of the GDB debugger
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
 Group:          Development/Libraries
 URL:            http://gnu.org/software/gdb/
-Source0:        ftp://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.bz2
+#Source0:        ftp://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.bz2
+Source0:        ftp://sourceware.org/pub/gdb/snapshots/current/gdb-%{version}.tar.bz2
+
+# Fix compilation failure which occurs on a sprintf("%llu", foo); call
+Patch0:         gdb-use-correct-sprintf-format.patch
 
 BuildArch:      noarch
 
@@ -60,6 +61,7 @@ This is the MinGW Windows port of the GDB, the GNU debugger.
 
 %prep
 %setup -q -n gdb-%{version}
+%patch0 -p1
 
 
 %build
@@ -101,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}/
 
 
 %changelog
+* Fri Jun 15 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 7.4.50.20120603-1
+- Update to 7.4.50 20120603 snapshot
+- Applied patch from Jan Kratochvil to fix compile failure
+
 * Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 7.4-1
 - Update to 7.4
 - Added win64 support
diff --git a/sources b/sources
index 12e778b..ca43fe1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95a9a8305fed4d30a30a6dc28ff9d060  gdb-7.4.tar.bz2
+d6766c3ec4444f337cb0d7a0265130f9  gdb-7.4.50.20120603.tar.bz2