Update to 3.3.1.

ok edd@
This commit is contained in:
shadchin 2012-03-01 17:57:45 +00:00
parent e7c31efada
commit 1973b3a74f
8 changed files with 78 additions and 48 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2011/11/24 13:12:47 shadchin Exp $
# $OpenBSD: Makefile,v 1.16 2012/03/01 17:57:45 shadchin Exp $
# $FreeBSD: ports/editors/texmaker/Makefile,v 1.2 2004/01/09 09:16:33 krion Exp $
COMMENT= LaTeX development environment
DISTNAME= texmaker-3.1
DISTNAME= texmaker-3.3.1
CATEGORIES= editors
HOMEPAGE= http://www.xm1math.net/texmaker/

View File

@ -1,5 +1,5 @@
MD5 (texmaker-3.1.tar.bz2) = EKFMdau7cjTU5eWKfIWxEA==
RMD160 (texmaker-3.1.tar.bz2) = z3xFcxnW8e1V7An8HQap0F+Ei58=
SHA1 (texmaker-3.1.tar.bz2) = P+nXLrrWPvaNzzQkj0pGzsOI2jw=
SHA256 (texmaker-3.1.tar.bz2) = +ND0pbcL01KzKDdteUbOtn6a8yXUjuAn0PTnt0Fru3g=
SIZE (texmaker-3.1.tar.bz2) = 6018840
MD5 (texmaker-3.3.1.tar.bz2) = CyUnmmSkJz3LLqZb/RPrKQ==
RMD160 (texmaker-3.3.1.tar.bz2) = d1hN1dDt5x/AXmscadG8fkObiys=
SHA1 (texmaker-3.3.1.tar.bz2) = 3GuGMhudZgFQNkYxdcMkYYTwhjc=
SHA256 (texmaker-3.3.1.tar.bz2) = +tIN8CnAC89ifu/s3elXINm/FhH0Fosql33dH4x6fDg=
SIZE (texmaker-3.3.1.tar.bz2) = 7689820

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configdialog_cpp,v 1.1 2011/04/25 13:19:23 shadchin Exp $
--- configdialog.cpp.orig Tue Apr 5 21:54:50 2011
+++ configdialog.cpp Tue Apr 5 21:55:31 2011
@@ -124,7 +124,7 @@ QDir spelldir(QCoreApplication::applicationDirPath());
$OpenBSD: patch-configdialog_cpp,v 1.2 2012/03/01 17:57:45 shadchin Exp $
--- configdialog.cpp.orig Fri Feb 24 22:23:00 2012
+++ configdialog.cpp Tue Feb 28 00:53:47 2012
@@ -212,7 +212,7 @@ QDir spelldir(QCoreApplication::applicationDirPath());
#ifdef DEBIAN_SPELLDIR
QDir spelldir(PREFIX"/share/myspell/dicts");
#else

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-latexeditor_h,v 1.3 2011/03/17 14:55:59 shadchin Exp $
--- latexeditor.h.orig Sat Mar 12 11:37:08 2011
+++ latexeditor.h Wed Mar 16 22:12:04 2011
@@ -26,7 +26,7 @@
#include <QTimer>
$OpenBSD: patch-latexeditor_h,v 1.4 2012/03/01 17:57:45 shadchin Exp $
--- latexeditor.h.orig Thu Dec 29 19:57:55 2011
+++ latexeditor.h Sat Feb 25 23:39:47 2012
@@ -33,7 +33,7 @@
#include "latexhighlighter.h"
#include "textblockselection.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>

View File

