Index: head/editors/texmaker/Makefile =================================================================== --- head/editors/texmaker/Makefile (revision 507326) +++ head/editors/texmaker/Makefile (revision 507327) @@ -1,29 +1,29 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= texmaker -PORTVERSION= 4.5 -PORTREVISION= 19 +PORTVERSION= 5.0.3 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ MAINTAINER= hrs@FreeBSD.org COMMENT= LaTeX Development Environment LICENSE= GPLv2+ -LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \ - libpoppler.so:graphics/poppler \ - libpoppler-qt5.so:graphics/poppler-qt5 +LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell USES= compiler:c++11-lang desktop-file-utils ghostscript:x11,run \ - pkgconfig qmake qt:5 tar:bzip2 -USE_QT= concurrent network printsupport script webkit widgets \ + gl pkgconfig qmake qt:5 tar:bzip2 +USE_GL= gl +USE_QT= concurrent core gui network printsupport script widgets \ xml buildtools_build USE_TEX= latex dvipsk + EXTRACT_AFTER_ARGS= --exclude hunspell QMAKE_ARGS= ICONDIR=${PREFIX}/share/pixmaps \ - DESKTOPDIR=${DESKTOPDIR} + DESKTOPDIR=${DESKTOPDIR} \ + METAINFODIR=${PREFIX}/share/metainfo .include Index: head/editors/texmaker/distinfo =================================================================== --- head/editors/texmaker/distinfo (revision 507326) +++ head/editors/texmaker/distinfo (revision 507327) @@ -1,2 +1,3 @@ -SHA256 (texmaker-4.5.tar.bz2) = 2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614 -SIZE (texmaker-4.5.tar.bz2) = 11287724 +TIMESTAMP = 1561128794 +SHA256 (texmaker-5.0.3.tar.bz2) = 6074dffa82c431f8727c39e046f62cb70f5fe1457f158b46306e8f490b4f326f +SIZE (texmaker-5.0.3.tar.bz2) = 15783226 Index: head/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h =================================================================== --- head/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h (nonexistent) +++ head/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h (revision 507327) @@ -0,0 +1,11 @@ +--- pdfium/core/fxcrt/include/fx_system.h.orig 2017-04-16 14:53:52 UTC ++++ 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(__FreeBSD__) + #define _FX_OS_ _FX_LINUX_DESKTOP_ + #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_ + #elif defined(__APPLE__) Property changes on: head/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/texmaker/files/patch-pdfium_third__party_base_logging.h =================================================================== --- head/editors/texmaker/files/patch-pdfium_third__party_base_logging.h (nonexistent) +++ head/editors/texmaker/files/patch-pdfium_third__party_base_logging.h (revision 507327) @@ -0,0 +1,11 @@ +--- pdfium/third_party/base/logging.h.orig 2017-04-16 14:53:52 UTC ++++ pdfium/third_party/base/logging.h +@@ -10,7 +10,7 @@ + + #ifndef _WIN32 + #define NULL_DEREF_IF_POSSIBLE \ +- *(reinterpret_cast(NULL) + 42) = 0x42; ++ *(reinterpret_cast(__null) + 42) = 0x42; + #else + #define NULL_DEREF_IF_POSSIBLE + #endif Property changes on: head/editors/texmaker/files/patch-pdfium_third__party_base_logging.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/texmaker/files/patch-texmaker.pro =================================================================== --- head/editors/texmaker/files/patch-texmaker.pro (revision 507326) +++ head/editors/texmaker/files/patch-texmaker.pro (revision 507327) @@ -1,96 +1,93 @@ ---- texmaker.pro.orig 2015-10-24 09:05:27 UTC +--- texmaker.pro.orig 2018-10-31 06:58:22 UTC +++ texmaker.pro -@@ -19,11 +19,11 @@ DEFINES += HAVE_SPLASH - unix:!macx { - contains( QT_VERSION, "^5.*" ) { - CONFIG += link_pkgconfig --PKGCONFIG = poppler-qt5 -+PKGCONFIG = hunspell poppler-qt5 - DEFINES += POPPLER24 - } else { - CONFIG += link_pkgconfig --PKGCONFIG = poppler-qt4 -+PKGCONFIG = hunspell poppler-qt4 - DETECTEDPOPPLER=$$system(pkg-config --modversion poppler) - contains( DETECTEDPOPPLER, "^0.18.*" ){ - DEFINES += OLDPOPPLER -@@ -98,25 +98,6 @@ HEADERS += texmaker.h \ +@@ -21,6 +21,8 @@ QT += webenginewidgets + message("Qt>=5.7 is required.") + } + ++CONFIG += link_pkgconfig ++PKGCONFIG += hunspell + + CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release + CONFIG -= precompile_header +@@ -117,25 +119,6 @@ HEADERS += texmaker.h \ unicodeview.h \ - quickbeamerdialog.h \ svnhelper.h \ + quickbeamerdialog.h \ - hunspell/affentry.hxx \ - hunspell/affixmgr.hxx \ - hunspell/atypes.hxx \ - hunspell/baseaffix.hxx \ - hunspell/csutil.hxx \ - hunspell/dictmgr.hxx \ - hunspell/hashmgr.hxx \ - hunspell/htypes.hxx \ - hunspell/hunspell.hxx \ - hunspell/hunspell.h \ - hunspell/langnum.hxx \ - hunspell/license.hunspell \ - hunspell/phonet.hxx \ - hunspell/suggestmgr.hxx \ - hunspell/license.myspell \ - hunspell/filemgr.hxx \ - hunspell/hunzip.hxx \ - hunspell/replist.hxx \ - hunspell/w_char.hxx \ 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 \ - hunspell/affentry.cxx \ - hunspell/affixmgr.cxx \ - hunspell/csutil.cxx \ - hunspell/dictmgr.cxx \ - hunspell/hashmgr.cxx \ - hunspell/hunspell.cxx \ - hunspell/phonet.cxx \ - hunspell/suggestmgr.cxx \ - hunspell/utf_info.cxx \ - hunspell/filemgr.cxx \ - hunspell/replist.cxx \ - hunspell/hunzip.cxx \ singleapp/qtlocalpeer.cpp \ singleapp/qtlockedfile.cpp \ singleapp/qtsingleapplication.cpp \ -@@ -395,13 +364,6 @@ utilities.files = doc/doc1.png \ +@@ -1104,13 +1075,6 @@ utilities.files = doc/doc10.png \ utilities/AUTHORS \ utilities/COPYING \ utilities/CHANGELOG.txt \ - utilities/texmaker16x16.png \ - utilities/texmaker22x22.png \ - utilities/texmaker32x32.png \ - utilities/texmaker48x48.png \ - utilities/texmaker64x64.png \ - utilities/texmaker128x128.png \ - utilities/texmaker.svg \ scripts/titlecase_selection.tms \ scripts/hardwordwrap_selection_80col.tms \ - locale/qt_cs.qm \ -@@ -477,4 +439,20 @@ INSTALLS += desktop + locale/qt_ar.qm \ +@@ -1201,6 +1165,22 @@ INSTALLS += desktop icon.files = utilities/texmaker.png INSTALLS += icon + +icon16.path = $${PREFIX}/share/icons/hicolor/16x16/apps +icon16.files= utilities/texmaker16x16.png +icon22.path = $${PREFIX}/share/icons/hicolor/22x22/apps +icon22.files= utilities/texmaker22x22.png +icon32.path= $${PREFIX}/share/icons/hicolor/32x32/apps +icon32.files= utilities/texmaker32x32.png +icon48.path= $${PREFIX}/share/icons/hicolor/48x48/apps +icon48.files= utilities/texmaker48x48.png +icon64.path= $${PREFIX}/share/icons/hicolor/64x64/apps +icon64.files= utilities/texmaker64x64.png +icon128.path= $${PREFIX}/share/icons/hicolor/128x128/apps +icon128.files=utilities/texmaker128x128.png +iconscale.path=$${PREFIX}/share/icons/hicolor/scalable/apps +iconscale.files=utilities/texmaker.svg +INSTALLS += icon16 icon22 icon32 icon48 icon64 icon128 iconscale - } + + #not for openSUSE : + metainfo.files = utilities/texmaker.appdata.xml Index: head/editors/texmaker/pkg-descr =================================================================== --- head/editors/texmaker/pkg-descr (revision 507326) +++ head/editors/texmaker/pkg-descr (revision 507327) @@ -1,20 +1,20 @@ Texmaker is a program, that integrates many tools needed to develop documents with LaTeX, in just one application. Features : * an editor to write your LaTeX source files * the principal LaTex tags can be inserted directly * 370 mathematical symbols can be inserted in just one click * wizards to generate code * LaTeX-related programs can be launched via the "Tools" menu * the standard Bibtex entry types can be inserted in the ".bib" file * a "structure view" of the document for easier navigation of a document * extensive LaTeX documentation * in the "Messages / Log File" frame, you can see information about processes and the logfile after a LaTeX compilation * the "Next Latex Error" and "Previous Latex Error" commands let you reach the LaTeX errors detected by Kile in the log file * by clicking on the number of a line in the log file, the cursor jumps to the corresponding line in the editor -WWW: http://www.xm1math.net/texmaker/ +WWW: https://www.xm1math.net/texmaker/ Index: head/editors/texmaker/pkg-plist =================================================================== --- head/editors/texmaker/pkg-plist (revision 507326) +++ head/editors/texmaker/pkg-plist (revision 507327) @@ -1,133 +1,121 @@ bin/texmaker share/applications/texmaker.desktop share/icons/hicolor/128x128/apps/texmaker128x128.png share/icons/hicolor/16x16/apps/texmaker16x16.png share/icons/hicolor/22x22/apps/texmaker22x22.png share/icons/hicolor/32x32/apps/texmaker32x32.png share/icons/hicolor/48x48/apps/texmaker48x48.png share/icons/hicolor/64x64/apps/texmaker64x64.png share/icons/hicolor/scalable/apps/texmaker.svg +share/metainfo/texmaker.appdata.xml share/pixmaps/texmaker.png share/texmaker/AUTHORS share/texmaker/CHANGELOG.txt share/texmaker/COPYING share/texmaker/README_DIC_fr_FR.txt share/texmaker/README_cs_CZ.txt share/texmaker/README_de_DE_frami.txt share/texmaker/README_en_US.txt share/texmaker/README_es_ES.txt share/texmaker/README_hu_HU.txt share/texmaker/README_pl.txt share/texmaker/README_pt_PT.txt -share/texmaker/atd.css share/texmaker/ca_CA.aff share/texmaker/ca_CA.dic share/texmaker/cs_CZ.aff share/texmaker/cs_CZ.dic -share/texmaker/csshttprequest.js share/texmaker/de_DE.aff share/texmaker/de_DE.dic 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/en_GB.aff share/texmaker/en_GB.dic share/texmaker/en_US.aff share/texmaker/en_US.dic share/texmaker/es_ES.aff share/texmaker/es_ES.dic share/texmaker/fr_FR.aff share/texmaker/fr_FR.dic share/texmaker/hardwordwrap_selection_80col.tms share/texmaker/hu_HU.aff share/texmaker/hu_HU.dic share/texmaker/it_IT.aff share/texmaker/it_IT.dic share/texmaker/it_IT_README.txt -share/texmaker/jquery.atd.textarea.js share/texmaker/latexhelp.html share/texmaker/nl_NL.aff share/texmaker/nl_NL.dic share/texmaker/pl_PL.aff share/texmaker/pl_PL.dic share/texmaker/pt_PT.aff share/texmaker/pt_PT.dic +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_ar.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 share/texmaker/texmaker_gl.qm share/texmaker/texmaker_hu.qm share/texmaker/texmaker_it.qm share/texmaker/texmaker_lv.qm share/texmaker/texmaker_nl.qm share/texmaker/texmaker_pl.qm share/texmaker/texmaker_pt.qm share/texmaker/texmaker_pt_BR.qm share/texmaker/texmaker_ru.qm share/texmaker/texmaker_se.qm share/texmaker/texmaker_sr.qm share/texmaker/texmaker_uk.qm share/texmaker/texmaker_vi_VN.qm share/texmaker/texmaker_zh_CN.qm 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