Update to 2.7.0
This commit is contained in:
hannes
parent
5a2e9bcba6
commit
4c19c3c62c
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
||||
/texstudio-2.6.2.tar.gz
|
||||
/texstudio-2.6.4.tar.gz
|
||||
/texstudio-2.6.6.tar.gz
|
||||
/texstudio-2.7.0.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
abf549b9c18776cf6f1025253a9519c6 texstudio-2.6.6.tar.gz
|
||||
e2745d828d2c945bea97ea42e57fc881 texstudio-2.7.0.tar.gz
|
||||
|
||||
@ -1,31 +1,17 @@
|
||||
From 4d8b4c9a0cb9ee40cf36dbf0144fa96556bca487 Mon Sep 17 00:00:00 2001
|
||||
From 1578f44c4cc952ad5c013f20d249f335900c6e04 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Mon, 4 Nov 2013 20:45:19 +0100
|
||||
Subject: [PATCH] hunspell_patch
|
||||
Date: Sat, 22 Mar 2014 14:42:59 +0100
|
||||
Subject: [PATCH 1/3] hunspell patch
|
||||
|
||||
---
|
||||
spellerutility.h | 2 +-
|
||||
texstudio.pro | 9 +++++++--
|
||||
2 files changed, 8 insertions(+), 3 deletions(-)
|
||||
texstudio.pro | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/spellerutility.h b/spellerutility.h
|
||||
index 7e1b980..c973220 100644
|
||||
--- a/spellerutility.h
|
||||
+++ b/spellerutility.h
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "mostQtHeaders.h"
|
||||
|
||||
-#include "hunspell/hunspell.hxx"
|
||||
+#include "hunspell.hxx"
|
||||
class SpellerUtility: public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index fedf628..bdc454b 100644
|
||||
index 32a61ad..1fe0719 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -433,7 +433,7 @@ unix {
|
||||
@@ -441,7 +441,7 @@ unix {
|
||||
}
|
||||
|
||||
DEFINES += HUNSPELL_STATIC
|
||||
@ -34,17 +20,17 @@ index fedf628..bdc454b 100644
|
||||
|
||||
include(qcodeedit/qcodeedit.pri)
|
||||
|
||||
@@ -624,4 +624,9 @@ else {
|
||||
@@ -632,4 +632,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.3.1
|
||||
1.8.5.3
|
||||
|
||||
|
||||
@ -1,31 +1,32 @@
|
||||
From 54aa115007d602a385ff50b1c7a311194a59a07d Mon Sep 17 00:00:00 2001
|
||||
From 5fd23fd2dc199514e5b56f8299077b5f0765f9e1 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Mon, 4 Nov 2013 20:46:43 +0100
|
||||
Subject: [PATCH] qtsingle_patch
|
||||
Date: Sat, 22 Mar 2014 14:53:07 +0100
|
||||
Subject: [PATCH 2/3] qtsinglepatch
|
||||
|
||||
---
|
||||
texstudio.pro | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
texstudio.pro | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index bdc454b..010e866 100644
|
||||
index 1fe0719..207ede0 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -18,8 +18,6 @@ QT += \
|
||||
QT += phonon
|
||||
@@ -21,9 +21,6 @@ QT += \
|
||||
}
|
||||
DEFINES += PHONON
|
||||
}
|
||||
-contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
|
||||
-else:include(qtsingleapplication/qtsingleapplication.pri)
|
||||
|
||||
-
|
||||
# ##############################
|
||||
PRECOMPILED_HEADER = mostQtHeaders.h
|
||||
@@ -630,3 +628,5 @@ unix {
|
||||
# use system hunspell
|
||||
PKGCONFIG += hunspell
|
||||
}
|
||||
+#use system qtsingleapplication
|
||||
+CONFIG += qtsingleapplication
|
||||
HEADERS += texmaker.h \
|
||||
@@ -638,3 +635,5 @@ unix {
|
||||
# use system hunspell
|
||||
PKGCONFIG += hunspell
|
||||
}
|
||||
+#use system qtsingleapplication
|
||||
+CONFIG += qtsingleapplication
|
||||
--
|
||||
1.8.3.1
|
||||
1.8.5.3
|
||||
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
From f9a633402c81b7c252e33c0d9386ba4b48fcde7c Mon Sep 17 00:00:00 2001
|
||||
From dde854f2cefa7c00af7869bef1d97a4139789296 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Sun, 9 Sep 2012 10:56:06 +0200
|
||||
Subject: [PATCH] viewer
|
||||
Date: Sat, 22 Mar 2014 15:38:42 +0100
|
||||
Subject: [PATCH 3/3] final xdg
|
||||
|
||||
---
|
||||
buildmanager.cpp | 18 +++---------------
|
||||
1 file changed, 3 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git buildmanager.cpp buildmanager.cpp
|
||||
index ac7027a..ac913d0 100644
|
||||
--- buildmanager.cpp
|
||||
+++ buildmanager.cpp
|
||||
@@ -762,25 +762,13 @@
|
||||
diff --git a/buildmanager.cpp b/buildmanager.cpp
|
||||
index dc7cf10..551d3bb 100644
|
||||
--- a/buildmanager.cpp
|
||||
+++ b/buildmanager.cpp
|
||||
@@ -817,25 +817,13 @@ QString getCommandLineGhostscript(){
|
||||
// xdvi %.dvi -sourceposition @:%.tex
|
||||
// kdvi "file:%.dvi#src:@ %.tex"
|
||||
QString getCommandLineViewDvi(){
|
||||
@ -20,7 +20,7 @@ index ac7027a..ac913d0 100644
|
||||
- case 4: return "okular %.dvi > /dev/null";
|
||||
- default:return "evince %.dvi > /dev/null";
|
||||
- }
|
||||
+ return "xdg-open %.dvi > /dev/null";
|
||||
+ return "xdg-open %.dvi > /dev/null";
|
||||
};
|
||||
QString getCommandLineViewPs(){
|
||||
- switch (x11desktop_env()) {
|
||||
@ -28,7 +28,7 @@ index ac7027a..ac913d0 100644
|
||||
- case 4: return "okular %.ps > /dev/null";
|
||||
- default: return "evince %.ps > /dev/null";
|
||||
- };
|
||||
+ return "xdg-open %.ps > /dev/null";
|
||||
+ return "xdg-open %.ps > /dev/null";
|
||||
}
|
||||
QString getCommandLineViewPdfExternal(){
|
||||
- switch (x11desktop_env()) {
|
||||
@ -36,7 +36,10 @@ index ac7027a..ac913d0 100644
|
||||
- case 4: return "okular %.pdf > /dev/null";
|
||||
- default: return "evince %.pdf > /dev/null";
|
||||
- };
|
||||
+ return "xdg-open %.pdf > /dev/null";
|
||||
+ return "xdg-open %.pdf > /dev/null";
|
||||
}
|
||||
QString getCommandLineGhostscript(){ return ""; }
|
||||
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Name: texstudio
|
||||
Version: 2.6.6
|
||||
Version: 2.7.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A feature-rich editor for LaTeX documents
|
||||
@ -44,7 +44,7 @@ so it keeps it look&feel.
|
||||
%setup -q -n %{name}%{version}
|
||||
%patch0 -p1 -b .hunspell
|
||||
%patch1 -p1 -b .qtsingle
|
||||
%patch2 -p0 -b .xdg
|
||||
%patch2 -p1 -b .xdg
|
||||
|
||||
rm -rf {hunspell,qtsingleapplication}
|
||||
|
||||
@ -106,8 +106,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
|
||||
%{_bindir}/texstudio
|
||||
%dir %{_datadir}/texstudio/
|
||||
%{_datadir}/texstudio/*.png
|
||||
%{_datadir}/texstudio/latexhelp.html
|
||||
%{_datadir}/texstudio/usermanual.css
|
||||
%{_datadir}/texstudio/latex2e.*
|
||||
%{_datadir}/texstudio/*.stopWords
|
||||
%{_datadir}/texstudio/*.stopWords.level2
|
||||
%{_datadir}/texstudio/de.badWords
|
||||
@ -124,6 +124,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
|
||||
%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
|
||||
|
||||
%changelog
|
||||
* Wed Mar 19 2014 Johannes Lips <hannes@fedoraproject.org> 2.7.0-1
|
||||
- Update to latest upstream version 2.7.0
|
||||
|
||||
* Sun Nov 03 2013 Johannes Lips <hannes@fedoraproject.org> 2.6.6-1
|
||||
- Update to latest upstream version 2.6.6
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user