[texmaker/f14/master] Update to 3.0.2
Deji Akingunola
deji at fedoraproject.org
Fri Apr 29 02:48:03 UTC 2011
commit 4f8a06c71002322d378d6d88141ac72e2e80fe01
Author: Deji Akingunola <dakingun at mail.com>
Date: Thu Apr 28 22:49:12 2011 -0400
Update to 3.0.2
sources | 2 +-
texmaker-tools.patch | 153 ++++++++------------------------------------------
texmaker.spec | 5 +-
3 files changed, 28 insertions(+), 132 deletions(-)
---
diff --git a/sources b/sources
index 375cb30..c4b47c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9cb4725243333aedae9254ef7439a91 texmaker-2.3.tar.bz2
+d375c8f486fe44f3f2a2a7d2ddac08f3 texmaker-3.0.2.tar.bz2
diff --git a/texmaker-tools.patch b/texmaker-tools.patch
index ada14d3..da870c9 100644
--- a/texmaker-tools.patch
+++ b/texmaker-tools.patch
@@ -1,6 +1,6 @@
---- texmaker.cpp 2011-03-13 14:35:01.000000000 -0400
-+++ texmaker.cpp.new 2011-03-29 17:17:56.064747330 -0400
-@@ -3018,28 +3018,9 @@
+--- texmaker.cpp 2011-04-25 09:12:44.000000000 -0400
++++ texmaker.cpp.new 2011-04-28 20:48:04.273244167 -0400
+@@ -3297,29 +3297,9 @@
metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
@@ -26,13 +26,14 @@
- }break;
- }
-
+-
+viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
+viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
+viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
-
ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -3195,7 +3176,7 @@
+ asymptote_command=config->value("Tools/Asymptote","asy %.asy").toString();
+@@ -3474,7 +3454,7 @@
#ifdef USB_VERSION
QString dicDir=QCoreApplication::applicationDirPath() + "/";
#else
@@ -41,125 +42,8 @@
#endif
#endif
-@@ -4556,7 +4537,7 @@
- tag+="}\n";
- InsertTag(tag,9,0);
- OutputTextEdit->insertLine("Bib fields - Article in Journal");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib2()
- {
-@@ -4581,7 +4562,7 @@
- tag+="}\n";
- InsertTag(tag,15,0);
- OutputTextEdit->insertLine("Bib fields - Article in Conference Proceedings");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib3()
- {
-@@ -4608,7 +4589,7 @@
- tag+="}\n";
- InsertTag(tag,14,0);
- OutputTextEdit->insertLine("Bib fields - Article in a Collection");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib4()
- {
-@@ -4634,7 +4615,7 @@
- InsertTag(tag,8,0);
- OutputTextEdit->insertLine("Bib fields - Chapter or Pages in a Book");
- OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib5()
- {
-@@ -4655,7 +4636,7 @@
- tag+="}\n";
- InsertTag(tag,13,0);
- OutputTextEdit->insertLine("Bib fields - Conference Proceedings");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib6()
- {
-@@ -4678,7 +4659,7 @@
- InsertTag(tag,6,0);
- OutputTextEdit->insertLine("Bib fields - Book");
- OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib7()
- {
-@@ -4695,7 +4676,7 @@
- tag+="}\n";
- InsertTag(tag,9,0);
- OutputTextEdit->insertLine("Bib fields - Booklet");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib8()
- {
-@@ -4713,7 +4694,7 @@
- tag+="}\n";
- InsertTag(tag,11,0);
- OutputTextEdit->insertLine("Bib fields - PhD. Thesis");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib9()
- {
-@@ -4731,7 +4712,7 @@
- tag+="}\n";
- InsertTag(tag,15,0);
- OutputTextEdit->insertLine("Bib fields - Master's Thesis");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib10()
- {
-@@ -4750,7 +4731,7 @@
- tag+="}\n";
- InsertTag(tag,12,0);
- OutputTextEdit->insertLine("Bib fields - Technical Report");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib11()
- {
-@@ -4768,7 +4749,7 @@
- tag+="}\n";
- InsertTag(tag,8,0);
- OutputTextEdit->insertLine("Bib fields - Technical Manual");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib12()
- {
-@@ -4783,7 +4764,7 @@
- tag+="}\n";
- InsertTag(tag,13,0);
- OutputTextEdit->insertLine("Bib fields - Unpublished");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib13()
- {
-@@ -4799,7 +4780,7 @@
- tag+="}\n";
- InsertTag(tag,6,0);
- OutputTextEdit->insertLine("Bib fields - Miscellaneous");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
-
- void Texmaker::CleanBib()
---- texmaker.pro 2011-03-13 04:30:30.000000000 -0400
-+++ texmaker.pro.new 2011-03-29 17:19:37.697476746 -0400
+--- texmaker.pro 2011-04-25 04:39:07.000000000 -0400
++++ texmaker.pro.new 2011-04-28 20:59:42.124519826 -0400
@@ -4,7 +4,8 @@
QT += network \
xml \
@@ -167,11 +51,11 @@
-CONFIG += qt warn_off release
+CONFIG += qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell
- TEXMAKERVERSION=2.3
+ TEXMAKERVERSION=3.0.2
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
DEFINES += HAVE_SPLASH
-@@ -53,25 +54,6 @@
- encodingdialog.h \
+@@ -56,25 +57,6 @@
+ usercompletiondialog.h \
synctex_parser.h \
synctex_parser_utils.h \
- hunspell/affentry.hxx \
@@ -196,8 +80,8 @@
singleapp/qtlocalpeer.h \
singleapp/qtlockedfile.h \
singleapp/qtsingleapplication.h \
-@@ -144,18 +126,6 @@
- encodingdialog.cpp \
+@@ -150,18 +132,6 @@
+ usercompletiondialog.cpp \
synctex_parser.c \
synctex_parser_utils.c \
- hunspell/affentry.cxx \
@@ -215,8 +99,17 @@
singleapp/qtlocalpeer.cpp \
singleapp/qtlockedfile.cpp \
singleapp/qtsingleapplication.cpp \
+@@ -253,7 +223,7 @@
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+
+ INSTALLS = target
+ HEADERS += x11fontdialog.h
--- spellerdialog.h 2011-02-25 14:19:34.000000000 -0500
-+++ spellerdialog.h.new 2011-03-29 23:18:03.892684209 -0400
++++ spellerdialog.h.new 2011-04-28 20:53:50.152920024 -0400
@@ -13,7 +13,7 @@
#include "ui_spellerdialog.h"
diff --git a/texmaker.spec b/texmaker.spec
index af5cdca..bb46e3e 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,6 +1,6 @@
Summary: LaTeX editor
Name: texmaker
-Version: 2.3
+Version: 3.0.2
Release: 1%{?dist}
Epoch: 1
License: GPLv2+
@@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%exclude %{_datadir}/texmaker/*.aff
%changelog
+* Thu Apr 28 2011 Deji Akingunola <dakingun at gmail.com> - 3.0.2-1
+- Update to 3.0.2
+
* Tue Mar 29 2011 Deji Akingunola <dakingun at gmail.com> - 2.3-1
- Update to 2.3
More information about the scm-commits
mailing list