Update to 2.10.6

This commit is contained in:
hannes 2016-01-12 22:54:17 +01:00
parent d68720ad2b
commit ca7f4719c1
5 changed files with 25 additions and 23 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/texstudio-2.10.0.tar.gz
/texstudio-2.10.2.tar.gz
/texstudio-2.10.4.tar.gz
/texstudio-2.10.6.tar.gz

View File

@ -1 +1 @@
96b34746e5a2b7b41111cc7ac83d7a92 texstudio-2.10.4.tar.gz
f4eb08272b1c16e05fa02f08d6ed6578 texstudio-2.10.6.tar.gz

View File

@ -1,17 +1,17 @@
From c48ab724c814e2b825b299ce16d2b4a31f7814de Mon Sep 17 00:00:00 2001
From 35a5986a51c6949754355e0929ce81039abba506 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Tue, 27 Oct 2015 06:56:09 +0100
Subject: [PATCH] hunspell_patch
Date: Tue, 12 Jan 2016 22:43:19 +0100
Subject: [PATCH] hunspell patch
---
texstudio.pro | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
texstudio.pro | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/texstudio.pro b/texstudio.pro
index a7a82b4..6cefb60 100644
index d15e2b2..18031c2 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -486,7 +486,7 @@ unix {
@@ -471,7 +471,7 @@ unix {
}
DEFINES += HUNSPELL_STATIC
@ -20,18 +20,17 @@ index a7a82b4..6cefb60 100644
include(qcodeedit/qcodeedit.pri)
@@ -671,6 +671,11 @@ else {
@@ -589,3 +589,10 @@ else {
QMAKE_LFLAGS -= -Wl,-s
QMAKE_LFLAGS_RELEASE -= -Wl,-s
}
-
+# enable use of pkgconfig
+# enable use of pkgconfig
+unix {
+ CONFIG += link_pkgconfig
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
+
--
2.4.3
2.5.0

View File

@ -1,14 +1,14 @@
From 2aa5bfbd44cafa25e50ff67255ed1cc51ef94943 Mon Sep 17 00:00:00 2001
From c52b45c547568e7419512f5ed0c053853f9f4d32 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Tue, 27 Oct 2015 07:01:25 +0100
Subject: [PATCH 2/2] qtsingle_patch
Date: Tue, 12 Jan 2016 22:46:27 +0100
Subject: [PATCH 2/2] qtsingle
---
texstudio.pro | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro
index 6cefb60..abbeb06 100644
index 18031c2..95e53ec 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -34,8 +34,6 @@ QT += \
@ -20,14 +20,13 @@ index 6cefb60..abbeb06 100644
# ##############################
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
@@ -677,5 +675,7 @@ unix {
@@ -595,4 +593,6 @@ unix {
# use system hunspell
PKGCONFIG += hunspell
}
+#use system qtsingleapplication
+CONFIG += qtsingleapplication
--
2.4.3
2.5.0

View File

@ -1,6 +1,6 @@
Name: texstudio
Version: 2.10.4
Release: 2%{?dist}
Version: 2.10.6
Release: 1%{?dist}
Summary: A feature-rich editor for LaTeX documents
Group: Applications/Publishing
@ -131,6 +131,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
%changelog
* Tue Jan 12 2016 Johannes Lips <hannes@fedoraproject.org> 2.10.6-1
- Update to latest upstream bugfix release 2.10.6
* Wed Dec 16 2015 Johannes Lips <hannes@fedoraproject.org> 2.10.4-2
- added patch to disable update check