From ac65c81a2ae9d76d37aee6cbfa68a7cc85d96b7c Mon Sep 17 00:00:00 2001 From: hannes Date: Sat, 18 Feb 2012 09:26:34 +0000 Subject: [PATCH 1/2] Fixed the build to get rid of debug files --- texstudio-2.3-gcc-4.7-build-failure.patch | 24 ------------------- texstudio-2.3-testcase.patch | 29 ----------------------- texstudio.spec | 11 ++++----- 3 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 texstudio-2.3-gcc-4.7-build-failure.patch delete mode 100644 texstudio-2.3-testcase.patch diff --git a/texstudio-2.3-gcc-4.7-build-failure.patch b/texstudio-2.3-gcc-4.7-build-failure.patch deleted file mode 100644 index 8e08dfb..0000000 --- a/texstudio-2.3-gcc-4.7-build-failure.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 ---- 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 - diff --git a/texstudio-2.3-testcase.patch b/texstudio-2.3-testcase.patch deleted file mode 100644 index b3989e2..0000000 --- a/texstudio-2.3-testcase.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cb478565396b325a0860747a3c9c90789b13aea1 Mon Sep 17 00:00:00 2001 -From: hannes -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 - diff --git a/texstudio.spec b/texstudio.spec index e91faf9..f6f8f9c 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -1,6 +1,6 @@ Name: texstudio Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A feature-rich editor for LaTeX documents Group: Applications/Publishing @@ -14,8 +14,6 @@ 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 @@ -47,14 +45,12 @@ 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 export QTDIR=%{_libdir}/qt4 -qmake-qt4 texstudio.pro +qmake-qt4 CONFIG-=debug texstudio.pro make %{?_smp_mflags} %install @@ -121,6 +117,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt %changelog +* Sat Feb 18 2012 Johannes Lips 2.3-2 +- disabled the build of debug files, to get rid of the build patches + * Thu Feb 09 2012 Johannes Lips 2.3-1 - update to recent upstream version - patch to fix gcc 4.7 build failure From 7113fbe4c8140297ac9a8e4f4cd6c3b2a27ecc9c Mon Sep 17 00:00:00 2001 From: hannes Date: Sat, 18 Feb 2012 09:28:59 +0000 Subject: [PATCH 2/2] Upload of a fixed source package --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index f581dd2..672311c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd5c7f0f4ae498addf387e7058d5d919 texstudio-2.3.tar.gz +32cde0fe8398ec9b1d434c7ab6f70782 texstudio-2.3.tar.gz