[texmaker: 1/2] * Fri Aug 06 2010 Deji Akingunola <dakingun at gmail.com> - 2.0-1 - Update to 2.0
Deji Akingunola
deji at fedoraproject.org
Fri Aug 6 16:20:59 UTC 2010
commit 89a8d37f164b7755d0f813074d1dd45af41ef79e
Author: Deji Akingunola <dakingun at gmail.com>
Date: Fri Aug 6 12:07:09 2010 -0400
* Fri Aug 06 2010 Deji Akingunola <dakingun at gmail.com> - 2.0-1
- Update to 2.0
.gitignore | 1 +
sources | 2 +-
texmaker-tools.patch | 84 +++++++++++++++++++++++++-------------------------
texmaker.spec | 7 +++-
4 files changed, 49 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 427c451..daafca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
texmaker-1.9.9.tar.bz2
+texmaker-2.0.tar.bz2
diff --git a/sources b/sources
index 15223f7..0eec3fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a56af78aac811ec3a82e7d375d388ae texmaker-1.9.9.tar.bz2
+9feb111fe3e6d420e0dbdd5140b195ca texmaker-2.0.tar.bz2
diff --git a/texmaker-tools.patch b/texmaker-tools.patch
index 8b4c5aa..542817e 100644
--- a/texmaker-tools.patch
+++ b/texmaker-tools.patch
@@ -1,6 +1,6 @@
---- texmaker.cpp 2010-01-30 15:12:46.000000000 -0500
-+++ texmaker.cpp.new 2010-02-03 15:34:08.298862278 -0500
-@@ -2377,28 +2377,9 @@
+--- texmaker.cpp 2010-07-29 04:19:28.000000000 -0400
++++ texmaker.cpp.new 2010-08-06 10:43:28.815922629 -0400
+@@ -2449,28 +2449,9 @@
metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
@@ -32,7 +32,7 @@
ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -2549,7 +2530,7 @@
+@@ -2621,7 +2602,7 @@
author=config->value("Quick/Author","").toString();
#if defined( Q_WS_X11 )
@@ -41,7 +41,7 @@
#endif
#if defined( Q_WS_MACX )
QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";
-@@ -3553,7 +3534,7 @@
+@@ -3640,7 +3621,7 @@
tag+="}\n";
InsertTag(tag,9,0);
OutputTextEdit->insertLine("Bib fields - Article in Journal");
@@ -50,7 +50,7 @@
}
void Texmaker::InsertBib2()
{
-@@ -3578,7 +3559,7 @@
+@@ -3665,7 +3646,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Article in Conference Proceedings");
@@ -59,7 +59,7 @@
}
void Texmaker::InsertBib3()
{
-@@ -3605,7 +3586,7 @@
+@@ -3692,7 +3673,7 @@
tag+="}\n";
InsertTag(tag,14,0);
OutputTextEdit->insertLine("Bib fields - Article in a Collection");
@@ -68,7 +68,7 @@
}
void Texmaker::InsertBib4()
{
-@@ -3631,7 +3612,7 @@
+@@ -3718,7 +3699,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()
{
-@@ -3652,7 +3633,7 @@
+@@ -3739,7 +3720,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Conference Proceedings");
@@ -86,7 +86,7 @@
}
void Texmaker::InsertBib6()
{
-@@ -3675,7 +3656,7 @@
+@@ -3762,7 +3743,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()
{
-@@ -3692,7 +3673,7 @@
+@@ -3779,7 +3760,7 @@
tag+="}\n";
InsertTag(tag,9,0);
OutputTextEdit->insertLine("Bib fields - Booklet");
@@ -104,7 +104,7 @@
}
void Texmaker::InsertBib8()
{
-@@ -3710,7 +3691,7 @@
+@@ -3797,7 +3778,7 @@
tag+="}\n";
InsertTag(tag,11,0);
OutputTextEdit->insertLine("Bib fields - PhD. Thesis");
@@ -113,7 +113,7 @@
}
void Texmaker::InsertBib9()
{
-@@ -3728,7 +3709,7 @@
+@@ -3815,7 +3796,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Master's Thesis");
@@ -122,7 +122,7 @@
}
void Texmaker::InsertBib10()
{
-@@ -3747,7 +3728,7 @@
+@@ -3834,7 +3815,7 @@
tag+="}\n";
InsertTag(tag,12,0);
OutputTextEdit->insertLine("Bib fields - Technical Report");
@@ -131,7 +131,7 @@
}
void Texmaker::InsertBib11()
{
-@@ -3765,7 +3746,7 @@
+@@ -3852,7 +3833,7 @@
tag+="}\n";
InsertTag(tag,8,0);
OutputTextEdit->insertLine("Bib fields - Technical Manual");
@@ -140,7 +140,7 @@
}
void Texmaker::InsertBib12()
{
-@@ -3780,7 +3761,7 @@
+@@ -3867,7 +3848,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Unpublished");
@@ -149,7 +149,7 @@
}
void Texmaker::InsertBib13()
{
-@@ -3796,7 +3777,7 @@
+@@ -3883,7 +3864,7 @@
tag+="}\n";
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Miscellaneous");
@@ -158,33 +158,22 @@
}
void Texmaker::CleanBib()
---- spellerdialog.h 2009-05-08 06:32:29.000000000 -0400
-+++ spellerdialog.h.new 2010-02-03 15:35:23.183871810 -0500
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
---- texmaker.pro 2010-01-31 07:34:40.000000000 -0500
-+++ texmaker.pro.new 2010-02-03 15:37:00.071862859 -0500
-@@ -3,7 +3,8 @@
- TARGET = texmaker
+--- texmaker.pro 2010-07-29 11:40:36.000000000 -0400
++++ texmaker.pro.new 2010-08-06 10:47:32.559306900 -0400
+@@ -4,7 +4,8 @@
QT += network \
- xml
+ xml \
+ webkit
-CONFIG += qt warn_off release
+CONFIG += qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell
- TEXMAKERVERSION=1.9.9
+ TEXMAKERVERSION=2.0
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
###############################
-@@ -42,25 +43,6 @@
- stylehelper.h \
- styleanimator.h \
- keysequencedialog.h \
+@@ -48,25 +49,6 @@
+ pdfdocumentwidget.h \
+ pdfscrollarea.h \
+ userquickdialog.h \
- hunspell/affentry.hxx \
- hunspell/affixmgr.hxx \
- hunspell/atypes.hxx \
@@ -207,10 +196,10 @@
singleapp/qtlocalpeer.h \
singleapp/qtlockedfile.h \
singleapp/qtsingleapplication.h \
-@@ -100,18 +82,6 @@
- stylehelper.cpp \
- styleanimator.cpp \
- keysequencedialog.cpp \
+@@ -111,18 +93,6 @@
+ pdfdocumentwidget.cpp \
+ pdfscrollarea.cpp \
+ userquickdialog.cpp \
- hunspell/affentry.cxx \
- hunspell/affixmgr.cxx \
- hunspell/csutil.cxx \
@@ -226,3 +215,14 @@
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
+@@ -13,7 +13,7 @@
+
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+
+ #include <QTextCursor>
+
diff --git a/texmaker.spec b/texmaker.spec
index 4347fdd..8b3a66c 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,6 +1,6 @@
Summary: LaTeX editor
Name: texmaker
-Version: 1.9.9
+Version: 2.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2+
@@ -8,7 +8,7 @@ Group: Applications/Publishing
URL: http://www.xm1math.net/texmaker/
Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt4-devel, hunspell-devel
+BuildRequires: qt4-devel, qt4-webkit-devel, hunspell-devel, poppler-qt4-devel
BuildRequires: desktop-file-utils
Requires: tetex-latex, tetex-dvipost, tetex-xdvi
# Patch to use default Fedora's document viewer and system's hunspell
@@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%exclude %{_datadir}/texmaker/*.aff
%changelog
+* Fri Aug 06 2010 Deji Akingunola <dakingun at gmail.com> - 2.0-1
+- Update to 2.0
+
* Wed Feb 03 2010 Deji Akingunola <dakingun at gmail.com> - 1.9.9-1
- Update to 1.9.9
More information about the scm-commits
mailing list