From 85ced78004a26ec5c346ccd7a9eed66eb2a30ab8 Mon Sep 17 00:00:00 2001 From: hannes Date: Sat, 11 Feb 2012 11:41:46 +0000 Subject: [PATCH 1/3] fixed unpackaged files --- texstudio.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/texstudio.spec b/texstudio.spec index 0237e4d..3f26097 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -108,6 +108,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: %{_datadir}/texstudio/texstudio.svg %{_datadir}/texstudio/th_*.dat %{_datadir}/texstudio/thesaurus.png +%{_datadir}/texstudio/wizard_figure.png %{_datadir}/texstudio/usermanual_*.html %{_datadir}/applications/texstudio.desktop %{_datadir}/icons/hicolor/*/apps/*.png From 97563d108f9ae6f0cef05cd841c8fb7e713b7f5e Mon Sep 17 00:00:00 2001 From: hannes Date: Wed, 15 Feb 2012 20:07:30 +0000 Subject: [PATCH 2/3] Fix the gcc-4.7 build failure --- texstudio-2.3-gcc-4.7-build-failure.patch | 24 +++++++++++++++++++++++ texstudio.spec | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 texstudio-2.3-gcc-4.7-build-failure.patch diff --git a/texstudio-2.3-gcc-4.7-build-failure.patch b/texstudio-2.3-gcc-4.7-build-failure.patch new file mode 100644 index 0000000..3a073b7 --- /dev/null +++ b/texstudio-2.3-gcc-4.7-build-failure.patch @@ -0,0 +1,24 @@ +From 083a83f0810bd54c2caf04ccde1b0d96609ec5a9 Mon Sep 17 00:00:00 2001 +From: hannes +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 +--- a/qcodeedit/lib/document/qdocumentcommand.cpp ++++ b/qcodeedit/lib/document/qdocumentcommand.cpp +@@ -21,6 +21,7 @@ + */ + + #include "qdocument_p.h" ++#include "stdint.h" + + /*! + \ingroup document +-- +1.7.7.6 + diff --git a/texstudio.spec b/texstudio.spec index 3f26097..0bb387b 100644 --- a/texstudio.spec +++ b/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 2.3-1 - update to recent upstream version +- patch to fix gcc 4.7 build failure * Sat Jan 14 2012 Fedora Release Engineering - 2.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 709b432abf1a0174dddd0d869546df2e40d70d68 Mon Sep 17 00:00:00 2001 From: hannes Date: Wed, 15 Feb 2012 20:09:50 +0000 Subject: [PATCH 3/3] typo fixed --- texstudio-2.3-gcc-4.7-build-failure.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/texstudio-2.3-gcc-4.7-build-failure.patch b/texstudio-2.3-gcc-4.7-build-failure.patch index 3a073b7..8e08dfb 100644 --- a/texstudio-2.3-gcc-4.7-build-failure.patch +++ b/texstudio-2.3-gcc-4.7-build-failure.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix gcc 4.7 build failure diff --git a/qcodeedit/lib/document/qdocumentcommand.cpp b/qcodeedit/lib/document/qdocumentcommand.cpp index 308e4e4..bcb602c 100644 ---- a/qcodeedit/lib/document/qdocumentcommand.cpp -+++ b/qcodeedit/lib/document/qdocumentcommand.cpp +--- qcodeedit/lib/document/qdocumentcommand.cpp ++++ qcodeedit/lib/document/qdocumentcommand.cpp @@ -21,6 +21,7 @@ */