Update to 2.11.0

This commit is contained in:
hannes 2016-05-30 22:04:29 +02:00
parent de5ab6c73f
commit 6041ab3b92
5 changed files with 38 additions and 36 deletions

1
.gitignore vendored
View File

@ -22,3 +22,4 @@
/texstudio-2.10.4.tar.gz
/texstudio-2.10.6.tar.gz
/texstudio-2.10.8.tar.gz
/texstudio-2.11.0.tar.gz

View File

@ -1 +1 @@
a14008ff4d23f33ae2f14dbb4efdcc35 texstudio-2.10.8.tar.gz
9bfd48e82e9cb1a9f1bb3055c262e658 texstudio-2.11.0.tar.gz

View File

@ -1,36 +1,35 @@
From 35a5986a51c6949754355e0929ce81039abba506 Mon Sep 17 00:00:00 2001
From 40c8d06b99065e79045ed0371b025c5ab7d6b065 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Tue, 12 Jan 2016 22:43:19 +0100
Subject: [PATCH] hunspell patch
Date: Mon, 30 May 2016 21:44:02 +0200
Subject: [PATCH] hunspell-patch
---
texstudio.pro | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
texstudio.pro | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/texstudio.pro b/texstudio.pro
index d15e2b2..18031c2 100644
index d479d11..5410558 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -471,7 +471,7 @@ unix {
}
@@ -480,7 +480,7 @@ unix {
DEFINES += HUNSPELL_STATIC
-include(hunspell/hunspell.pri)
+include(hunspell.pri)
include(qcodeedit/qcodeedit.pri)
@@ -589,3 +589,10 @@ else {
isEmpty(USE_SYSTEM_HUNSPELL){
DEFINES += HUNSPELL_STATIC
- include(hunspell/hunspell.pri)
+ include(hunspell.pri)
} else {
CONFIG += link_pkgconfig
PKGCONFIG += hunspell
@@ -610,3 +610,9 @@ else {
QMAKE_LFLAGS -= -Wl,-s
QMAKE_LFLAGS_RELEASE -= -Wl,-s
}
+# enable use of pkgconfig
+unix {
+ CONFIG += link_pkgconfig
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
+
+unix {
+ CONFIG += link_pkgconfig
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
--
2.5.0
2.5.5

View File

@ -1,6 +1,6 @@
From c52b45c547568e7419512f5ed0c053853f9f4d32 Mon Sep 17 00:00:00 2001
From 2cb4629827f5cc1ccc7127863fa724c34e646c5b Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Tue, 12 Jan 2016 22:46:27 +0100
Date: Mon, 30 May 2016 21:46:51 +0200
Subject: [PATCH 2/2] qtsingle
---
@ -8,7 +8,7 @@ Subject: [PATCH 2/2] qtsingle
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro
index 18031c2..95e53ec 100644
index 5410558..af07983 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -34,8 +34,6 @@ QT += \
@ -20,13 +20,12 @@ index 18031c2..95e53ec 100644
# ##############################
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
@@ -595,4 +593,6 @@ unix {
# use system hunspell
PKGCONFIG += hunspell
}
+#use system qtsingleapplication
+CONFIG += qtsingleapplication
@@ -616,3 +614,5 @@ unix {
# use system hunspell
PKGCONFIG += hunspell
}
+#use system qtsingleapplication
+CONFIG += qtsingleapplication
--
2.5.0
2.5.5

View File

@ -1,6 +1,6 @@
Name: texstudio
Version: 2.10.8
Release: 3%{?dist}
Version: 2.11.0
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
* Mon May 30 2016 Johannes Lips <hannes@fedoraproject.org> 2.11.0-1
- Update to latest upstream bugfix release 2.11.0
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild