Hi, This diff updates texmaker to the latest release. Tested on amd64.
Comments ? OK ? Index: Makefile =================================================================== RCS file: /cvs/ports/editors/texmaker/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- Makefile 1 Jul 2018 09:02:40 -0000 1.39 +++ Makefile 8 Jul 2018 23:09:13 -0000 @@ -1,9 +1,8 @@ # $OpenBSD: Makefile,v 1.39 2018/07/01 09:02:40 espie Exp $ COMMENT= LaTeX development environment -DISTNAME= texmaker-4.5 +DISTNAME= texmaker-5.0.2 CATEGORIES= editors -REVISION= 4 HOMEPAGE= http://www.xm1math.net/texmaker/ @@ -16,14 +15,13 @@ MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.bz2 WANTLIB += ${COMPILER_LIBCXX} -WANTLIB += ICE QtGui QtNetwork QtScript QtWebKit QtXml SM X11 -WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.6 -WANTLIB += m poppler-qt4 pthread z +WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport +WANTLIB += Qt5Script Qt5Widgets Qt5Xml c hunspell-1.6 m # c++-11 for required for poppler COMPILER= base-clang ports-gcc -MODULES= devel/qmake x11/qt4 +MODULES= devel/qmake x11/qt5 MODQMAKE_ARGS= DESKTOPDIR=${LOCALBASE}/share/applications \ ICONDIR=${LOCALBASE}/share/pixmaps @@ -31,7 +29,7 @@ RUN_DEPENDS= print/texlive/base \ devel/desktop-file-utils LIB_DEPENDS= textproc/hunspell \ - print/poppler,,-qt4 + x11/qt5/qtscript,-main NO_TEST= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/editors/texmaker/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo 14 Nov 2015 15:24:44 -0000 1.19 +++ distinfo 8 Jul 2018 23:09:13 -0000 @@ -1,2 +1,2 @@ -SHA256 (texmaker-4.5.tar.bz2) = LOmWbkEL+HhknRx1bj3CoHflXh6qn0vrEKpyJM2U1hQ= -SIZE (texmaker-4.5.tar.bz2) = 11287724 +SHA256 (texmaker-5.0.2.tar.bz2) = qU6Nd6Fv3dB4nEUrCRO7CYsfiVOXs61TvimthKqsAXk= +SIZE (texmaker-5.0.2.tar.bz2) = 15695684 Index: patches/patch-pdfium_core_fxcrt_include_fx_system_h =================================================================== RCS file: patches/patch-pdfium_core_fxcrt_include_fx_system_h diff -N patches/patch-pdfium_core_fxcrt_include_fx_system_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-pdfium_core_fxcrt_include_fx_system_h 8 Jul 2018 23:09:13 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: pdfium/core/fxcrt/include/fx_system.h +--- pdfium/core/fxcrt/include/fx_system.h.orig ++++ pdfium/core/fxcrt/include/fx_system.h +@@ -40,7 +40,7 @@ + #elif defined(_WIN64) + #define _FX_OS_ _FX_WIN64_DESKTOP_ + #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_ +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__OpenBSD__) + #define _FX_OS_ _FX_LINUX_DESKTOP_ + #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_ + #elif defined(__APPLE__) Index: patches/patch-pdfium_core_fxge_ge_fx_ge_linux_cpp =================================================================== RCS file: patches/patch-pdfium_core_fxge_ge_fx_ge_linux_cpp diff -N patches/patch-pdfium_core_fxge_ge_fx_ge_linux_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-pdfium_core_fxge_ge_fx_ge_linux_cpp 8 Jul 2018 23:09:13 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ + +Index: pdfium/core/fxge/ge/fx_ge_linux.cpp +--- pdfium/core/fxge/ge/fx_ge_linux.cpp.orig ++++ pdfium/core/fxge/ge/fx_ge_linux.cpp +@@ -128,9 +128,8 @@ std::unique_ptr<IFX_SystemFontInfo> IFX_SystemFontInfo + const char** pUserPaths) { + CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo; + if (!pInfo->ParseFontCfg(pUserPaths)) { +- pInfo->AddPath("/usr/share/fonts"); +- pInfo->AddPath("/usr/share/X11/fonts/Type1"); +- pInfo->AddPath("/usr/share/X11/fonts/TTF"); ++ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/Type1"); ++ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF"); + pInfo->AddPath("/usr/local/share/fonts"); + } + return std::unique_ptr<IFX_SystemFontInfo>(pInfo); Index: patches/patch-pdfium_fpdfsdk_javascript_JS_Value_cpp =================================================================== RCS file: patches/patch-pdfium_fpdfsdk_javascript_JS_Value_cpp diff -N patches/patch-pdfium_fpdfsdk_javascript_JS_Value_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-pdfium_fpdfsdk_javascript_JS_Value_cpp 8 Jul 2018 23:09:13 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ + +Index: pdfium/fpdfsdk/javascript/JS_Value.cpp +--- pdfium/fpdfsdk/javascript/JS_Value.cpp.orig ++++ pdfium/fpdfsdk/javascript/JS_Value.cpp +@@ -573,7 +573,12 @@ double _getLocalTZA() { + long timezone = 0; + _get_timezone(&timezone); + #endif ++#ifdef __OpenBSD__ ++ struct tm *lt; ++ return (double)(-(lt->tm_gmtoff * 1000)); ++#else + return (double)(-(timezone * 1000)); ++#endif + } + + int _getDaylightSavingTA(double d) { Index: patches/patch-pdfium_third_party_base_logging_h =================================================================== RCS file: patches/patch-pdfium_third_party_base_logging_h diff -N patches/patch-pdfium_third_party_base_logging_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-pdfium_third_party_base_logging_h 8 Jul 2018 23:09:13 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: pdfium/third_party/base/logging.h +--- pdfium/third_party/base/logging.h.orig ++++ pdfium/third_party/base/logging.h +@@ -10,7 +10,7 @@ + + #ifndef _WIN32 + #define NULL_DEREF_IF_POSSIBLE \ +- *(reinterpret_cast<volatile char*>(NULL) + 42) = 0x42; ++ *(static_cast<volatile char*>(nullptr) + 42) = 0x42; + #else + #define NULL_DEREF_IF_POSSIBLE + #endif Index: patches/patch-pdfium_third_party_libopenjpeg20_opj_malloc_h =================================================================== RCS file: patches/patch-pdfium_third_party_libopenjpeg20_opj_malloc_h diff -N patches/patch-pdfium_third_party_libopenjpeg20_opj_malloc_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-pdfium_third_party_libopenjpeg20_opj_malloc_h 8 Jul 2018 23:09:13 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: pdfium/third_party/libopenjpeg20/opj_malloc.h +--- pdfium/third_party/libopenjpeg20/opj_malloc.h.orig ++++ pdfium/third_party/libopenjpeg20/opj_malloc.h +@@ -98,7 +98,7 @@ Allocate memory aligned to a 16 byte boundary + #else /* Not _WIN32 */ + #if defined(__sun) + #define HAVE_MEMALIGN +- #elif defined(__FreeBSD__) ++ #elif defined(__FreeBSD__) || defined(__OpenBSD__) + #define HAVE_POSIX_MEMALIGN + /* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) Index: patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp =================================================================== RCS file: patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp diff -N patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp 8 Jul 2018 23:09:13 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp +--- pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp.orig ++++ pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp +@@ -464,8 +464,8 @@ FX_LPEnumAllFonts FX_GetDefFontEnumerator() { + #else + const FX_CHAR* g_FontFolders[] = { + #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ +- "/usr/share/fonts", "/usr/share/X11/fonts/Type1", +- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts", ++ "/usr/X11R6/lib/X11/fonts/Type1", ++ "/usr/X11R6/lib/X11/fonts/TTF", "/usr/local/share/fonts", + #elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ + "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts", + #elif _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ Index: patches/patch-texmaker_cpp =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_cpp,v retrieving revision 1.16 diff -u -p -r1.16 patch-texmaker_cpp --- patches/patch-texmaker_cpp 14 Nov 2015 15:24:44 -0000 1.16 +++ patches/patch-texmaker_cpp 8 Jul 2018 23:09:13 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-texmaker_cpp,v 1.16 2015/11/14 15:24:44 shadchin Exp $ ---- texmaker.cpp.orig Wed Oct 28 20:11:56 2015 -+++ texmaker.cpp Sat Nov 7 20:01:28 2015 -@@ -4692,7 +4692,7 @@ QString dicDir=QCoreApplication::applicationDirPath() +Index: texmaker.cpp +--- texmaker.cpp.orig ++++ texmaker.cpp +@@ -4670,7 +4670,7 @@ QString dicDir=QCoreApplication::applicationDirPath() #ifdef DEBIAN_SPELLDIR QString dicDir=PREFIX"/share/myspell/dicts/"; #else @@ -10,7 +11,7 @@ $OpenBSD: patch-texmaker_cpp,v 1.16 2015 #endif #endif -@@ -4705,7 +4705,7 @@ QString dicDir=QCoreApplication::applicationDirPath() +@@ -4683,7 +4683,7 @@ QString dicDir=QCoreApplication::applicationDirPath() #endif QString defaultDic=dicDir+QString(QLocale::system().name())+".dic"; QFileInfo fi(defaultDic); Index: patches/patch-texmaker_h =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_h,v retrieving revision 1.6 diff -u -p -r1.6 patch-texmaker_h --- patches/patch-texmaker_h 1 Jun 2013 08:27:57 -0000 1.6 +++ patches/patch-texmaker_h 8 Jul 2018 23:09:13 -0000 @@ -1,12 +1,13 @@ $OpenBSD: patch-texmaker_h,v 1.6 2013/06/01 08:27:57 shadchin Exp $ ---- texmaker.h.orig Sun Apr 21 14:50:47 2013 -+++ texmaker.h Wed May 8 23:15:53 2013 +Index: texmaker.h +--- texmaker.h.orig ++++ texmaker.h @@ -48,7 +48,7 @@ #include "usertagslistwidget.h" #include "xmltagslistwidget.h" #include "logeditor.h" -#include "hunspell/hunspell.hxx" +#include <hunspell.hxx> - #include "browser.h" #include "pdfviewerwidget.h" #include "pdfviewer.h" + #include "sourceview.h" Index: patches/patch-texmaker_pro =================================================================== RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_pro,v retrieving revision 1.16 diff -u -p -r1.16 patch-texmaker_pro --- patches/patch-texmaker_pro 14 Nov 2015 15:24:44 -0000 1.16 +++ patches/patch-texmaker_pro 8 Jul 2018 23:09:13 -0000 @@ -1,19 +1,20 @@ $OpenBSD: patch-texmaker_pro,v 1.16 2015/11/14 15:24:44 shadchin Exp $ ---- texmaker.pro.orig Sat Oct 24 14:05:27 2015 -+++ texmaker.pro Sat Nov 7 20:03:27 2015 -@@ -23,7 +23,7 @@ PKGCONFIG = poppler-qt5 - DEFINES += POPPLER24 - } else { - CONFIG += link_pkgconfig --PKGCONFIG = poppler-qt4 -+PKGCONFIG = poppler-qt4 hunspell - DETECTEDPOPPLER=$$system(pkg-config --modversion poppler) - contains( DETECTEDPOPPLER, "^0.18.*" ){ - DEFINES += OLDPOPPLER -@@ -98,25 +98,6 @@ HEADERS += texmaker.h \ +Index: texmaker.pro +--- texmaker.pro.orig ++++ texmaker.pro +@@ -24,6 +24,8 @@ message("Qt>=5.7 is required.") + + CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release + CONFIG -= precompile_header ++CONFIG += link_pkgconfig ++PKGCONFIG = hunspell + + gcc { + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter +@@ -117,25 +119,6 @@ HEADERS += texmaker.h \ unicodeview.h \ - quickbeamerdialog.h \ svnhelper.h \ + quickbeamerdialog.h \ - hunspell/affentry.hxx \ - hunspell/affixmgr.hxx \ - hunspell/atypes.hxx \ @@ -36,7 +37,7 @@ $OpenBSD: patch-texmaker_pro,v 1.16 2015 singleapp/qtlocalpeer.h \ singleapp/qtlockedfile.h \ singleapp/qtsingleapplication.h \ -@@ -210,18 +191,6 @@ SOURCES += main.cpp \ +@@ -502,18 +485,6 @@ SOURCES += main.cpp \ unicodeview.cpp \ quickbeamerdialog.cpp \ svnhelper.cpp \ @@ -55,7 +56,7 @@ $OpenBSD: patch-texmaker_pro,v 1.16 2015 singleapp/qtlocalpeer.cpp \ singleapp/qtlockedfile.cpp \ singleapp/qtsingleapplication.cpp \ -@@ -436,40 +405,7 @@ utilities.files = doc/doc1.png \ +@@ -1160,40 +1131,7 @@ utilities.files = doc/doc10.png \ locale/texmaker_ar.qm \ locale/texmaker_lv.qm \ locale/texmaker_uk.qm \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/editors/texmaker/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 27 Jun 2018 21:03:42 -0000 1.12 +++ pkg/PLIST 8 Jul 2018 23:09:13 -0000 @@ -7,64 +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/hardwordwrap_selection_80col.tms -share/texmaker/jquery.atd.textarea.js share/texmaker/latexhelp.html +share/texmaker/qt_ar.qm +share/texmaker/qt_ca.qm share/texmaker/qt_cs.qm +share/texmaker/qt_da.qm share/texmaker/qt_de.qm +share/texmaker/qt_en.qm share/texmaker/qt_es.qm share/texmaker/qt_fa.qm +share/texmaker/qt_fi.qm share/texmaker/qt_fr.qm -share/texmaker/qt_nl.qm +share/texmaker/qt_gl.qm +share/texmaker/qt_he.qm +share/texmaker/qt_hu.qm +share/texmaker/qt_it.qm +share/texmaker/qt_ja.qm +share/texmaker/qt_ko.qm +share/texmaker/qt_lt.qm share/texmaker/qt_pl.qm share/texmaker/qt_pt.qm share/texmaker/qt_ru.qm +share/texmaker/qt_sk.qm +share/texmaker/qt_sl.qm +share/texmaker/qt_sv.qm +share/texmaker/qt_uk.qm share/texmaker/qt_zh_CN.qm share/texmaker/qt_zh_TW.qm share/texmaker/texmaker.svg @@ -99,6 +88,4 @@ share/texmaker/texmaker_zh_TW.qm share/texmaker/titlecase_selection.tms share/texmaker/usermanual_en.html share/texmaker/usermanual_fr.html -share/texmaker/usermanual_hu.html -share/texmaker/usermanual_ru.html @tag update-desktop-database
