On Wed Jul 16, 2025 at 07:33:33PM +0100, Edd Barrett wrote:
> Hi Rafael,
>
> On Tue, Jul 15, 2025 at 08:05:55AM +0200, Rafael Sadowski wrote:
> > A not quite so trivial update texmaker-6.0.1.
>
> Thanks for doing this.
>
> > + #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",
>
> You can use ${X11BASE} in place of /usr/X11R6 in this patch.
>
> > +- set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "..." FORCE)
> > ++ set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "..." FORCE)
> > + endif()
> > + target_compile_definitions(${PROJECT_NAME} PRIVATE
> > +- PREFIX=\"${PREFIX}\"
> > ++ PREFIX=\"/usr/local\"
>
> Similary, were these changes intentional?
>
> > + QString defaultDic=dicDir+QString(QLocale::system().name())+".dic";
> > + QFileInfo fi(defaultDic);
> > +-if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"en_GB.dic";
> > ++if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"default.dic";
> > + spell_dic=config->value("Spell/Dic",defaultDic).toString();
>
> This defaults to /usr/local/share/texmaker/default.dic, which didn't exist on
> my system, thus spell checking didn't work by default.
>
> en_GB.dic does exist and work, if you select it.
>
All your points are correct, I just did it the way it was in the old patches.
New diff below:
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 0fa500713a9..f9f257c68b5 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,9 +1,8 @@
COMMENT= LaTeX development environment
-DISTNAME= texmaker-5.0.2
+DISTNAME= texmaker-6.0.1
CATEGORIES= editors
-REVISION= 2
-HOMEPAGE= http://www.xm1math.net/texmaker/
+HOMEPAGE= https://www.xm1math.net/texmaker/
# GPLv2
PERMIT_PACKAGE= Yes
@@ -11,23 +10,37 @@ PERMIT_PACKAGE= Yes
SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tar.bz2
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Script Qt5Widgets Qt5Xml c hunspell-1.7 m
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Core5Compat
+WANTLIB += Qt6Gui Qt6Network Qt6OpenGL Qt6Positioning Qt6PrintSupport
+WANTLIB += Qt6Qml Qt6QmlMeta Qt6QmlModels Qt6QmlWorkerScript Qt6Quick
+WANTLIB += Qt6WebChannel Qt6WebEngineCore Qt6WebEngineWidgets
+WANTLIB += Qt6Widgets Qt6Xml c hunspell-1.7 m
-# c++-11 for required for poppler
-COMPILER= base-clang ports-gcc
+MODULES= devel/cmake \
+ x11/qt6
-MODULES= devel/qmake x11/qt5
-MODQMAKE_ARGS= DESKTOPDIR=${LOCALBASE}/share/applications \
- ICONDIR=${LOCALBASE}/share/pixmaps
+RUN_DEPENDS= print/texlive/base
-RUN_DEPENDS= print/texlive/base \
- devel/desktop-file-utils
-
-LIB_DEPENDS= textproc/hunspell \
- x11/qt5/qtscript,-main
+LIB_DEPENDS = textproc/hunspell \
+ x11/qt6/qt5compat \
+ x11/qt6/qtdeclarative \
+ x11/qt6/qtpositioning \
+ x11/qt6/qtwebchannel \
+ x11/qt6/qtwebengine
NO_TEST= Yes
+CONFIGURE_ARGS = -DUSE_SYSTEM_HUNSPELL=ON \
+ -DINSTALL_DIR=${LOCALBASE}
+
+MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt \
+ ${WRKSRC}/3rdparty/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp
+
+post-configure:
+ find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \
+ 's|#include "hunspell/hunspell.hxx"|#include <hunspell.hxx>|' {} +
+
.include <bsd.port.mk>
diff --git a/editors/texmaker/distinfo b/editors/texmaker/distinfo
index 3b54f069083..51b8361adb1 100644
--- a/editors/texmaker/distinfo
+++ b/editors/texmaker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (texmaker-5.0.2.tar.bz2) = qU6Nd6Fv3dB4nEUrCRO7CYsfiVOXs61TvimthKqsAXk=
-SIZE (texmaker-5.0.2.tar.bz2) = 15695684
+SHA256 (texmaker-6.0.1.tar.bz2) = uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=
+SIZE (texmaker-6.0.1.tar.bz2) = 14932651
diff --git
a/editors/texmaker/patches/patch-3rdparty_pdfium_core_fxcrt_fx_system_h
b/editors/texmaker/patches/patch-3rdparty_pdfium_core_fxcrt_fx_system_h
new file mode 100644
index 00000000000..7963dd8a5c2
--- /dev/null
+++ b/editors/texmaker/patches/patch-3rdparty_pdfium_core_fxcrt_fx_system_h
@@ -0,0 +1,13 @@
+Index: 3rdparty/pdfium/core/fxcrt/fx_system.h
+--- 3rdparty/pdfium/core/fxcrt/fx_system.h.orig
++++ 3rdparty/pdfium/core/fxcrt/fx_system.h
+@@ -43,6 +43,9 @@
+ #elif defined(__linux__)
+ #define _FX_OS_ _FX_LINUX_DESKTOP_
+ #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
++#elif defined(__OpenBSD__)
++#define _FX_OS_ _FX_LINUX_DESKTOP_
++#define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
+ #elif defined(__APPLE__)
+ #define _FX_OS_ _FX_MACOSX_
+ #define _FXM_PLATFORM_ _FXM_PLATFORM_APPLE_
diff --git
a/editors/texmaker/patches/patch-3rdparty_pdfium_third_party_base_logging_h
b/editors/texmaker/patches/patch-3rdparty_pdfium_third_party_base_logging_h
new file mode 100644
index 00000000000..ed61f1cc8be
--- /dev/null
+++ b/editors/texmaker/patches/patch-3rdparty_pdfium_third_party_base_logging_h
@@ -0,0 +1,12 @@
+Index: 3rdparty/pdfium/third_party/base/logging.h
+--- 3rdparty/pdfium/third_party/base/logging.h.orig
++++ 3rdparty/pdfium/third_party/base/logging.h
+@@ -10,7 +10,7 @@
+
+ #ifndef _WIN32
+ #define NULL_DEREF_IF_POSSIBLE \
+- *(reinterpret_cast<volatile char*>(NULL) + 42) = 0x42;
++ *(reinterpret_cast<volatile char*>(__null) + 42) = 0x42;
+ #else
+ #define NULL_DEREF_IF_POSSIBLE
+ #endif
diff --git
a/editors/texmaker/patches/patch-3rdparty_pdfium_third_party_libopenjpeg20_opj_malloc_h
b/editors/texmaker/patches/patch-3rdparty_pdfium_third_party_libopenjpeg20_opj_malloc_h
new file mode 100644
index 00000000000..68c9db7f382
--- /dev/null
+++
b/editors/texmaker/patches/patch-3rdparty_pdfium_third_party_libopenjpeg20_opj_malloc_h
@@ -0,0 +1,12 @@
+Index: 3rdparty/pdfium/third_party/libopenjpeg20/opj_malloc.h
+--- 3rdparty/pdfium/third_party/libopenjpeg20/opj_malloc.h.orig
++++ 3rdparty/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)
diff --git
a/editors/texmaker/patches/patch-3rdparty_pdfium_xfa_fgas_font_cfgas_fontmgr_cpp
b/editors/texmaker/patches/patch-3rdparty_pdfium_xfa_fgas_font_cfgas_fontmgr_cpp
new file mode 100644
index 00000000000..835b373ef34
--- /dev/null
+++
b/editors/texmaker/patches/patch-3rdparty_pdfium_xfa_fgas_font_cfgas_fontmgr_cpp
@@ -0,0 +1,12 @@
+Index: 3rdparty/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp
+--- 3rdparty/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp.orig
++++ 3rdparty/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp
+@@ -425,6 +425,8 @@ 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",
++ "${X11BASE}/lib/X11/fonts/Type1",
++ "${X11BASE}/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_
diff --git a/editors/texmaker/patches/patch-CMakeLists_txt
b/editors/texmaker/patches/patch-CMakeLists_txt
new file mode 100644
index 00000000000..6d99adcfeb3
--- /dev/null
+++ b/editors/texmaker/patches/patch-CMakeLists_txt
@@ -0,0 +1,120 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -38,6 +38,8 @@ elseif (WIN32)
+ elseif (APPLE)
+ set(INSTALL_DIR ${CMAKE_SOURCE_DIR}/deploy/macos)
+ endif()
++# Allow INSTALL_DIR to be overridden via command line
++set(INSTALL_DIR ${DEFAULT_INSTALL_DIR} CACHE PATH "Installation directory for
Texmaker")
+ ################## RESOURCES ########################
+ if (UNIX AND NOT APPLE)
+ set(UTILITIES_FILES
+@@ -388,6 +390,20 @@ set(CMAKE_AUTORCC ON)
+
+ find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat Network
PrintSupport Qml Widgets Xml LinguistTools)
+
++option(USE_SYSTEM_HUNSPELL "Use system-installed Hunspell instead of bundled
version" OFF)
++
++if(USE_SYSTEM_HUNSPELL)
++ # Find system Hunspell
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(HUNSPELL REQUIRED hunspell)
++
++ if(HUNSPELL_FOUND)
++ message(STATUS "Using system Hunspell: ${HUNSPELL_VERSION}")
++ else()
++ message(FATAL_ERROR "System Hunspell not found")
++ endif()
++endif()
++
+ qt_standard_project_setup()
+
+ if (UNIX AND NOT APPLE)
+@@ -414,9 +430,34 @@ elseif (APPLE)
+ 3rdparty/pdfium/core/fxge/apple/fx_quartz_device.cpp
+ )
+ endif()
++# Hunspell sources (only if not using system version)
++if(NOT USE_SYSTEM_HUNSPELL)
++ set(HUNSPELL_SOURCES
++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
++ )
++else()
++ set(HUNSPELL_SOURCES "")
++endif()
+
+ set(texmaker_SRCS
+ ${texmaker_SRCS_PLATFORM}
++${HUNSPELL_SOURCES}
+ 3rdparty/encodingprober/CharDistribution.cpp
3rdparty/encodingprober/CharDistribution.h
+ 3rdparty/encodingprober/ChineseGroupProber.cpp
3rdparty/encodingprober/ChineseGroupProber.h
+ 3rdparty/encodingprober/JapaneseGroupProber.cpp
3rdparty/encodingprober/JapaneseGroupProber.h
+@@ -448,23 +489,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
+@@ -1288,6 +1312,14 @@ set(TEXMAKER_INCLUDE_DIRECTORIES
+ )
+
+
++if(USE_SYSTEM_HUNSPELL)
++ target_include_directories(${PROJECT_NAME} PRIVATE
${HUNSPELL_INCLUDE_DIRS})
++ target_link_libraries(${PROJECT_NAME} PRIVATE ${HUNSPELL_LIBRARIES})
++ target_compile_options(${PROJECT_NAME} PRIVATE ${HUNSPELL_CFLAGS_OTHER})
++else()
++ target_include_directories(${PROJECT_NAME} PRIVATE
${CMAKE_SOURCE_DIR}/3rdparty/hunspell)
++endif()
++
+ target_include_directories( ${PROJECT_NAME} PUBLIC
${TEXMAKER_INCLUDE_DIRECTORIES})
+
+ target_compile_definitions(${PROJECT_NAME} PRIVATE
+@@ -1342,10 +1374,10 @@ if (${COMPILEUSB} STREQUAL "yes")
+ endif()
+ set(PREFIX ${INSTALL_DIR})
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+- set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "..." FORCE)
++ set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "..." FORCE)
+ endif()
+ target_compile_definitions(${PROJECT_NAME} PRIVATE
+- PREFIX=\"${PREFIX}\"
++ PREFIX=\"${LOCALBASE}\"
+ )
+ if (${AUTHORIZELINUXQSTYLES} STREQUAL "yes")
+ target_compile_definitions(${PROJECT_NAME} PRIVATE
diff --git a/editors/texmaker/patches/patch-configdialog_cpp
b/editors/texmaker/patches/patch-configdialog_cpp
deleted file mode 100644
index f9dc3384df8..00000000000
--- a/editors/texmaker/patches/patch-configdialog_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- configdialog.cpp.orig Mon Oct 26 20:20:14 2015
-+++ configdialog.cpp Sat Nov 7 20:01:27 2015
-@@ -224,7 +224,7 @@ QDir spelldir(QCoreApplication::applicationDirPath());
- #ifdef DEBIAN_SPELLDIR
- QDir spelldir(PREFIX"/share/myspell/dicts");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir(PREFIX"/share/hunspell");
- #endif
- #endif
-
diff --git a/editors/texmaker/patches/patch-latexeditor_h
b/editors/texmaker/patches/patch-latexeditor_h
deleted file mode 100644
index 6914c6d2514..00000000000
--- a/editors/texmaker/patches/patch-latexeditor_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- latexeditor.h.orig Wed Apr 23 22:49:21 2014
-+++ latexeditor.h Thu May 8 23:55:12 2014
-@@ -35,7 +35,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
diff --git a/editors/texmaker/patches/patch-latexeditorview_h
b/editors/texmaker/patches/patch-latexeditorview_h
deleted file mode 100644
index d6a6ff6ffb6..00000000000
--- a/editors/texmaker/patches/patch-latexeditorview_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- latexeditorview.h.orig Fri Nov 23 22:52:25 2012
-+++ latexeditorview.h Sat Mar 9 21:20:19 2013
-@@ -23,7 +23,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
diff --git a/editors/texmaker/patches/patch-latexhighlighter_h
b/editors/texmaker/patches/patch-latexhighlighter_h
deleted file mode 100644
index 60a5d456576..00000000000
--- a/editors/texmaker/patches/patch-latexhighlighter_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- latexhighlighter.h.orig Sat Mar 5 13:19:04 2011
-+++ latexhighlighter.h Wed Mar 16 22:14:39 2011
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
diff --git
a/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h
b/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h
deleted file mode 100644
index 46b131781cf..00000000000
--- a/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h
+++ /dev/null
@@ -1,12 +0,0 @@
-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__)
diff --git a/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx_ge_linux_cpp
b/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx_ge_linux_cpp
deleted file mode 100644
index 9df7aa53f09..00000000000
--- a/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx_ge_linux_cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-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);
diff --git
a/editors/texmaker/patches/patch-pdfium_fpdfsdk_javascript_JS_Value_cpp
b/editors/texmaker/patches/patch-pdfium_fpdfsdk_javascript_JS_Value_cpp
deleted file mode 100644
index 10f7012de21..00000000000
--- a/editors/texmaker/patches/patch-pdfium_fpdfsdk_javascript_JS_Value_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-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) {
diff --git a/editors/texmaker/patches/patch-pdfium_third_party_base_logging_h
b/editors/texmaker/patches/patch-pdfium_third_party_base_logging_h
deleted file mode 100644
index 698584b76c4..00000000000
--- a/editors/texmaker/patches/patch-pdfium_third_party_base_logging_h
+++ /dev/null
@@ -1,12 +0,0 @@
-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
diff --git
a/editors/texmaker/patches/patch-pdfium_third_party_libopenjpeg20_opj_malloc_h
b/editors/texmaker/patches/patch-pdfium_third_party_libopenjpeg20_opj_malloc_h
deleted file mode 100644
index 1784c6bc1bb..00000000000
---
a/editors/texmaker/patches/patch-pdfium_third_party_libopenjpeg20_opj_malloc_h
+++ /dev/null
@@ -1,12 +0,0 @@
-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)
diff --git
a/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp
b/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp
deleted file mode 100644
index d9ef69fe141..00000000000
--- a/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-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_
diff --git a/editors/texmaker/patches/patch-spellerdialog_h
b/editors/texmaker/patches/patch-spellerdialog_h
deleted file mode 100644
index 5759c23088d..00000000000
--- a/editors/texmaker/patches/patch-spellerdialog_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- spellerdialog.h.orig Sat Jan 30 11:45:07 2010
-+++ spellerdialog.h Sat Jan 30 11:17:14 2010
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
diff --git a/editors/texmaker/patches/patch-src_texmaker_cpp
b/editors/texmaker/patches/patch-src_texmaker_cpp
new file mode 100644
index 00000000000..aff04237e4d
--- /dev/null
+++ b/editors/texmaker/patches/patch-src_texmaker_cpp
@@ -0,0 +1,12 @@
+Index: src/texmaker.cpp
+--- src/texmaker.cpp.orig
++++ src/texmaker.cpp
+@@ -990,7 +990,7 @@ translationList.append(QString("en"));
+ #ifdef USB_VERSION
+ QDir transdir(QCoreApplication::applicationDirPath());
+ #else
+-QDir transdir(PREFIX"/share/texmaker");
++QDir transdir(PREFIX"/share/hunspell/");
+ #endif
+
+ #endif
diff --git a/editors/texmaker/patches/patch-texmaker_cpp
b/editors/texmaker/patches/patch-texmaker_cpp
deleted file mode 100644
index be2998ac410..00000000000
--- a/editors/texmaker/patches/patch-texmaker_cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-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
--QString dicDir=PREFIX"/share/texmaker/";
-+QString dicDir=PREFIX"/share/hunspell/";
- #endif
- #endif
-
-@@ -4683,7 +4683,7 @@ QString dicDir=QCoreApplication::applicationDirPath()
- #endif
- QString defaultDic=dicDir+QString(QLocale::system().name())+".dic";
- QFileInfo fi(defaultDic);
--if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"en_GB.dic";
-+if (!fi.exists() || !fi.isReadable()) defaultDic=dicDir+"default.dic";
- spell_dic=config->value("Spell/Dic",defaultDic).toString();
- QFileInfo fispell(spell_dic);
- pdfCheckerLang=fispell.fileName().left(2);
diff --git a/editors/texmaker/patches/patch-texmaker_h
b/editors/texmaker/patches/patch-texmaker_h
deleted file mode 100644
index 5c0fa7ba25a..00000000000
--- a/editors/texmaker/patches/patch-texmaker_h
+++ /dev/null
@@ -1,12 +0,0 @@
-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 "pdfviewerwidget.h"
- #include "pdfviewer.h"
- #include "sourceview.h"
diff --git a/editors/texmaker/patches/patch-texmaker_pro
b/editors/texmaker/patches/patch-texmaker_pro
deleted file mode 100644
index 5223b361362..00000000000
--- a/editors/texmaker/patches/patch-texmaker_pro
+++ /dev/null
@@ -1,99 +0,0 @@
-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 \
- 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 \
-@@ -1160,40 +1131,7 @@ utilities.files = doc/doc10.png \
- locale/texmaker_ar.qm \
- locale/texmaker_lv.qm \
- locale/texmaker_uk.qm \
-- locale/texmaker_vi_VN.qm \
-- dictionaries/nl_NL.aff \
-- dictionaries/nl_NL.dic \
-- dictionaries/de_DE.aff \
-- dictionaries/de_DE.dic \
-- dictionaries/en_GB.aff \
-- dictionaries/en_GB.dic \
-- dictionaries/en_US.aff \
-- dictionaries/en_US.dic \
-- dictionaries/es_ES.aff \
-- dictionaries/es_ES.dic \
-- dictionaries/fr_FR.aff \
-- dictionaries/fr_FR.dic \
-- 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/cs_CZ.aff \
-- dictionaries/cs_CZ.dic \
-- dictionaries/pl_PL.aff \
-- dictionaries/pl_PL.dic \
-- dictionaries/pt_PT.aff \
-- dictionaries/pt_PT.dic \
-- dictionaries/ca_CA.aff \
-- dictionaries/ca_CA.dic \
-- dictionaries/README_pt_PT.txt \
-- dictionaries/README_pl.txt \
-- dictionaries/README_cs_CZ.txt \
-- dictionaries/README_de_DE_frami.txt \
-- dictionaries/README_DIC_fr_FR.txt \
-- dictionaries/README_es_ES.txt \
-- dictionaries/README_en_US.txt
-+ locale/texmaker_vi_VN.qm
- INSTALLS += utilities
-
- desktop.files = utilities/texmaker.desktop
diff --git a/editors/texmaker/pkg/PLIST b/editors/texmaker/pkg/PLIST
index b080c0881bf..665a9b75d49 100644
--- a/editors/texmaker/pkg/PLIST
+++ b/editors/texmaker/pkg/PLIST
@@ -1,11 +1,27 @@
@bin bin/texmaker
share/applications/texmaker.desktop
+share/metainfo/
+share/metainfo/texmaker.metainfo.xml
share/pixmaps/
share/pixmaps/texmaker.png
share/texmaker/
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
@@ -27,8 +43,27 @@ 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
