From: Rafael Sadowski Subject: Re: editors/texmaker： Update to 5.1.4 To: wen heping Cc: "ports@openbsd.org" Date: Wed, 14 Feb 2024 15:16:57 +0100 On Wed Feb 14, 2024 at 11:59:12AM +0000, wen heping wrote: > Hi, ports@: > > Here is a patch for editors/texmaker to update to 5.1.4. > The port build well with the patch and run well. > > > Cheers ! > wen > Index: editors/texmaker/Makefile > =================================================================== > RCS file: /cvs/ports/editors/texmaker/Makefile,v > retrieving revision 1.46 > diff -u -p -r1.46 Makefile > --- editors/texmaker/Makefile 21 Sep 2023 12:22:34 -0000 1.46 > +++ editors/texmaker/Makefile 14 Feb 2024 11:24:53 -0000 > @@ -1,7 +1,6 @@ > COMMENT= LaTeX development environment > -DISTNAME= texmaker-5.0.2 > +DISTNAME= texmaker-5.1.4 > CATEGORIES= editors > -REVISION= 2 > > HOMEPAGE= http://www.xm1math.net/texmaker/ This is available via HTTPS. > > Index: editors/texmaker/distinfo > =================================================================== > RCS file: /cvs/ports/editors/texmaker/distinfo,v > retrieving revision 1.20 > diff -u -p -r1.20 distinfo > --- editors/texmaker/distinfo 15 Jul 2018 23:09:43 -0000 1.20 > +++ editors/texmaker/distinfo 14 Feb 2024 11:24:53 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (texmaker-5.0.2.tar.bz2) = qU6Nd6Fv3dB4nEUrCRO7CYsfiVOXs61TvimthKqsAXk= > -SIZE (texmaker-5.0.2.tar.bz2) = 15695684 > +SHA256 (texmaker-5.1.4.tar.bz2) = MgUE1itxtZHAa30LEgKsdQoxEv4soyjjBYAFXrMI/qY= > +SIZE (texmaker-5.1.4.tar.bz2) = 15277027 > Index: editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h > =================================================================== > RCS file: editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h > diff -N editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h 14 Feb 2024 11:24:53 -0000 > @@ -0,0 +1,12 @@ > +Index: pdfium/core/fxcrt/fx_system.h > +--- pdfium/core/fxcrt/fx_system.h.orig > ++++ 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(__OpenBSD__) > + #define _FX_OS_ _FX_LINUX_DESKTOP_ > + #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_ > + #elif defined(__APPLE__) > Index: editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h > =================================================================== > RCS file: editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h > diff -N editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h > --- editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h 11 Mar 2022 18:58:35 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -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__) > Index: editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp > =================================================================== > RCS file: editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp > diff -N editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp > --- editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp 11 Mar 2022 18:58:35 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -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_ > Index: editors/texmaker/patches/patch-texmaker_pro > =================================================================== > RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_pro,v > retrieving revision 1.18 > diff -u -p -r1.18 patch-texmaker_pro > --- editors/texmaker/patches/patch-texmaker_pro 11 Mar 2022 18:58:35 -0000 1.18 > +++ editors/texmaker/patches/patch-texmaker_pro 14 Feb 2024 11:24:53 -0000 > @@ -1,7 +1,7 @@ > Index: texmaker.pro > --- texmaker.pro.orig > +++ texmaker.pro > -@@ -24,6 +24,8 @@ message("Qt>=5.7 is required.") > +@@ -30,6 +30,8 @@ QT += webenginewidgets > > CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release > CONFIG -= precompile_header > @@ -10,52 +10,49 @@ Index: texmaker.pro > > gcc { > QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter > -@@ -117,25 +119,6 @@ HEADERS += texmaker.h \ > - unicodeview.h \ > - svnhelper.h \ > +@@ -127,24 +129,6 @@ HEADERS += texmaker.h \ > + x11fontdialog.h \ > quickbeamerdialog.h \ > + cmdparser.h \ > - hunspell/affentry.hxx \ > - hunspell/affixmgr.hxx \ > - hunspell/atypes.hxx \ > - hunspell/baseaffix.hxx \ > - hunspell/csutil.hxx \ > -- hunspell/dictmgr.hxx \ > +- hunspell/filemgr.hxx \ > - hunspell/hashmgr.hxx \ > - hunspell/htypes.hxx \ > -- hunspell/hunspell.hxx \ > +- hunspell/hunvisapi.h \ > - hunspell/hunspell.h \ > +- hunspell/hunspell.hxx \ > +- hunspell/hunzip.hxx \ > - 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/suggestmgr.hxx \ > +- hunspell/utf_info.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 \ > +@@ -567,16 +551,6 @@ SOURCES += main.cpp \ > svnhelper.cpp \ > + x11fontdialog.cpp \ > + cmdparser.cpp \ > - hunspell/affentry.cxx \ > - hunspell/affixmgr.cxx \ > - hunspell/csutil.cxx \ > -- hunspell/dictmgr.cxx \ > +- hunspell/filemgr.cxx \ > - hunspell/hashmgr.cxx \ > - hunspell/hunspell.cxx \ > +- hunspell/hunzip.cxx \ > - hunspell/phonet.cxx \ > -- hunspell/suggestmgr.cxx \ > -- hunspell/utf_info.cxx \ > -- hunspell/filemgr.cxx \ > - hunspell/replist.cxx \ > -- hunspell/hunzip.cxx \ > +- hunspell/suggestmgr.cxx \ > singleapp/qtlocalpeer.cpp \ > singleapp/qtlockedfile.cpp \ > singleapp/qtsingleapplication.cpp \ > -@@ -1160,40 +1131,7 @@ utilities.files = doc/doc10.png \ > +@@ -1253,40 +1227,7 @@ utilities.files = doc/doc10.png \ > locale/texmaker_ar.qm \ > locale/texmaker_lv.qm \ > locale/texmaker_uk.qm \