Update to 3.1.

ok jasper@
This commit is contained in:
shadchin 2011-11-24 13:12:47 +00:00
parent e9ed5ea996
commit 23455ea7ce
7 changed files with 49 additions and 40 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2011/09/16 09:48:09 espie Exp $
# $OpenBSD: Makefile,v 1.15 2011/11/24 13:12:47 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.0.2
REVISION= 0
DISTNAME= texmaker-3.1
CATEGORIES= editors
HOMEPAGE= http://www.xm1math.net/texmaker/
@ -19,8 +18,9 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.bz2
WANTLIB += QtGui QtNetwork QtWebKit QtXml c hunspell-1.2 m poppler
WANTLIB += poppler-qt4 pthread stdc++ z
WANTLIB += ICE QtGui QtNetwork QtWebKit QtXml SM X11 Xext Xi Xinerama
WANTLIB += Xrender c fontconfig freetype hunspell-1.2 m poppler-qt4
WANTLIB += pthread stdc++ z
MODULES= x11/qt4
@ -31,6 +31,7 @@ LIB_DEPENDS= textproc/hunspell \
print/poppler,-qt4
NO_REGRESS= Yes
VMEM_WARNING= Yes
FAKE_FLAGS= INSTALL_ROOT=${WRKINST}

View File

@ -1,5 +1,5 @@
MD5 (texmaker-3.0.2.tar.bz2) = 03XI9Ib+RPPyoqfS3awI8w==
RMD160 (texmaker-3.0.2.tar.bz2) = eV3sqW/7o22bdEyRUxDKwhiFsg0=
SHA1 (texmaker-3.0.2.tar.bz2) = JKqebNu4szw4l5/dq0/1WY8UZ/E=
SHA256 (texmaker-3.0.2.tar.bz2) = YS7ZjdxqiJoQYkoRHqmfbtWu2euBPktV6rs8KnEdcCY=
SIZE (texmaker-3.0.2.tar.bz2) = 5207700
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

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-latexeditorview_h,v 1.2 2011/04/25 13:19:23 shadchin Exp $
--- latexeditorview.h.orig Fri Apr 1 18:28:44 2011
+++ latexeditorview.h Tue Apr 5 21:42:18 2011
@@ -19,7 +19,7 @@
#include "linenumberwidget.h"
#include "findwidget.h"
$OpenBSD: patch-latexeditorview_h,v 1.3 2011/11/24 13:12:47 shadchin Exp $
--- latexeditorview.h.orig Wed Jul 20 14:11:45 2011
+++ latexeditorview.h Tue Aug 16 20:10:32 2011
@@ -22,7 +22,7 @@
#include "gotolinewidget.h"
#include "replacewidget.h"
#include "minisplitter.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-texmaker_cpp,v 1.5 2011/04/28 17:06:11 shadchin Exp $
--- texmaker.cpp.orig Mon Apr 25 19:12:44 2011
+++ texmaker.cpp Thu Apr 28 22:00:03 2011
@@ -3474,7 +3474,7 @@ author=config->value("Quick/Author","").toString();
$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() + "/";
#else
@ -10,7 +10,7 @@ $OpenBSD: patch-texmaker_cpp,v 1.5 2011/04/28 17:06:11 shadchin Exp $
#endif
#endif
@@ -3486,7 +3486,7 @@ QString dicDir=QCoreApplication::applicationDirPath()
@@ -3602,7 +3602,7 @@ QString dicDir=QCoreApplication::applicationDirPath()
#endif
QString defaultDic=dicDir+QString(QLocale::system().name())+".dic";
QFileInfo fi(defaultDic);

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-texmaker_h,v 1.3 2011/04/25 13:19:23 shadchin Exp $
--- texmaker.h.orig Sun Apr 3 15:04:18 2011
+++ texmaker.h Tue Apr 5 21:40:49 2011
@@ -47,7 +47,7 @@
$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"
#include "xmltagslistwidget.h"
#include "logeditor.h"
#include "gotolinedialog.h"
#include "replacedialog.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
#include "browser.h"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-texmaker_pro,v 1.5 2011/04/28 17:06:11 shadchin Exp $
--- texmaker.pro.orig Sun Apr 3 16:16:58 2011
+++ texmaker.pro Tue Apr 5 21:45:23 2011
$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
@@ -4,7 +4,8 @@ TARGET = texmaker
QT += network \
xml \
@ -8,10 +8,10 @@ $OpenBSD: patch-texmaker_pro,v 1.5 2011/04/28 17:06:11 shadchin Exp $
-CONFIG += qt warn_off release
+CONFIG += qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell poppler-qt4
TEXMAKERVERSION=3.0.2
TEXMAKERVERSION=3.1
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
DEFINES += HAVE_SPLASH
@@ -56,25 +57,6 @@ HEADERS += texmaker.h \
@@ -62,25 +63,6 @@ HEADERS += texmaker.h \
usercompletiondialog.h \
synctex_parser.h \
synctex_parser_utils.h \
@ -37,7 +37,7 @@ $OpenBSD: patch-texmaker_pro,v 1.5 2011/04/28 17:06:11 shadchin Exp $
singleapp/qtlocalpeer.h \
singleapp/qtlockedfile.h \
singleapp/qtsingleapplication.h \
@@ -150,18 +132,6 @@ SOURCES += main.cpp \
@@ -162,18 +144,6 @@ SOURCES += main.cpp \
usercompletiondialog.cpp \
synctex_parser.c \
synctex_parser_utils.c \
@ -56,11 +56,11 @@ $OpenBSD: patch-texmaker_pro,v 1.5 2011/04/28 17:06:11 shadchin Exp $
singleapp/qtlocalpeer.cpp \
singleapp/qtlockedfile.cpp \
singleapp/qtsingleapplication.cpp \
@@ -319,23 +289,7 @@ utilities.files = doc/doc1.png \
locale/texmaker_zh_CN.qm \
locale/texmaker_zh_TW.qm \
locale/texmaker_cs.qm \
- locale/texmaker_nl.qm \
@@ -339,26 +309,7 @@ utilities.files = doc/doc1.png \
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 \
@ -74,10 +74,13 @@ $OpenBSD: patch-texmaker_pro,v 1.5 2011/04/28 17:06:11 shadchin Exp $
- 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
+ locale/texmaker_hu.qm
INSTALLS += utilities
desktop.path = $${DESKTOPDIR}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2011/04/25 13:19:23 shadchin Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/11/24 13:12:47 shadchin Exp $
@bin bin/texmaker
share/applications/texmaker.desktop
share/pixmaps/
@ -34,7 +34,10 @@ share/texmaker/latexhelp.html
share/texmaker/qt_cs.qm
share/texmaker/qt_de.qm
share/texmaker/qt_es.qm
share/texmaker/qt_fa.qm
share/texmaker/qt_fr.qm
share/texmaker/qt_nl.qm
share/texmaker/qt_pl.qm
share/texmaker/qt_pt.qm
share/texmaker/qt_ru.qm
share/texmaker/qt_zh_CN.qm
@ -53,8 +56,10 @@ share/texmaker/texmaker_es.qm
share/texmaker/texmaker_fa.qm
share/texmaker/texmaker_fr.qm
share/texmaker/texmaker_gl.qm
share/texmaker/texmaker_hu.qm
share/texmaker/texmaker_it.qm
share/texmaker/texmaker_nl.qm
share/texmaker/texmaker_pl.qm
share/texmaker/texmaker_pt_BR.qm
share/texmaker/texmaker_ru.qm
share/texmaker/texmaker_zh_CN.qm