rpms/texstudio
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into f17

Browse Source
This commit is contained in:
hannes 2012-02-18 09:43:20 +00:00
commit 63cd0d6698
3 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
texstudio-2.3-gcc-4.7-build-failure.patch Normal file
View File

@ -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

29
texstudio-2.3-testcase.patch Normal file
View File

@ -0,0 +1,29 @@
From cb478565396b325a0860747a3c9c90789b13aea1 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Thu, 16 Feb 2012 20:49:50 +0000
Subject: [PATCH] Fix the testcase build failure
---
tests/qsearchreplacepanel_t.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qsearchreplacepanel_t.cpp b/tests/qsearchreplacepanel_t.cpp
index e043f8b..22d6013 100644
--- tests/qsearchreplacepanel_t.cpp
+++ tests/qsearchreplacepanel_t.cpp
@@ -213,9 +213,9 @@ void QSearchReplacePanelTest::incrementalsearch(){
widget->cFind->lineEdit()->cursorForward(false,search.length());
QTest::keyClick(widget->cFind->lineEdit(),search[search.length()-1].toLatin1());
}
- QDocumentCursor s=ed->cursor().selectionStart();
- QEQUAL2(s.lineNumber(), cy, search+" "+ed->cursor().selectedText()+" "+QString::number(loop));
- QEQUAL2(s.columnNumber(), cx, search+" "+ed->cursor().selectedText());
+ QDocumentCursor c=ed->cursor().selectionStart();
+ QEQUAL2(c.lineNumber(), cy, search+" "+ed->cursor().selectedText()+" "+QString::number(loop));
+ QEQUAL2(c.columnNumber(), cx, search+" "+ed->cursor().selectedText());
QEQUAL2(ed->cursor().selectedText(), res, search+" "+ed->cursor().selectedText());
//searching shouldn't change highlighted selection
QCEMULTIEQUAL(getHighlightedSelection(ed), panel->getSearchScope(), ed->document()->cursor(scopey1,scopex1,scopey2,scopex2));
--
1.7.7.6

7
texstudio.spec
View File

@ -14,6 +14,8 @@ 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
Patch4: texstudio-2.3-testcase.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
@ -45,7 +47,8 @@ so it keeps it look&feel.
%patch0 -p0 -b .hunspell
%patch1 -p0 -b .qtsingle
%patch2 -p0 -b .xdg
%patch3 -p0 -b .gcc4.7
%patch4 -p0 -b .testcase
rm -rf {hunspell,qtsingleapplication}
%build
@ -118,7 +121,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%changelog
* Sat Feb 18 2012 Johannes Lips <Johannes.Lips googlemail com> 2.3-2
- disabled the build of debug files, to get rid of the build patches
- disabled the build of debug files
* Thu Feb 09 2012 Johannes Lips <Johannes.Lips googlemail com> 2.3-1
- update to recent upstream version