Update to 2.6.6

This commit is contained in:
hannes 2013-11-04 20:51:30 +01:00
parent 33d44b1c73
commit ccd6cf086b
3 changed files with 37 additions and 35 deletions

View File

@ -1,17 +1,17 @@
From ba7a762549297d85e838f07c959786bd35095927 Mon Sep 17 00:00:00 2001 From 4d8b4c9a0cb9ee40cf36dbf0144fa96556bca487 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org> From: hannes <hannes@fedoraproject.org>
Date: Sat, 2 Nov 2013 07:13:52 +0000 Date: Mon, 4 Nov 2013 20:45:19 +0100
Subject: [PATCH] hunspell fix Subject: [PATCH] hunspell_patch
--- ---
spellerutility.h | 2 +- spellerutility.h | 2 +-
texstudio.pro | 8 +++++++- texstudio.pro | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/spellerutility.h b/spellerutility.h diff --git a/spellerutility.h b/spellerutility.h
index 7e1b980..c973220 100644 index 7e1b980..c973220 100644
--- spellerutility.h --- a/spellerutility.h
+++ spellerutility.h +++ b/spellerutility.h
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
#include "mostQtHeaders.h" #include "mostQtHeaders.h"
@ -22,29 +22,29 @@ index 7e1b980..c973220 100644
Q_OBJECT Q_OBJECT
public: public:
diff --git a/texstudio.pro b/texstudio.pro diff --git a/texstudio.pro b/texstudio.pro
index d9c9e64..31e1589 100644 index fedf628..bdc454b 100644
--- texstudio.pro --- a/texstudio.pro
+++ texstudio.pro +++ b/texstudio.pro
@@ -432,7 +432,7 @@ unix { @@ -433,7 +433,7 @@ unix {
utilities
} }
DEFINES += HUNSPELL_STATIC
-include(hunspell/hunspell.pri) -include(hunspell/hunspell.pri)
+include(hunspell.pri) +include(hunspell.pri)
include(qcodeedit/qcodeedit.pri) include(qcodeedit/qcodeedit.pri)
@@ -623,4 +623,10 @@ else { @@ -624,4 +624,9 @@ else {
QMAKE_LFLAGS -= -Wl,-s QMAKE_LFLAGS -= -Wl,-s
QMAKE_LFLAGS_RELEASE -= -Wl,-s QMAKE_LFLAGS_RELEASE -= -Wl,-s
} }
-
+# enable use of pkgconfig +# enable use of pkgconfig
+unix { +unix {
+ CONFIG += link_pkgconfig + CONFIG += link_pkgconfig
+ # use system hunspell + # use system hunspell
+ PKGCONFIG += hunspell + PKGCONFIG += hunspell
+} +}
-- --
1.8.3.1 1.8.3.1

View File

@ -1,14 +1,14 @@
From e2b9b897bc064fd75ac9c1a6bfa9b061cb2bc097 Mon Sep 17 00:00:00 2001 From 54aa115007d602a385ff50b1c7a311194a59a07d Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org> From: hannes <hannes@fedoraproject.org>
Date: Sat, 2 Nov 2013 07:20:05 +0000 Date: Mon, 4 Nov 2013 20:46:43 +0100
Subject: [PATCH] qtsingle Subject: [PATCH] qtsingle_patch
--- ---
texstudio.pro | 5 ++--- texstudio.pro | 4 ++--
1 file changed, 2 insertions(+), 3 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro diff --git a/texstudio.pro b/texstudio.pro
index 31e1589..77f8343 100644 index bdc454b..010e866 100644
--- a/texstudio.pro --- a/texstudio.pro
+++ b/texstudio.pro +++ b/texstudio.pro
@@ -18,8 +18,6 @@ QT += \ @@ -18,8 +18,6 @@ QT += \
@ -20,11 +20,10 @@ index 31e1589..77f8343 100644
# ############################## # ##############################
PRECOMPILED_HEADER = mostQtHeaders.h PRECOMPILED_HEADER = mostQtHeaders.h
@@ -629,4 +627,5 @@ unix { @@ -630,3 +628,5 @@ unix {
# use system hunspell # use system hunspell
PKGCONFIG += hunspell PKGCONFIG += hunspell
} }
-
+#use system qtsingleapplication +#use system qtsingleapplication
+CONFIG += qtsingleapplication +CONFIG += qtsingleapplication
-- --

View File

@ -1,5 +1,5 @@
Name: texstudio Name: texstudio
Version: 2.6.4 Version: 2.6.6
Release: 1%{?dist} Release: 1%{?dist}
Summary: A feature-rich editor for LaTeX documents Summary: A feature-rich editor for LaTeX documents
@ -42,7 +42,7 @@ so it keeps it look&feel.
%prep %prep
%setup -q -n %{name}%{version} %setup -q -n %{name}%{version}
%patch0 -p0 -b .hunspell %patch0 -p1 -b .hunspell
%patch1 -p1 -b .qtsingle %patch1 -p1 -b .qtsingle
%patch2 -p0 -b .xdg %patch2 -p0 -b .xdg
@ -124,6 +124,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
%changelog %changelog
* Sun Nov 03 2013 Johannes Lips <hannes@fedoraproject.org> 2.6.6-1
- Update to latest upstream version 2.6.6
* Sat Nov 02 2013 Johannes Lips <hannes@fedoraproject.org> 2.6.4-1 * Sat Nov 02 2013 Johannes Lips <hannes@fedoraproject.org> 2.6.4-1
- Update to latest upstream version 2.6.4 - Update to latest upstream version 2.6.4