[texstudio] Update to version 2.4
hannes
hannes at fedoraproject.org
Sun Sep 9 09:26:25 UTC 2012
commit c4a6bdfa70fe55165a17658bb2fd47d643b6413e
Author: hannes <hannes at fedoraproject.org>
Date: Sun Sep 9 11:26:25 2012 +0200
Update to version 2.4
.gitignore | 1 +
sources | 2 +-
...se-system-hunspell-instead-of-bundled-one.patch | 30 ++++----
texstudio-viewers-use-xdg-open.patch | 84 ++++++++------------
texstudio.spec | 12 ++-
5 files changed, 59 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 81a5389..f95890c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/texstudio-2.2.tar.gz
/texstudio-2.3.tar.gz
+/texstudio-2.4.tar.gz
diff --git a/sources b/sources
index 672311c..2375078 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32cde0fe8398ec9b1d434c7ab6f70782 texstudio-2.3.tar.gz
+5b158c73ffcea28ac35e318ef55e853f texstudio-2.4.tar.gz
diff --git a/texstudio-use-system-hunspell-instead-of-bundled-one.patch b/texstudio-use-system-hunspell-instead-of-bundled-one.patch
index 7b498f4..f1c9ed1 100644
--- a/texstudio-use-system-hunspell-instead-of-bundled-one.patch
+++ b/texstudio-use-system-hunspell-instead-of-bundled-one.patch
@@ -1,15 +1,15 @@
-From b168f39f0b978ef31439e7cef52b20c8fce330d4 Mon Sep 17 00:00:00 2001
+From 48b3ef523393bf584ad92910fa6173f33f4bc0f3 Mon Sep 17 00:00:00 2001
From: hannes <hannes at fedoraproject.org>
-Date: Wed, 30 Nov 2011 21:14:27 +0000
-Subject: [PATCH] hunspell patch
+Date: Sun, 9 Sep 2012 09:26:47 +0200
+Subject: [PATCH] hunspell
---
- spellerutility.h | 2 +-
- texstudio.pro | 38 ++++++--------------------------------
+ spellerutility.h | 2 +-
+ texstudio.pro | 38 ++++++--------------------------------
2 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/spellerutility.h b/spellerutility.h
-index 76fe382..c889105 100644
+index 1e1d6e2..083f412 100644
--- spellerutility.h
+++ spellerutility.h
@@ -13,7 +13,7 @@
@@ -21,12 +21,12 @@ index 76fe382..c889105 100644
class SpellerUtility: public QObject {
Q_OBJECT
public:
-diff --git a/texstudio.pro b/texstudio.pro
-index 80e9ba3..c5b5ec6 100644
+diff --git texstudio.pro texstudio.pro
+index ee28d78..86d8f45 100644
--- texstudio.pro
+++ texstudio.pro
-@@ -51,24 +51,6 @@ HEADERS += texmaker.h \
- codesnippet.h \
+@@ -52,24 +52,6 @@ HEADERS += texmaker.h \
+ debughelper.h \
thesaurusdialog.h \
xmltagslistwidget.h \
- hunspell/affentry.hxx \
@@ -50,15 +50,15 @@ index 80e9ba3..c5b5ec6 100644
qcodeedit/lib/qeditorinputbinding.h \
qcodeedit/lib/qeditorinputbindinginterface.h \
randomtextgenerator.h \
-@@ -84,7 +66,6 @@ HEADERS += texmaker.h \
+@@ -85,7 +67,6 @@ HEADERS += texmaker.h \
latexdocument.h \
unicodeinsertion.h \
universalinputdialog.h \
- hunspell/replist.hxx \
scriptengine.h \
insertgraphics.h \
- tmxtabwidget.h \
-@@ -143,18 +124,6 @@ SOURCES += main.cpp \
+ txstabwidget.h \
+@@ -154,18 +135,6 @@ SOURCES += main.cpp \
codesnippet.cpp \
thesaurusdialog.cpp \
xmltagslistwidget.cpp \
@@ -77,7 +77,7 @@ index 80e9ba3..c5b5ec6 100644
encodingdialog.cpp \
qcodeedit/lib/qeditorinputbinding.cpp \
randomtextgenerator.cpp \
-@@ -539,4 +508,9 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c
+@@ -569,4 +538,9 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c
#QMAKE_CXXFLAGS_DEBUG += -Werror -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline
QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline
@@ -89,5 +89,5 @@ index 80e9ba3..c5b5ec6 100644
+ PKGCONFIG += hunspell
+}
--
-1.7.7.3
+1.7.11.4
diff --git a/texstudio-viewers-use-xdg-open.patch b/texstudio-viewers-use-xdg-open.patch
index b008bc2..9ae1e2c 100644
--- a/texstudio-viewers-use-xdg-open.patch
+++ b/texstudio-viewers-use-xdg-open.patch
@@ -1,61 +1,45 @@
-From 2ae917fad7cd4e5d3043e3ab3f1cfe4faa63f532 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <haikel.guemar at sysfera.com>
-Date: Thu, 28 Jul 2011 16:55:32 +0200
-Subject: [PATCH 1/3] viewers: use xdg-open
+From f9a633402c81b7c252e33c0d9386ba4b48fcde7c Mon Sep 17 00:00:00 2001
+From: hannes <hannes at fedoraproject.org>
+Date: Sun, 9 Sep 2012 10:56:06 +0200
+Subject: [PATCH] viewer
---
- buildmanager.cpp | 22 +++++-----------------
- 1 files changed, 5 insertions(+), 17 deletions(-)
+ buildmanager.cpp | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
diff --git buildmanager.cpp buildmanager.cpp
-index 1441564..d8986bb 100644
+index ac7027a..ac913d0 100644
--- buildmanager.cpp
+++ buildmanager.cpp
-@@ -460,23 +460,11 @@ QString BuildManager::guessCommandName(LatexCommand cmd) {
+@@ -761,25 +761,13 @@ QString getCommandLineGhostscript(){
+ // xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
- switch (cmd) {
- case CMD_VIEWDVI:
-- switch (x11desktop_env()) {
-- case 3: return "kdvi %.dvi > /dev/null";
-- case 4: return "okular %.dvi > /dev/null";
-- default:return "evince %.dvi > /dev/null";
-- };
-+ return "xdg-open %.dvi > /dev/null";
- case CMD_VIEWPS:
-- switch (x11desktop_env()) {
-- case 3: return "kghostview %.ps > /dev/null";
-- case 4: return "okular %.ps > /dev/null";
-- default:return "evince %.ps > /dev/null";
-- };
-+ return "xdg-open %.ps > /dev/null";
- case CMD_VIEWPDF:
-- switch (x11desktop_env()) {
-- case 3: return "kpdf %.pdf > /dev/null";
-- case 4: return "okular %.pdf > /dev/null";
-- default:return "evince %.pdf > /dev/null";
-- };
-+ return "xdg-open %.pdf > /dev/null";
- default:;
- }
- #endif
-@@ -610,7 +598,7 @@ void BuildManager::setLatexCommand(LatexCommand cmd, const QString &cmdString){
- ((unquote == baseName) ||
- ( (unquote.endsWith(QDir::separator() + baseName) || unquote.endsWith("/" + baseName))
- && (!unquote.contains(" ") || (!unquote.contains('"') && unquote != trimmed)) //spaces mean options, if not everything is quoted
-- && (QFileInfo(unquote).exists())
-+ && (QFileInfo(unquote).exists())
- )
- ))
- commands[cmd] = cmdString + " " + defaultCommandOptions(cmd);
-@@ -619,7 +607,7 @@ void BuildManager::setLatexCommand(LatexCommand cmd, const QString &cmdString){
- }
+ QString getCommandLineViewDvi(){
+- switch (x11desktop_env()) {
+- case 3: return "kdvi %.dvi > /dev/null";
+- case 4: return "okular %.dvi > /dev/null";
+- default:return "evince %.dvi > /dev/null";
+- }
++ return "xdg-open %.dvi > /dev/null";
+ };
+ QString getCommandLineViewPs(){
+- switch (x11desktop_env()) {
+- case 3: return "kghostview %.ps > /dev/null";
+- case 4: return "okular %.ps > /dev/null";
+- default: return "evince %.ps > /dev/null";
+- };
++ return "xdg-open %.ps > /dev/null";
}
-
--QString BuildManager::getLatexCommand(LatexCommand cmd){
-+QString BuildManager::getLatexCommand(LatexCommand cmd){
- return commands[cmd];
+ QString getCommandLineViewPdfExternal(){
+- switch (x11desktop_env()) {
+- case 3: return "kpdf %.pdf > /dev/null";
+- case 4: return "okular %.pdf > /dev/null";
+- default: return "evince %.pdf > /dev/null";
+- };
++ return "xdg-open %.pdf > /dev/null";
}
- QString BuildManager::getLatexCommandForDisplay(LatexCommand cmd){
+ QString getCommandLineGhostscript(){ return ""; }
+ #endif
--
-1.7.4.4
+1.7.11.4
diff --git a/texstudio.spec b/texstudio.spec
index 6c8af1f..49fbdeb 100644
--- a/texstudio.spec
+++ b/texstudio.spec
@@ -1,6 +1,6 @@
Name: texstudio
-Version: 2.3
-Release: 4%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: A feature-rich editor for LaTeX documents
Group: Applications/Publishing
@@ -105,8 +105,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%{_bindir}/texstudio
%dir %{_datadir}/texstudio/
%{_datadir}/texstudio/configure*.png
-%{_datadir}/texstudio/doc*.png
+%{_datadir}/texstudio/*.png
%{_datadir}/texstudio/latexhelp.html
+%{_datadir}/texstudio/usermanual.css
+%{_datadir}/texstudio/*.stopWords
%{_datadir}/texstudio/template*
%{_datadir}/texstudio/texstudio.svg
%{_datadir}/texstudio/th_*.dat
@@ -116,10 +118,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%{_datadir}/applications/texstudio.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
-
%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
%changelog
+* Sun Sep 09 2012 Johannes Lips <hannes at fedoraproject.org> 2.4-1
+- update to recent upstream version
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list