[texmaker/f16] Update to 3.2.2
Deji Akingunola
deji at fedoraproject.org
Sat Jan 28 04:11:06 UTC 2012
commit 33d35dd1ca62451aa74116063a611d5dc2f6e358
Author: Deji Akingunola <dakingun at gmail.com>
Date: Fri Jan 27 23:11:06 2012 -0500
Update to 3.2.2
sources | 2 +-
texmaker-tools.patch | 107 +++++++++++++-------------------------------------
texmaker.spec | 7 ++-
3 files changed, 33 insertions(+), 83 deletions(-)
---
diff --git a/sources b/sources
index 7ca6f6b..c46b780 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10a14c75abbb7234d4e5e58a7c85b110 texmaker-3.1.tar.bz2
+aa04c37a0117a6f924c0f7eed5732fe2 texmaker-3.2.2.tar.bz2
diff --git a/texmaker-tools.patch b/texmaker-tools.patch
index 25f3e56..d87d270 100644
--- a/texmaker-tools.patch
+++ b/texmaker-tools.patch
@@ -1,6 +1,6 @@
---- texmaker.cpp 2011-07-22 15:46:04.000000000 -0400
-+++ texmaker.cpp.new 2011-08-27 02:10:55.111936951 -0400
-@@ -3389,28 +3389,9 @@
+--- texmaker.cpp 2012-01-10 13:51:01.000000000 -0500
++++ texmaker.cpp.new 2012-01-27 22:21:48.174239504 -0500
+@@ -3764,28 +3764,9 @@
metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
@@ -32,17 +32,24 @@
ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
-@@ -3590,7 +3571,7 @@
- #ifdef USB_VERSION
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
+@@ -3974,7 +3955,7 @@
+ #ifdef DEBIAN_SPELLDIR
+ QString dicDir=PREFIX"/share/myspell/dicts/";
#else
-QString dicDir=PREFIX"/share/texmaker/";
+QString dicDir=PREFIX"/share/myspell/";
#endif
-
#endif
---- texmaker.pro 2011-07-21 04:57:13.000000000 -0400
-+++ texmaker.pro.new 2011-08-27 02:19:33.296458752 -0400
+
+@@ -9202,4 +9183,4 @@
+ if (splitter2->sizes().at(1)>0) OutputTextEdit->setMaximumHeight(splitter2->sizes().at(1));
+ else OutputTextEdit->setMaximumHeight(splitter2->sizes().at(0));
+ }
+-}
+\ No newline at end of file
++}
+--- texmaker.pro 2012-01-11 10:06:42.000000000 -0500
++++ texmaker.pro.new 2012-01-27 22:43:20.483083418 -0500
@@ -4,7 +4,8 @@
QT += network \
xml \
@@ -50,11 +57,11 @@
-CONFIG += qt warn_off release
+CONFIG += qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.1
+ TEXMAKERVERSION=3.2.2
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
DEFINES += HAVE_SPLASH
-@@ -62,25 +63,6 @@
- usercompletiondialog.h \
+@@ -65,25 +66,6 @@
+ scandialog.h \
synctex_parser.h \
synctex_parser_utils.h \
- hunspell/affentry.hxx \
@@ -79,8 +86,8 @@
singleapp/qtlocalpeer.h \
singleapp/qtlockedfile.h \
singleapp/qtsingleapplication.h \
-@@ -162,18 +144,6 @@
- usercompletiondialog.cpp \
+@@ -167,18 +149,6 @@
+ scandialog.cpp \
synctex_parser.c \
synctex_parser_utils.c \
- hunspell/affentry.cxx \
@@ -98,20 +105,11 @@
singleapp/qtlocalpeer.cpp \
singleapp/qtlockedfile.cpp \
singleapp/qtsingleapplication.cpp \
-@@ -268,7 +238,7 @@
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
- INSTALLS = target
- HEADERS += x11fontdialog.h
-@@ -339,26 +309,7 @@
- locale/texmaker_nl.qm \
- locale/texmaker_fa.qm \
+@@ -373,26 +343,7 @@
locale/texmaker_pl.qm \
-- locale/texmaker_hu.qm \
+ locale/texmaker_hu.qm \
+ locale/texmaker_sr.qm \
+- locale/texmaker_el.qm \
- dictionaries/nl_NL.aff \
- dictionaries/nl_NL.dic \
- dictionaries/de_DE.aff \
@@ -131,63 +129,12 @@
- dictionaries/README_de_DE_frami.txt \
- dictionaries/README_DIC_fr_FR.txt \
- dictionaries/README_es_ES.txt
-+ locale/texmaker_hu.qm
++ locale/texmaker_el.qm
INSTALLS += utilities
desktop.path = $${DESKTOPDIR}
-@@ -444,21 +395,7 @@
- locale/texmaker_nl.qm \
- locale/texmaker_fa.qm \
- locale/texmaker_pl.qm \
-- locale/texmaker_hu.qm \
-- dictionaries/nl_NL.aff \
-- dictionaries/nl_NL.dic \
-- dictionaries/de_DE.aff \
-- dictionaries/de_DE.dic \
-- dictionaries/en_GB.aff \
-- dictionaries/en_GB.dic \
-- dictionaries/es_ES.aff \
-- dictionaries/es_ES.dic \
-- dictionaries/fr_FR.aff \
-- dictionaries/fr_FR.dic \
-- dictionaries/it_IT.aff \
-- dictionaries/it_IT.dic \
-- dictionaries/hu_HU.aff \
-- dictionaries/hu_HU.dic
-+ locale/texmaker_hu.qm
- INSTALLS += utilities
-
- others.path = texmakerwin32
-@@ -556,26 +493,7 @@
- locale/texmaker_zh_CN.qm \
- locale/texmaker_zh_TW.qm \
- locale/texmaker_cs.qm \
-- locale/texmaker_nl.qm \
-- dictionaries/nl_NL.aff \
-- dictionaries/nl_NL.dic \
-- dictionaries/de_DE.aff \
-- dictionaries/de_DE.dic \
-- dictionaries/en_GB.aff \
-- dictionaries/en_GB.dic \
-- dictionaries/es_ES.aff \
-- dictionaries/es_ES.dic \
-- dictionaries/fr_FR.aff \
-- dictionaries/fr_FR.dic \
-- dictionaries/it_IT.aff \
-- dictionaries/it_IT.dic \
-- dictionaries/it_IT_README.txt \
-- dictionaries/hu_HU.aff \
-- dictionaries/hu_HU.dic \
-- dictionaries/README_hu_HU.txt \
-- dictionaries/README_de_DE_frami.txt \
-- dictionaries/README_DIC_fr_FR.txt \
-- dictionaries/README_es_ES.txt
-+ locale/texmaker_nl.qm
- QMAKE_BUNDLE_DATA += utilities
- INSTALLS += utilities
- ICON = texmaker.icns
--- spellerdialog.h 2011-02-25 14:19:34.000000000 -0500
-+++ spellerdialog.h.new 2011-08-27 02:14:16.529418885 -0400
++++ spellerdialog.h.new 2012-01-27 22:30:08.691982170 -0500
@@ -13,7 +13,7 @@
#include "ui_spellerdialog.h"
diff --git a/texmaker.spec b/texmaker.spec
index a4e71d7..531476e 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,7 +1,7 @@
Summary: LaTeX editor
Name: texmaker
-Version: 3.1
-Release: 2%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: Applications/Publishing
@@ -82,6 +82,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/pixmaps/texmaker.png
%changelog
+* Fri Jan 27 2012 Deji Akingunola <dakingun at gmail.com> - 3.2.2-1
+- Update to 3.2.2
+
* Wed Sep 21 2011 Marek Kasik <mkasik at redhat.com> - 3.1-2
- Rebuild (poppler-0.17.3)
More information about the scm-commits
mailing list