@ -1,21 +1,21 @@
$OpenBSD: patch-texmaker_cpp,v 1.6 2011/11/24 13:12:47 shadchin Exp $
--- texmaker.cpp.orig Sat Jul 23 01:46:04 2011
+++ texmaker.cpp Tue Aug 16 20:10:33 2011
@@ -3590,7 +3590,7 @@ geometry_options=config->value("Quick/GeometryOptions"
#ifdef USB_VERSION
QString dicDir=QCoreApplication::applicationDirPath() + "/";
$OpenBSD: patch-texmaker_cpp,v 1.7 2012/03/01 17:57:45 shadchin Exp $
--- texmaker.cpp.orig Sat Feb 25 14:19:23 2012
+++ texmaker.cpp Tue Feb 28 00:53:47 2012
@@ -4054,7 +4054,7 @@ QString dicDir=QCoreApplication::applicationDirPath()
#ifdef DEBIAN_SPELLDIR
QString dicDir=PREFIX"/share/myspell/dicts/";
#else
-QString dicDir=PREFIX"/share/texmaker/";
+QString dicDir=PREFIX"/share/hunspell/";
#endif
#endif
@@ -3602,7 +3602,7 @@ QString dicDir=QCoreApplication::applicationDirPath()
@@ -4067,7 +4067,7 @@ QString dicDir=QCoreApplication::applicationDirPath()
#endif
QString defaultDic=dicDir+QString(QLocale::system().name())+".dic";
QFileInfo fi(defaultDic);
-if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"en_GB.dic";
+if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"default.dic";
spell_dic=config->value("Spell/Dic",defaultDic).toString();
spell_ignored_words=config->value("Spell/Words","").toString();
QFileInfo fispell(spell_dic);
pdfCheckerLang=fispell.fileName().left(2);

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-texmaker_h,v 1.4 2011/11/24 13:12:47 shadchin Exp $
--- texmaker.h.orig Wed Jul 20 14:03:11 2011
+++ texmaker.h Tue Aug 16 20:11:50 2011
@@ -46,7 +46,7 @@
#include "symbollistwidget.h"
$OpenBSD: patch-texmaker_h,v 1.5 2012/03/01 17:57:45 shadchin Exp $
--- texmaker.h.orig Thu Feb 23 23:04:45 2012
+++ texmaker.h Tue Feb 28 00:53:47 2012
@@ -48,7 +48,7 @@
#include "usertagslistwidget.h"
#include "xmltagslistwidget.h"
#include "logeditor.h"
-#include "hunspell/hunspell.hxx"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-texmaker_pro,v 1.6 2011/11/24 13:12:47 shadchin Exp $
--- texmaker.pro.orig Thu Jul 21 14:57:13 2011
+++ texmaker.pro Tue Aug 16 20:12:48 2011
$OpenBSD: patch-texmaker_pro,v 1.7 2012/03/01 17:57:45 shadchin Exp $
--- texmaker.pro.orig Mon Feb 27 20:45:14 2012
+++ texmaker.pro Tue Feb 28 23:05:53 2012
@@ -4,7 +4,8 @@ TARGET = texmaker
QT += network \
xml \
@ -8,13 +8,13 @@ $OpenBSD: patch-texmaker_pro,v 1.6 2011/11/24 13:12:47 shadchin Exp $
-CONFIG += qt warn_off release
+CONFIG += qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell poppler-qt4
TEXMAKERVERSION=3.1
TEXMAKERVERSION=3.3.1
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
DEFINES += HAVE_SPLASH
@@ -62,25 +63,6 @@ HEADERS += texmaker.h \
usercompletiondialog.h \
synctex_parser.h \
@@ -67,25 +68,6 @@ HEADERS += texmaker.h \
synctex_parser_utils.h \
usertagslistwidget.h \
addtagdialog.h \
- hunspell/affentry.hxx \
- hunspell/affixmgr.hxx \
- hunspell/atypes.hxx \
@ -37,10 +37,10 @@ $OpenBSD: patch-texmaker_pro,v 1.6 2011/11/24 13:12:47 shadchin Exp $
singleapp/qtlocalpeer.h \
singleapp/qtlockedfile.h \
singleapp/qtsingleapplication.h \
@@ -162,18 +144,6 @@ SOURCES += main.cpp \
usercompletiondialog.cpp \
synctex_parser.c \
@@ -171,18 +153,6 @@ SOURCES += main.cpp \
synctex_parser_utils.c \
usertagslistwidget.cpp \
addtagdialog.cpp \
- hunspell/affentry.cxx \
- hunspell/affixmgr.cxx \
- hunspell/csutil.cxx \
@ -56,11 +56,11 @@ $OpenBSD: patch-texmaker_pro,v 1.6 2011/11/24 13:12:47 shadchin Exp $
singleapp/qtlocalpeer.cpp \
singleapp/qtlockedfile.cpp \
singleapp/qtsingleapplication.cpp \
@@ -339,26 +309,7 @@ utilities.files = doc/doc1.png \
locale/texmaker_nl.qm \
locale/texmaker_fa.qm \
@@ -381,29 +351,7 @@ utilities.files = doc/doc1.png \
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 \
@ -77,10 +77,13 @@ $OpenBSD: patch-texmaker_pro,v 1.6 2011/11/24 13:12:47 shadchin Exp $
- dictionaries/hu_HU.aff \
- dictionaries/hu_HU.dic \
- dictionaries/README_hu_HU.txt \
- dictionaries/cs_CZ.aff \
- dictionaries/cs_CZ.dic \
- dictionaries/README_cs_CZ.txt \
- 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}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2011/11/24 13:12:47 shadchin Exp $
@comment $OpenBSD: PLIST,v 1.6 2012/03/01 17:57:45 shadchin Exp $
@bin bin/texmaker
share/applications/texmaker.desktop
share/pixmaps/
@ -7,29 +7,53 @@ share/texmaker/
share/texmaker/AUTHORS
share/texmaker/CHANGELOG.txt
share/texmaker/COPYING
share/texmaker/atd.css
share/texmaker/csshttprequest.js
share/texmaker/doc1.png
share/texmaker/doc10.png
share/texmaker/doc10hu.png
share/texmaker/doc11.png
share/texmaker/doc11hu.png
share/texmaker/doc12.png
share/texmaker/doc12hu.png
share/texmaker/doc13.png
share/texmaker/doc13hu.png
share/texmaker/doc14.png
share/texmaker/doc14hu.png
share/texmaker/doc15.png
share/texmaker/doc15hu.png
share/texmaker/doc16.png
share/texmaker/doc16hu.png
share/texmaker/doc17.png
share/texmaker/doc17hu.png
share/texmaker/doc18.png
share/texmaker/doc19.png
share/texmaker/doc1hu.png
share/texmaker/doc2.png
share/texmaker/doc20.png
share/texmaker/doc20hu.png
share/texmaker/doc21.png
share/texmaker/doc21hu.png
share/texmaker/doc22.png
share/texmaker/doc22hu.png
share/texmaker/doc2hu.png
share/texmaker/doc3.png
share/texmaker/doc3hu.png
share/texmaker/doc4.png
share/texmaker/doc4hu.png
share/texmaker/doc5.png
share/texmaker/doc5hu.png
share/texmaker/doc6.png
share/texmaker/doc6ahu.png
share/texmaker/doc6bis.png
share/texmaker/doc6hu.png
share/texmaker/doc7.png
share/texmaker/doc7hu.png
share/texmaker/doc8.png
share/texmaker/doc8hu.png
share/texmaker/doc9.png
share/texmaker/doc9hu.png
share/texmaker/jquery.atd.textarea.js
share/texmaker/latexhelp.html
share/texmaker/qt_cs.qm
share/texmaker/qt_de.qm
@ -49,9 +73,9 @@ share/texmaker/texmaker22x22.png
share/texmaker/texmaker32x32.png
share/texmaker/texmaker48x48.png
share/texmaker/texmaker64x64.png
share/texmaker/texmaker_ca.qm
share/texmaker/texmaker_cs.qm
share/texmaker/texmaker_de.qm
share/texmaker/texmaker_el.qm
share/texmaker/texmaker_es.qm
share/texmaker/texmaker_fa.qm
share/texmaker/texmaker_fr.qm
@ -62,9 +86,12 @@ share/texmaker/texmaker_nl.qm
share/texmaker/texmaker_pl.qm
share/texmaker/texmaker_pt_BR.qm
share/texmaker/texmaker_ru.qm
share/texmaker/texmaker_sr.qm
share/texmaker/texmaker_zh_CN.qm
share/texmaker/texmaker_zh_TW.qm
share/texmaker/usermanual_en.html
share/texmaker/usermanual_fr.html
share/texmaker/usermanual_hu.html
share/texmaker/usermanual_ru.html
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database