Merge branch 'master' into f17

texstudio-2.3-gcc-4.7-build-failure.patch

@@ -0,0 +1,24 @@
+From 083a83f0810bd54c2caf04ccde1b0d96609ec5a9 Mon Sep 17 00:00:00 2001
+From: hannes <hannes@fedoraproject.org>
+Date: Wed, 15 Feb 2012 20:03:33 +0000
+Subject: [PATCH] Fix gcc 4.7 build failure
+
+---
+ qcodeedit/lib/document/qdocumentcommand.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qcodeedit/lib/document/qdocumentcommand.cpp b/qcodeedit/lib/document/qdocumentcommand.cpp
+index 308e4e4..bcb602c 100644
+--- qcodeedit/lib/document/qdocumentcommand.cpp
++++ qcodeedit/lib/document/qdocumentcommand.cpp
+@@ -21,6 +21,7 @@
+ */
+ 
+ #include "qdocument_p.h"
++#include "stdint.h"
+ 
+ /*!
+ 	\ingroup document
+-- 
+1.7.7.6
+

texstudio.spec

@@ -14,6 +14,7 @@ Source1:        texstudio.desktop
 Patch0:         texstudio-use-system-hunspell-instead-of-bundled-one.patch
 Patch1:         texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
 Patch2:         texstudio-viewers-use-xdg-open.patch
+Patch3:         texstudio-2.3-gcc-4.7-build-failure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -45,6 +46,7 @@ so it keeps it look&feel.
 %patch0 -p0 -b .hunspell
 %patch1 -p0 -b .qtsingle
 %patch2 -p0 -b .xdg
+%patch3 -p0 -b .gcc4.7
 
 rm -rf {hunspell,qtsingleapplication}
 
@@ -119,6 +121,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
 %changelog
 * Thu Feb 09 2012 Johannes Lips <Johannes.Lips googlemail com> 2.3-1
 - update to recent upstream version
+- patch to fix gcc 4.7 build failure
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild