[texmaker] Update to 2.3
Deji Akingunola
deji at fedoraproject.org
Wed Mar 30 03:20:56 UTC 2011
commit 576ad5b46d9aa2107a7e6de3bd9a1e1df25215e1
Author: Deji Akingunola <dakingun at mail.com>
Date: Tue Mar 29 23:22:03 2011 -0400
Update to 2.3
.gitignore | 1 +
sources | 2 +-
texmaker-tools.patch | 64 +++++++++++++++++++++++++-------------------------
texmaker.spec | 7 ++++-
4 files changed, 39 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20317e2..cdf9ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
texmaker-1.9.9.tar.bz2
texmaker-2.0.tar.bz2
/texmaker-2.1.tar.bz2
+/texmaker-2.3.tar.bz2
diff --git a/sources b/sources
index 31d60a9..375cb30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55c8f0bf7492c9a83e1acac4392c8420 texmaker-2.1.tar.bz2
+a9cb4725243333aedae9254ef7439a91 texmaker-2.3.tar.bz2
diff --git a/texmaker-tools.patch b/texmaker-tools.patch
index 33d5843..ada14d3 100644
--- a/texmaker-tools.patch
+++ b/texmaker-tools.patch
@@ -1,6 +1,6 @@
---- texmaker.cpp 2010-10-26 14:47:02.000000000 -0400
-+++ texmaker.cpp.new 2010-11-07 22:14:42.737595047 -0500
-@@ -2471,28 +2471,9 @@
+--- 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 @@
metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
@@ -32,16 +32,16 @@
ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -2643,7 +2624,7 @@
- author=config->value("Quick/Author","").toString();
-
- #if defined( Q_WS_X11 )
+@@ -3195,7 +3176,7 @@
+ #ifdef USB_VERSION
+ QString dicDir=QCoreApplication::applicationDirPath() + "/";
+ #else
-QString dicDir=PREFIX"/share/texmaker/";
+QString dicDir=PREFIX"/share/myspell/";
#endif
- #if defined( Q_WS_MACX )
- QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";
-@@ -3675,7 +3656,7 @@
+
+ #endif
+@@ -4556,7 +4537,7 @@
tag+="}\n";
InsertTag(tag,9,0);
OutputTextEdit->insertLine("Bib fields - Article in Journal");
@@ -50,7 +50,7 @@
}
void Texmaker::InsertBib2()
{
-@@ -3700,7 +3681,7 @@
+@@ -4581,7 +4562,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Article in Conference Proceedings");
@@ -59,7 +59,7 @@
}
void Texmaker::InsertBib3()
{
-@@ -3727,7 +3708,7 @@
+@@ -4608,7 +4589,7 @@
tag+="}\n";
InsertTag(tag,14,0);
OutputTextEdit->insertLine("Bib fields - Article in a Collection");
@@ -68,7 +68,7 @@
}
void Texmaker::InsertBib4()
{
-@@ -3753,7 +3734,7 @@
+@@ -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");
@@ -77,7 +77,7 @@
}
void Texmaker::InsertBib5()
{
-@@ -3774,7 +3755,7 @@
+@@ -4655,7 +4636,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Conference Proceedings");
@@ -86,7 +86,7 @@
}
void Texmaker::InsertBib6()
{
-@@ -3797,7 +3778,7 @@
+@@ -4678,7 +4659,7 @@
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Book");
OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
@@ -95,7 +95,7 @@
}
void Texmaker::InsertBib7()
{
-@@ -3814,7 +3795,7 @@
+@@ -4695,7 +4676,7 @@
tag+="}\n";
InsertTag(tag,9,0);
OutputTextEdit->insertLine("Bib fields - Booklet");
@@ -104,7 +104,7 @@
}
void Texmaker::InsertBib8()
{
-@@ -3832,7 +3813,7 @@
+@@ -4713,7 +4694,7 @@
tag+="}\n";
InsertTag(tag,11,0);
OutputTextEdit->insertLine("Bib fields - PhD. Thesis");
@@ -113,7 +113,7 @@
}
void Texmaker::InsertBib9()
{
-@@ -3850,7 +3831,7 @@
+@@ -4731,7 +4712,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Master's Thesis");
@@ -122,7 +122,7 @@
}
void Texmaker::InsertBib10()
{
-@@ -3869,7 +3850,7 @@
+@@ -4750,7 +4731,7 @@
tag+="}\n";
InsertTag(tag,12,0);
OutputTextEdit->insertLine("Bib fields - Technical Report");
@@ -131,7 +131,7 @@
}
void Texmaker::InsertBib11()
{
-@@ -3887,7 +3868,7 @@
+@@ -4768,7 +4749,7 @@
tag+="}\n";
InsertTag(tag,8,0);
OutputTextEdit->insertLine("Bib fields - Technical Manual");
@@ -140,7 +140,7 @@
}
void Texmaker::InsertBib12()
{
-@@ -3902,7 +3883,7 @@
+@@ -4783,7 +4764,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Unpublished");
@@ -149,7 +149,7 @@
}
void Texmaker::InsertBib13()
{
-@@ -3918,7 +3899,7 @@
+@@ -4799,7 +4780,7 @@
tag+="}\n";
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Miscellaneous");
@@ -158,8 +158,8 @@
}
void Texmaker::CleanBib()
---- texmaker.pro 2010-10-26 17:20:58.000000000 -0400
-+++ texmaker.pro.new 2010-11-07 22:18:28.716619496 -0500
+--- texmaker.pro 2011-03-13 04:30:30.000000000 -0400
++++ texmaker.pro.new 2011-03-29 17:19:37.697476746 -0400
@@ -4,7 +4,8 @@
QT += network \
xml \
@@ -167,11 +167,11 @@
-CONFIG += qt warn_off release
+CONFIG += qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell
- TEXMAKERVERSION=2.1
+ TEXMAKERVERSION=2.3
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- ###############################
-@@ -50,25 +51,6 @@
- userquickdialog.h \
+ DEFINES += HAVE_SPLASH
+@@ -53,25 +54,6 @@
+ encodingdialog.h \
synctex_parser.h \
synctex_parser_utils.h \
- hunspell/affentry.hxx \
@@ -196,8 +196,8 @@
singleapp/qtlocalpeer.h \
singleapp/qtlockedfile.h \
singleapp/qtsingleapplication.h \
-@@ -115,18 +97,6 @@
- userquickdialog.cpp \
+@@ -144,18 +126,6 @@
+ encodingdialog.cpp \
synctex_parser.c \
synctex_parser_utils.c \
- hunspell/affentry.cxx \
@@ -215,8 +215,8 @@
singleapp/qtlocalpeer.cpp \
singleapp/qtlockedfile.cpp \
singleapp/qtsingleapplication.cpp \
---- spellerdialog.h 2009-05-08 06:32:29.000000000 -0400
-+++ spellerdialog.h.new 2010-08-06 10:44:29.452951054 -0400
+--- spellerdialog.h 2011-02-25 14:19:34.000000000 -0500
++++ spellerdialog.h.new 2011-03-29 23:18:03.892684209 -0400
@@ -13,7 +13,7 @@
#include "ui_spellerdialog.h"
diff --git a/texmaker.spec b/texmaker.spec
index 5ead999..20ccd82 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,7 +1,7 @@
Summary: LaTeX editor
Name: texmaker
-Version: 2.1
-Release: 5%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: Applications/Publishing
@@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%exclude %{_datadir}/texmaker/*.aff
%changelog
+* Tue Mar 29 2011 Deji Akingunola <dakingun at gmail.com> - 2.3-1
+- Update to 2.3
+
* Sun Mar 13 2011 Marek Kasik <mkasik at redhat.com> - 1:2.1-5
- Rebuild (poppler-0.16.3)
More information about the scm-commits
mailing list