Update to 2.8.0

This commit is contained in:
hannes 2014-06-20 19:40:50 +02:00
parent 1ae5be2044
commit df79cf6f8a
6 changed files with 39 additions and 34 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/texstudio-2.6.4.tar.gz
/texstudio-2.6.6.tar.gz
/texstudio-2.7.0.tar.gz
/texstudio-2.8.0.tar.gz

View File

@ -1 +1 @@
e2745d828d2c945bea97ea42e57fc881 texstudio-2.7.0.tar.gz
01205800d4a4fdc3ade4f761eabd8e3b texstudio-2.8.0.tar.gz

View File

@ -1,6 +1,6 @@
From 1578f44c4cc952ad5c013f20d249f335900c6e04 Mon Sep 17 00:00:00 2001
From 4d0e816c1b016c4ec9d54704f40789b1c7b79654 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Sat, 22 Mar 2014 14:42:59 +0100
Date: Fri, 20 Jun 2014 19:21:51 +0200
Subject: [PATCH 1/3] hunspell patch
---
@ -8,10 +8,10 @@ Subject: [PATCH 1/3] hunspell patch
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro
index 32a61ad..1fe0719 100644
index 7d07a6a..449dbd0 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -441,7 +441,7 @@ unix {
@@ -457,7 +457,7 @@ unix {
}
DEFINES += HUNSPELL_STATIC
@ -20,17 +20,17 @@ index 32a61ad..1fe0719 100644
include(qcodeedit/qcodeedit.pri)
@@ -632,4 +632,9 @@ else {
@@ -663,4 +663,9 @@ else {
QMAKE_LFLAGS -= -Wl,-s
QMAKE_LFLAGS_RELEASE -= -Wl,-s
}
-
+# enable use of pkgconfig
+unix {
+ CONFIG += link_pkgconfig
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
+# enable use of pkgconfig
+unix {
+ CONFIG += link_pkgconfig
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
--
1.8.5.3
1.9.3

View File

@ -1,17 +1,17 @@
From 5fd23fd2dc199514e5b56f8299077b5f0765f9e1 Mon Sep 17 00:00:00 2001
From 0685635511fcf6b5c7287323804f3c1c819ead64 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Sat, 22 Mar 2014 14:53:07 +0100
Subject: [PATCH 2/3] qtsinglepatch
Date: Fri, 20 Jun 2014 19:23:56 +0200
Subject: [PATCH 2/3] qtsingle
---
texstudio.pro | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro
index 1fe0719..207ede0 100644
index 449dbd0..ad01fdb 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -21,9 +21,6 @@ QT += \
@@ -32,9 +32,6 @@ QT += \
}
DEFINES += PHONON
}
@ -19,14 +19,14 @@ index 1fe0719..207ede0 100644
-else:include(qtsingleapplication/qtsingleapplication.pri)
-
# ##############################
PRECOMPILED_HEADER = mostQtHeaders.h
precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
HEADERS += texmaker.h \
@@ -638,3 +635,5 @@ unix {
# use system hunspell
PKGCONFIG += hunspell
}
+#use system qtsingleapplication
+CONFIG += qtsingleapplication
@@ -669,3 +666,5 @@ unix {
# use system hunspell
PKGCONFIG += hunspell
}
+#use system qtsingleapplication
+CONFIG += qtsingleapplication
--
1.8.5.3
1.9.3

View File

@ -1,17 +1,17 @@
From dde854f2cefa7c00af7869bef1d97a4139789296 Mon Sep 17 00:00:00 2001
From e9b106503d9da08e33ba7ff1433d6c0deb3bafc2 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Sat, 22 Mar 2014 15:38:42 +0100
Subject: [PATCH 3/3] final xdg
Date: Fri, 20 Jun 2014 19:26:55 +0200
Subject: [PATCH 3/3] xdg
---
buildmanager.cpp | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/buildmanager.cpp b/buildmanager.cpp
index dc7cf10..551d3bb 100644
index d4c8a83..a33a04b 100644
--- a/buildmanager.cpp
+++ b/buildmanager.cpp
@@ -817,25 +817,13 @@ QString getCommandLineGhostscript(){
@@ -826,25 +826,13 @@ QString getCommandLineGhostscript(){
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
QString getCommandLineViewDvi(){
@ -41,5 +41,5 @@ index dc7cf10..551d3bb 100644
QString getCommandLineGhostscript(){ return ""; }
--
1.8.5.3
1.9.3

View File

@ -1,6 +1,6 @@
Name: texstudio
Version: 2.7.0
Release: 2%{?dist}
Version: 2.8.0
Release: 1%{?dist}
Summary: A feature-rich editor for LaTeX documents
Group: Applications/Publishing
@ -119,11 +119,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%{_datadir}/texstudio/th_*.dat
%{_datadir}/texstudio/usermanual_*.html
%{_datadir}/applications/texstudio.desktop
%{_datadir}/appdata/texstudio.appdata.xml
%{_datadir}/icons/hicolor/*/apps/*.png
%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
%changelog
* Fri Jun 20 2014 Johannes Lips <hannes@fedoraproject.org> 2.8.0-1
- Update to latest upstream version 2.8.0
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild