git: a79ea4d76eb9 - main - editors/texmaker: Update to 6.0.1 [1]
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 03 Mar 2026 13:10:14 UTC
The branch main has been updated by wen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a79ea4d76eb910643fc540029723ad6c6e3b2b9b
commit a79ea4d76eb910643fc540029723ad6c6e3b2b9b
Author: Wen Heping <wen@FreeBSD.org>
AuthorDate: 2026-03-03 12:59:25 +0000
Commit: Wen Heping <wen@FreeBSD.org>
CommitDate: 2026-03-03 13:10:02 +0000
editors/texmaker: Update to 6.0.1 [1]
Switch to qt6 [2]
Take maintainership [3]
Add LICENSE_FILE [4]
Rename icon files [5]
PR: 290912
Reported by: wen@ ([1], [2], [3])
mew14930xvi@inbox.lv ([4], [5])
Approved by: maintainer(timeout, > 3 months)
---
editors/texmaker/Makefile | 33 +++++---
editors/texmaker/distinfo | 6 +-
editors/texmaker/files/patch-CMakeLists.txt | 67 ++++++++++++++++
.../patch-pdfium_core_fxcrt_include_fx__system.h | 4 +-
.../files/patch-pdfium_third__party_base_logging.h | 4 +-
editors/texmaker/files/patch-texmaker.pro | 93 ----------------------
editors/texmaker/pkg-plist | 16 ++--
7 files changed, 104 insertions(+), 119 deletions(-)
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 <bsd.port.mk>
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,5 +1,5 @@
---- 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_
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,5 +1,5 @@
---- 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
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,13 +1,15 @@
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