diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index f671b6b7cbde..3c07e053e00b 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -1,28 +1,37 @@ PORTNAME= texmaker -PORTVERSION= 5.0.3 -PORTREVISION= 5 +PORTVERSION= 6.0.1 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ -MAINTAINER= hrs@FreeBSD.org +MAINTAINER= wen@FreeBSD.org COMMENT= LaTeX Development Environment WWW= https://www.xm1math.net/texmaker/ LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell -USES= compiler:c++11-lang desktop-file-utils ghostscript:x11,run \ - gl pkgconfig qmake qt:5 tar:bzip2 tex -USE_GL= gl -USE_QT= concurrent core gui network printsupport script widgets \ - xml buildtools:build +USES= cmake compiler:c++11-lang desktop-file-utils \ + ghostscript:x11,run gl pkgconfig qt:6 tar:bzip2 tex +USE_GL= opengl +USE_QT= 5compat base declarative positioning webchannel webengine \ + tools:build USE_TEX= latex dvipsk -EXTRACT_AFTER_ARGS= --exclude hunspell -QMAKE_ARGS= ICONDIR=${PREFIX}/share/pixmaps \ - DESKTOPDIR=${DESKTOPDIR} \ - METAINFODIR=${PREFIX}/share/metainfo +EXTRACT_AFTER_ARGS= --exclude 3rdparty/hunspell + +_ISIZE= 16x16 22x22 32x32 44x44 48x48 64x64 128x128 256x256 scalable +_IDIR= ${PREFIX}/share/icons/hicolor + +post-install: + @${MKDIR} ${_ISIZE:S,^,${STAGEDIR}${_IDIR}/,:S,$,/apps,} +.for size in ${_ISIZE:[1..-2]} + ${INSTALL_DATA} ${WRKSRC}/datas/distrib/linux/${PORTNAME}${size}.png \ + ${STAGEDIR}${_IDIR}/${size}/apps/${PORTNAME}.png +.endfor + ${INSTALL_DATA} ${WRKSRC}/datas/distrib/linux/${PORTNAME}.svg \ + ${STAGEDIR}${_IDIR}/scalable/apps/ .include diff --git a/editors/texmaker/distinfo b/editors/texmaker/distinfo index 82b5e47da68a..0b0ad54c5a99 100644 --- a/editors/texmaker/distinfo +++ b/editors/texmaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561128794 -SHA256 (texmaker-5.0.3.tar.bz2) = 6074dffa82c431f8727c39e046f62cb70f5fe1457f158b46306e8f490b4f326f -SIZE (texmaker-5.0.3.tar.bz2) = 15783226 +TIMESTAMP = 1772432474 +SHA256 (texmaker-6.0.1.tar.bz2) = b8c235df0cd8fd7714cd70d3b5ee363163b0254a9dea9180781b8f0e2e46caf6 +SIZE (texmaker-6.0.1.tar.bz2) = 14932651 diff --git a/editors/texmaker/files/patch-CMakeLists.txt b/editors/texmaker/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..08fcc69c033e --- /dev/null +++ b/editors/texmaker/files/patch-CMakeLists.txt @@ -0,0 +1,67 @@ +--- CMakeLists.txt.orig 2025-04-23 11:22:57 UTC ++++ CMakeLists.txt +@@ -68,13 +68,6 @@ set(UTILITIES_FILES + ${CMAKE_SOURCE_DIR}/AUTHORS + ${CMAKE_SOURCE_DIR}/COPYING + ${CMAKE_SOURCE_DIR}/datas/CHANGELOG.txt +- ${CMAKE_SOURCE_DIR}/datas/distrib/linux/texmaker16x16.png +- ${CMAKE_SOURCE_DIR}/datas/distrib/linux/texmaker22x22.png +- ${CMAKE_SOURCE_DIR}/datas/distrib/linux/texmaker32x32.png +- ${CMAKE_SOURCE_DIR}/datas/distrib/linux/texmaker48x48.png +- ${CMAKE_SOURCE_DIR}/datas/distrib/linux/texmaker64x64.png +- ${CMAKE_SOURCE_DIR}/datas/distrib/linux/texmaker128x128.png +- ${CMAKE_SOURCE_DIR}/datas/distrib/linux/texmaker.svg + ${CMAKE_SOURCE_DIR}/datas/scripts/titlecase_selection.tms + ${CMAKE_SOURCE_DIR}/datas/scripts/hardwordwrap_selection_80col.tms + ${CMAKE_SOURCE_DIR}/translations/qt/qt_ar.qm +@@ -386,7 +379,9 @@ set(CMAKE_AUTORCC ON) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_AUTORCC ON) + +-find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools) ++find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat CorePrivate Network PrintSupport Qml Widgets Xml LinguistTools) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(Hunspell REQUIRED IMPORTED_TARGET hunspell) + + qt_standard_project_setup() + +@@ -448,23 +443,6 @@ ${texmaker_SRCS_PLATFORM} + 3rdparty/encodingprober/nsSJISProber.cpp 3rdparty/encodingprober/nsSJISProber.h + 3rdparty/encodingprober/nsUniversalDetector.cpp 3rdparty/encodingprober/nsUniversalDetector.h + 3rdparty/encodingprober/qencodingprober.cpp 3rdparty/encodingprober/qencodingprober.h +-3rdparty/hunspell/affentry.cxx 3rdparty/hunspell/affentry.hxx +-3rdparty/hunspell/affixmgr.cxx 3rdparty/hunspell/affixmgr.hxx +-3rdparty/hunspell/atypes.hxx +-3rdparty/hunspell/baseaffix.hxx +-3rdparty/hunspell/csutil.cxx 3rdparty/hunspell/csutil.hxx +-3rdparty/hunspell/filemgr.cxx 3rdparty/hunspell/filemgr.hxx +-3rdparty/hunspell/hashmgr.cxx 3rdparty/hunspell/hashmgr.hxx +-3rdparty/hunspell/htypes.hxx +-3rdparty/hunspell/hunspell.cxx 3rdparty/hunspell/hunspell.h 3rdparty/hunspell/hunspell.hxx +-3rdparty/hunspell/hunvisapi.h +-3rdparty/hunspell/hunzip.cxx 3rdparty/hunspell/hunzip.hxx +-3rdparty/hunspell/langnum.hxx +-3rdparty/hunspell/phonet.cxx 3rdparty/hunspell/phonet.hxx +-3rdparty/hunspell/replist.cxx 3rdparty/hunspell/replist.hxx +-3rdparty/hunspell/suggestmgr.cxx 3rdparty/hunspell/suggestmgr.hxx +-3rdparty/hunspell/utf_info.hxx +-3rdparty/hunspell/w_char.hxx + 3rdparty/pdfium/core/fdrm/crypto/fx_crypt.cpp 3rdparty/pdfium/core/fdrm/crypto/fx_crypt.h + 3rdparty/pdfium/core/fdrm/crypto/fx_crypt_aes.cpp + 3rdparty/pdfium/core/fdrm/crypto/fx_crypt_sha.cpp +@@ -1166,7 +1144,6 @@ set(TEXMAKER_INCLUDE_DIRECTORIES + ${CMAKE_SOURCE_DIR}/3rdparty + ${CMAKE_SOURCE_DIR}/3rdparty/encodingprober + ${CMAKE_SOURCE_DIR}/3rdparty/singleapp +- ${CMAKE_SOURCE_DIR}/3rdparty/hunspell + ${CMAKE_SOURCE_DIR}/3rdparty/synctex + ${CMAKE_SOURCE_DIR}/3rdparty/pdfium + ${CMAKE_SOURCE_DIR}/3rdparty/pdfium/fpdfsdk +@@ -1454,6 +1431,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE + Qt6::Qml + Qt6::Widgets + Qt6::Xml ++ PkgConfig::Hunspell + ) + + if (${INTERNALBROWSER} STREQUAL "yes") diff --git a/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h b/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h index f8a6959acc26..456b7745d8c2 100644 --- a/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h +++ b/editors/texmaker/files/patch-pdfium_core_fxcrt_include_fx__system.h @@ -1,11 +1,11 @@ ---- pdfium/core/fxcrt/include/fx_system.h.orig 2017-04-16 14:53:52 UTC -+++ pdfium/core/fxcrt/include/fx_system.h +--- 3rdparty/pdfium/core/fxcrt/fx_system.h.orig 2026-02-07 08:59:01 UTC ++++ 3rdparty/pdfium/core/fxcrt/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__) diff --git a/editors/texmaker/files/patch-pdfium_third__party_base_logging.h b/editors/texmaker/files/patch-pdfium_third__party_base_logging.h index 3db6cc89cbcd..7cb29611ccd1 100644 --- a/editors/texmaker/files/patch-pdfium_third__party_base_logging.h +++ b/editors/texmaker/files/patch-pdfium_third__party_base_logging.h @@ -1,11 +1,11 @@ ---- pdfium/third_party/base/logging.h.orig 2017-04-16 14:53:52 UTC -+++ pdfium/third_party/base/logging.h +--- 3rdparty/pdfium/third_party/base/logging.h.orig 2026-02-07 08:59:58 UTC ++++ 3rdparty/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 diff --git a/editors/texmaker/files/patch-texmaker.pro b/editors/texmaker/files/patch-texmaker.pro deleted file mode 100644 index cb709c8c38e5..000000000000 --- a/editors/texmaker/files/patch-texmaker.pro +++ /dev/null @@ -1,93 +0,0 @@ ---- texmaker.pro.orig 2018-10-31 06:58:22 UTC -+++ texmaker.pro -@@ -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 \ - 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 \ -@@ -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 \ -@@ -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_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 diff --git a/editors/texmaker/pkg-plist b/editors/texmaker/pkg-plist index 08502d81e651..9e7fb7c7807c 100644 --- a/editors/texmaker/pkg-plist +++ b/editors/texmaker/pkg-plist @@ -1,121 +1,123 @@ 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/128x128/apps/texmaker.png +share/icons/hicolor/16x16/apps/texmaker.png +share/icons/hicolor/22x22/apps/texmaker.png +share/icons/hicolor/256x256/apps/texmaker.png +share/icons/hicolor/32x32/apps/texmaker.png +share/icons/hicolor/44x44/apps/texmaker.png +share/icons/hicolor/48x48/apps/texmaker.png +share/icons/hicolor/64x64/apps/texmaker.png share/icons/hicolor/scalable/apps/texmaker.svg -share/metainfo/texmaker.appdata.xml +share/metainfo/texmaker.metainfo.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/ca_CA.aff share/texmaker/ca_CA.dic share/texmaker/cs_CZ.aff share/texmaker/cs_CZ.dic share/texmaker/de_DE.aff share/texmaker/de_DE.dic share/texmaker/doc1.png share/texmaker/doc10.png share/texmaker/doc11.png share/texmaker/doc12.png share/texmaker/doc13.png share/texmaker/doc14.png share/texmaker/doc15.png share/texmaker/doc16.png share/texmaker/doc17.png share/texmaker/doc2.png share/texmaker/doc20.png share/texmaker/doc21.png share/texmaker/doc22.png share/texmaker/doc3.png share/texmaker/doc4.png share/texmaker/doc5.png share/texmaker/doc6.png share/texmaker/doc6bis.png share/texmaker/doc7.png share/texmaker/doc8.png share/texmaker/doc9.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/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_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