Received: by mail.netbsd.org (Postfix, from userid 605) id 8C8FB84CE9; Thu, 5 Sep 2019 08:07:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1051084D2D for ; Thu, 5 Sep 2019 08:07:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id iVzBoj86VFrJ for ; Thu, 5 Sep 2019 08:07:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1605D84CDA for ; Thu, 5 Sep 2019 08:07:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 138BBFBF4; Thu, 5 Sep 2019 08:07:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1567670846248520" MIME-Version: 1.0 Date: Thu, 5 Sep 2019 08:07:26 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/editors/texmaker To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20190905080726.138BBFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1567670846248520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: nros Date: Thu Sep 5 08:07:25 UTC 2019 Modified Files: pkgsrc/editors/texmaker: Makefile PLIST distinfo options.mk Added Files: pkgsrc/editors/texmaker/files: fgas_stdfontmgr_pkgsrcfonts.inc fxge_pkgsrcfonts.inc pkgsrc/editors/texmaker/patches: patch-latexeditor.h patch-latexeditorview.h patch-latexhighlighter.h patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp patch-pdfium_core_fxcrt_include_fx__system.h patch-pdfium_core_fxge_apple_fx__mac__imp.cpp patch-pdfium_core_fxge_ge_fx__ge__linux.cpp patch-pdfium_third__party_libopenjpeg20_opj__malloc.h patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp patch-spellerdialog.h patch-texmaker.h patch-texmaker.pro patch-versiondialog.cpp Log Message: Update texmaker to version 5.0.3 . Removed poppler-qt5 dependecy since it uses pdfium instead. version 5.0.2 -> 5.0.3 : - the bug about the bad highlighting on misspelled text before a \cite{} or \label{} command has been fixed - if no text is selected the "(un)comment" command will (un)comment the current line - the default size of the configuration dialog has been reduced (users request) - Fold/Unfold/Fold All/Unfold All menu options has been added (thanks to Robin Watts) - a bug about completion when citing references that contain numbers has been fixed - a trouble in the "recent files" menu with names including an ampersand has been fixed - a typo in the documentation has been fixed - a typo in the de translation has been fixed (thanks to Stéphane YVON) version 5.0.1 -> 5.0.2 : - a memory leak has been fixed in the internal pdf viewer - the trouble about the "open terminal" command on windows has been fixed version 5.0 -> 5.0.1 : - a trouble with the MikTex's ps2pdf command has been fixed - the "-dpiscale x" option has been added to the Texmaker command line : with this option the environment variable QT_SCALE_FACTOR will be set to x before building the GUI (same behavior than adding "export QT_SCALE_FACTOR=x" to the environment variables). Can be used to adjust the interface if the monitor dpi is not well detected. - the cs translation has been updated version 4.5 -> 5.0 : - new and more modern interface look - highdpi is now supported on windows and linux - a spellcheck annoying trouble on kde5 has been fixed - new pdf engine - synctex updated to 1.18 - Qt4 support has been removed : Qt5 (>=5.7) is now required - de, es, hu, pl, and zh_CN translations have been updated note : Texmaker depends now only from the Qt toolkit to be compiled To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 pkgsrc/editors/texmaker/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/texmaker/PLIST cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/texmaker/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/texmaker/options.mk cvs rdiff -u -r0 -r1.1 \ pkgsrc/editors/texmaker/files/fgas_stdfontmgr_pkgsrcfonts.inc \ pkgsrc/editors/texmaker/files/fxge_pkgsrcfonts.inc cvs rdiff -u -r0 -r1.1 pkgsrc/editors/texmaker/patches/patch-latexeditor.h \ pkgsrc/editors/texmaker/patches/patch-latexeditorview.h \ pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h \ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp \ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx__system.h \ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp \ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp \ pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h \ pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp \ pkgsrc/editors/texmaker/patches/patch-spellerdialog.h \ pkgsrc/editors/texmaker/patches/patch-texmaker.h \ pkgsrc/editors/texmaker/patches/patch-texmaker.pro \ pkgsrc/editors/texmaker/patches/patch-versiondialog.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1567670846248520 Content-Disposition: inline Content-Length: 28033 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/texmaker/Makefile diff -u pkgsrc/editors/texmaker/Makefile:1.104 pkgsrc/editors/texmaker/Makefile:1.105 --- pkgsrc/editors/texmaker/Makefile:1.104 Tue Jul 23 17:19:57 2019 +++ pkgsrc/editors/texmaker/Makefile Thu Sep 5 08:07:25 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.104 2019/07/23 17:19:57 wiz Exp $ +# $NetBSD: Makefile,v 1.105 2019/09/05 08:07:25 nros Exp $ -DISTNAME= texmaker-4.5 -PKGREVISION= 47 +DISTNAME= texmaker-5.0.3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ EXTRACT_SUFX= .tar.bz2 @@ -20,10 +19,21 @@ INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DEST do-configure: cd ${WRKSRC} && env ${CONFIGURE_ENV} \ - ${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro DESKTOPDIR=${PREFIX}/share/applications ICONDIR=${PREFIX}/share/pixmaps + ${QTDIR}/bin/qmake PREFIX=${PREFIX} texmaker.pro \ + DESKTOPDIR=${PREFIX}/share/applications \ + ICONDIR=${PREFIX}/share/pixmaps \ + METAINFODIR=${PREFIX}/share/appdata + +pre-configure: + ${CP} ${FILESDIR}/fxge_pkgsrcfonts.inc ${WRKSRC}/pdfium/core/fxge + ${CP} ${FILESDIR}/fgas_stdfontmgr_pkgsrcfonts.inc \ + ${WRKSRC}/pdfium/xfa/fgas/font .include "options.mk" -.include "../../print/poppler-includes/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../textproc/hunspell/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/texmaker/PLIST diff -u pkgsrc/editors/texmaker/PLIST:1.10 pkgsrc/editors/texmaker/PLIST:1.11 --- pkgsrc/editors/texmaker/PLIST:1.10 Tue Dec 2 12:16:29 2014 +++ pkgsrc/editors/texmaker/PLIST Thu Sep 5 08:07:25 2019 @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.10 2014/12/02 12:16:29 mef Exp $ +@comment $NetBSD: PLIST,v 1.11 2019/09/05 08:07:25 nros Exp $ bin/texmaker +share/appdata/texmaker.appdata.xml share/applications/texmaker.desktop share/pixmaps/texmaker.png share/texmaker/AUTHORS @@ -13,58 +14,33 @@ 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 @@ -79,7 +55,6 @@ 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 @@ -87,15 +62,30 @@ 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.svg @@ -130,5 +120,3 @@ 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 Index: pkgsrc/editors/texmaker/distinfo diff -u pkgsrc/editors/texmaker/distinfo:1.13 pkgsrc/editors/texmaker/distinfo:1.14 --- pkgsrc/editors/texmaker/distinfo:1.13 Tue Nov 17 20:07:39 2015 +++ pkgsrc/editors/texmaker/distinfo Thu Sep 5 08:07:25 2019 @@ -1,6 +1,19 @@ -$NetBSD: distinfo,v 1.13 2015/11/17 20:07:39 nros Exp $ +$NetBSD: distinfo,v 1.14 2019/09/05 08:07:25 nros Exp $ -SHA1 (texmaker-4.5.tar.bz2) = ffa4c08a9fe2dde61eb18c6105f231e3c0ebd2ea -RMD160 (texmaker-4.5.tar.bz2) = e1ebbe1212d6eb7b1346eadfbfad05bda53c32ce -SHA512 (texmaker-4.5.tar.bz2) = 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 -Size (texmaker-4.5.tar.bz2) = 11287724 bytes +SHA1 (texmaker-5.0.3.tar.bz2) = 61900975f1d4cf420a6d2c309f9de875789f6089 +RMD160 (texmaker-5.0.3.tar.bz2) = 2e5c1eaccec0f461aa66e80a6bd8cce0b9a8ccc4 +SHA512 (texmaker-5.0.3.tar.bz2) = fed09b1ac628f4a8cab24257f2ca35093f20a82d1a3b8c38d12878ff94f0933b7449e5ba651831612b62417426396327ea8ba64e830fe0537757abe65bcd5284 +Size (texmaker-5.0.3.tar.bz2) = 15783226 bytes +SHA1 (patch-latexeditor.h) = 5da42462462e0ec8022f0d49e749d39f8bf9d5b4 +SHA1 (patch-latexeditorview.h) = 1057f9c540b150e89935d563c5f31e0e5f32a56a +SHA1 (patch-latexhighlighter.h) = 7170f4001a8d383430ecf8bb1f95a6d1f262e6cc +SHA1 (patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp) = 0bac4d8e6a887af2b13e27fa4649f9e9c0996c81 +SHA1 (patch-pdfium_core_fxcrt_include_fx__system.h) = 6f435b5df9754c3f0056751ec17d9ac0a726d953 +SHA1 (patch-pdfium_core_fxge_apple_fx__mac__imp.cpp) = 32f75b09e3336206ccc317df2d2ae6448808b996 +SHA1 (patch-pdfium_core_fxge_ge_fx__ge__linux.cpp) = 12678056ff0d05e06eb42a13dc0a5b069f378874 +SHA1 (patch-pdfium_third__party_libopenjpeg20_opj__malloc.h) = aef984a63025c8d386f2230fbc8d438dc6e1a03e +SHA1 (patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp) = e1c75bc0cfb3a606ca9ce826fc3cd5032abe334c +SHA1 (patch-spellerdialog.h) = f98ca3305e8dd8ba1c65bb32e21d965f536094ed +SHA1 (patch-texmaker.h) = b418f9b515acbe3960e78bf984ca9c7f8549359a +SHA1 (patch-texmaker.pro) = 7f20deec767057ad4d3e6a0cda6fab483b6656c0 +SHA1 (patch-versiondialog.cpp) = 0f6fbea229f688bbac27a406652466a171ce6738 Index: pkgsrc/editors/texmaker/options.mk diff -u pkgsrc/editors/texmaker/options.mk:1.4 pkgsrc/editors/texmaker/options.mk:1.5 --- pkgsrc/editors/texmaker/options.mk:1.4 Sat Jun 8 10:40:58 2019 +++ pkgsrc/editors/texmaker/options.mk Thu Sep 5 08:07:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2019/06/08 10:40:58 rillig Exp $ +# $NetBSD: options.mk,v 1.5 2019/09/05 08:07:25 nros Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.texmaker PKG_OPTIONS_REQUIRED_GROUPS= qt @@ -8,6 +8,4 @@ PKG_SUGGESTED_OPTIONS= qt5 .if !empty(PKG_OPTIONS:Mqt5) .include "../../x11/qt5-qtscript/buildlink3.mk" -.include "../../x11/qt5-qtwebkit/buildlink3.mk" -.include "../../print/poppler-qt5/buildlink3.mk" .endif Added files: Index: pkgsrc/editors/texmaker/files/fgas_stdfontmgr_pkgsrcfonts.inc diff -u /dev/null pkgsrc/editors/texmaker/files/fgas_stdfontmgr_pkgsrcfonts.inc:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/files/fgas_stdfontmgr_pkgsrcfonts.inc Thu Sep 5 08:07:25 2019 @@ -0,0 +1,2 @@ +// $NetBSD: fgas_stdfontmgr_pkgsrcfonts.inc,v 1.1 2019/09/05 08:07:25 nros Exp $ +"@PREFIX@/share/fonts/X11/Type1","@PREFIX@/share/fonts/X11/TTF", Index: pkgsrc/editors/texmaker/files/fxge_pkgsrcfonts.inc diff -u /dev/null pkgsrc/editors/texmaker/files/fxge_pkgsrcfonts.inc:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/files/fxge_pkgsrcfonts.inc Thu Sep 5 08:07:25 2019 @@ -0,0 +1,3 @@ +// $NetBSD: fxge_pkgsrcfonts.inc,v 1.1 2019/09/05 08:07:25 nros Exp $ +pInfo->AddPath("@PREFIX@/share/fonts/X11/Type1"); +pInfo->AddPath("@PREFIX@/share/fonts/X11/TTF"); Index: pkgsrc/editors/texmaker/patches/patch-latexeditor.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-latexeditor.h:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-latexeditor.h Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-latexeditor.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +use pkgsrc (system) hunspell , from openbsd ports +--- latexeditor.h.orig 2019-09-03 13:21:25.000000000 +0000 ++++ latexeditor.h +@@ -35,7 +35,7 @@ + + #include "latexhighlighter.h" + #include "textblockselection.h" +-#include "hunspell/hunspell.hxx" ++#include + + typedef int UserBookmarkList[3]; + Index: pkgsrc/editors/texmaker/patches/patch-latexeditorview.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-latexeditorview.h:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-latexeditorview.h Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-latexeditorview.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +* use pkgsrc (system) hunspell, from openbsd ports +--- latexeditorview.h.orig 2019-09-03 13:22:35.000000000 +0000 ++++ latexeditorview.h +@@ -23,7 +23,7 @@ + #include "gotolinewidget.h" + #include "replacewidget.h" + #include "minisplitter.h" +-#include "hunspell/hunspell.hxx" ++#include + + class LatexEditorView : public QWidget { + Q_OBJECT Index: pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-latexhighlighter.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +* use pkgsrc (system) hunspell, from openbsd ports +--- latexhighlighter.h.orig 2019-09-03 13:23:28.000000000 +0000 ++++ latexhighlighter.h +@@ -20,7 +20,7 @@ + #include + #include + //#include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + class QTextDocument; + class LatexEditor; Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp,v 1.1 2019/09/05 08:07:25 nros Exp $ +* use pkgsrc (system) libpng +--- pdfium/core/fxcodec/codec/fx_codec_png.cpp.orig 2019-08-10 09:07:09.000000000 +0000 ++++ pdfium/core/fxcodec/codec/fx_codec_png.cpp +@@ -12,7 +12,7 @@ + + extern "C" { + #undef FAR +-#include "third_party/libpng16/png.h" ++#include + } + + static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) { Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx__system.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx__system.h:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx__system.h Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-pdfium_core_fxcrt_include_fx__system.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +* make it build on solaris and BSD systems +--- pdfium/core/fxcrt/include/fx_system.h.orig 2017-04-16 14:53:52.000000000 +0000 ++++ 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(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun) + #define _FX_OS_ _FX_LINUX_DESKTOP_ + #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_ + #elif defined(__APPLE__) Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp Thu Sep 5 08:07:25 2019 @@ -0,0 +1,12 @@ +$NetBSD: patch-pdfium_core_fxge_apple_fx__mac__imp.cpp,v 1.1 2019/09/05 08:07:25 nros Exp $ +* add pkgsrc font paths +--- pdfium/core/fxge/apple/fx_mac_imp.cpp.orig 2017-04-16 14:53:52.000000000 +0000 ++++ pdfium/core/fxge/apple/fx_mac_imp.cpp +@@ -123,6 +123,7 @@ std::unique_ptr IFX_ + pInfo->AddPath("~/Library/Fonts"); + pInfo->AddPath("/Library/Fonts"); + pInfo->AddPath("/System/Library/Fonts"); ++#include "../fxge_pkgsrcfonts.inc" + return std::unique_ptr(pInfo); + } + Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp Thu Sep 5 08:07:25 2019 @@ -0,0 +1,21 @@ +$NetBSD: patch-pdfium_core_fxge_ge_fx__ge__linux.cpp,v 1.1 2019/09/05 08:07:25 nros Exp $ +* Add X11 and pkgsrc font paths +--- pdfium/core/fxge/ge/fx_ge_linux.cpp.orig 2017-04-16 14:53:52.000000000 +0000 ++++ pdfium/core/fxge/ge/fx_ge_linux.cpp +@@ -1,3 +1,4 @@ ++ + // Copyright 2014 PDFium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. +@@ -132,6 +133,11 @@ std::unique_ptr IFX_ + pInfo->AddPath("/usr/share/X11/fonts/Type1"); + pInfo->AddPath("/usr/share/X11/fonts/TTF"); + pInfo->AddPath("/usr/local/share/fonts"); ++ pInfo->AddPath("/usr/X11R7/lib/X11/fonts/Type1"); ++ pInfo->AddPath("/usr/X11R7/lib/X11/fonts/TTF"); ++ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/Type1"); ++ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF"); ++#include "../fxge_pkgsrcfonts.inc" + } + return std::unique_ptr(pInfo); + } Index: pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-pdfium_third__party_libopenjpeg20_opj__malloc.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +* use posix memalign on BSD systems +--- pdfium/third_party/libopenjpeg20/opj_malloc.h.orig 2019-05-04 19:18:14.758209492 +0000 ++++ pdfium/third_party/libopenjpeg20/opj_malloc.h +@@ -98,7 +98,7 @@ Allocate memory aligned to a 16 byte bou + #else /* Not _WIN32 */ + #if defined(__sun) + #define HAVE_MEMALIGN +- #elif defined(__FreeBSD__) ++ #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(DragonFly) + #define HAVE_POSIX_MEMALIGN + /* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) Index: pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp Thu Sep 5 08:07:25 2019 @@ -0,0 +1,17 @@ +$NetBSD: patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp,v 1.1 2019/09/05 08:07:25 nros Exp $ +* add X11 and pkgsrc font paths +--- pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp.orig 2017-04-16 14:53:52.000000000 +0000 ++++ pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp +@@ -466,8 +466,12 @@ 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/X11R7/lib/X11/fonts/Type1", "/usr/X11R7/lib/X11/fonts/TTF", ++ "/usr/X11R6/lib/X11/fonts/Type1", "/usr/X11R6/lib/X11/fonts/TTF", ++#include "fgas_stdfontmgr_pkgsrcfonts.inc" + #elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ + "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts", ++#include "fgas_stdfontmgr_pkgsrcfonts.inc" + #elif _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ + "/system/fonts", + #endif Index: pkgsrc/editors/texmaker/patches/patch-spellerdialog.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-spellerdialog.h:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-spellerdialog.h Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-spellerdialog.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +* use pkgsrc (system) hunspell, from openbsd ports +--- spellerdialog.h.orig 2019-09-03 13:24:33.000000000 +0000 ++++ spellerdialog.h +@@ -13,7 +13,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + Index: pkgsrc/editors/texmaker/patches/patch-texmaker.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-texmaker.h:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-texmaker.h Thu Sep 5 08:07:25 2019 @@ -0,0 +1,18 @@ +$NetBSD: patch-texmaker.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +* use pkgsrc (system) hunspell, from openbsd ports +--- texmaker.h.orig 2019-09-03 13:27:59.000000000 +0000 ++++ texmaker.h +@@ -1,3 +1,4 @@ ++ + /*************************************************************************** + * copyright : (C) 2003-2017 by Pascal Brachet * + * http://www.xm1math.net/texmaker/ * +@@ -49,7 +50,7 @@ + #include "usertagslistwidget.h" + #include "xmltagslistwidget.h" + #include "logeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + #include "pdfviewerwidget.h" + #include "pdfviewer.h" + #include "sourceview.h" Index: pkgsrc/editors/texmaker/patches/patch-texmaker.pro diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-texmaker.pro:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-texmaker.pro Thu Sep 5 08:07:25 2019 @@ -0,0 +1,193 @@ +$NetBSD: patch-texmaker.pro,v 1.1 2019/09/05 08:07:25 nros Exp $ +* use pkgsrc (system) freetype2, hunspell, libjpeg and libpng +--- texmaker.pro.orig 2018-10-31 06:58:22.000000000 +0000 ++++ texmaker.pro +@@ -25,6 +25,9 @@ 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 = freetype2 hunspell libjpeg libpng16 ++ + gcc { + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter + } +@@ -38,16 +41,14 @@ DEFINES += \ + PNG_PREFIX \ + PNG_USE_READ_MACROS \ + V8_DEPRECATION_WARNINGS \ +- NOMINMAX \ +- FT2_BUILD_LIBRARY ++ USE_SYSTEM_LIBJPEG \ ++ NOMINMAX + + + INCLUDEPATH += \ + pdfium/ \ + pdfium \ + pdfium/third_party/ \ +- pdfium/third_party/freetype/include \ +- pdfium/third_party/freetype/include/freetype \ + pdfium/fpdfsdk/include \ + pdfium/third_party/zlib_v128 + +@@ -117,25 +118,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 \ +@@ -350,20 +332,6 @@ HEADERS += texmaker.h \ + pdfium/core/fxcodec/jbig2/JBig2_Segment.h \ + pdfium/core/fxcodec/jbig2/JBig2_SymbolDict.h \ + pdfium/core/fxcodec/jbig2/JBig2_TrdProc.h \ +- pdfium/third_party/libjpeg/cderror.h \ +- pdfium/third_party/libjpeg/cdjpeg.h \ +- pdfium/third_party/libjpeg/jchuff.h \ +- pdfium/third_party/libjpeg/jconfig.h \ +- pdfium/third_party/libjpeg/jdct.h \ +- pdfium/third_party/libjpeg/jdhuff.h \ +- pdfium/third_party/libjpeg/jerror.h \ +- pdfium/third_party/libjpeg/jinclude.h \ +- pdfium/third_party/libjpeg/jmemsys.h \ +- pdfium/third_party/libjpeg/jmorecfg.h \ +- pdfium/third_party/libjpeg/jpegint.h \ +- pdfium/third_party/libjpeg/jpeglib.h \ +- pdfium/third_party/libjpeg/jversion.h \ +- pdfium/third_party/libjpeg/transupp.h \ + pdfium/third_party/lcms2-2.6/include/lcms2.h \ + pdfium/third_party/lcms2-2.6/include/lcms2_plugin.h \ + pdfium/core/fxcrt/cfx_string_c_template.h \ +@@ -425,19 +393,7 @@ HEADERS += texmaker.h \ + pdfium/fpdfsdk/pdfwindow/PWL_ScrollBar.h \ + pdfium/fpdfsdk/pdfwindow/PWL_SpecialButton.h \ + pdfium/fpdfsdk/pdfwindow/PWL_Utils.h \ +- pdfium/fpdfsdk/pdfwindow/PWL_Wnd.h \ +- pdfium/third_party/freetype/include/freetype/freetype.h \ +- pdfium/third_party/freetype/include/freetype/ftmm.h \ +- pdfium/third_party/freetype/include/freetype/ftotval.h \ +- pdfium/third_party/freetype/include/freetype/ftoutln.h \ +- pdfium/third_party/freetype/include/freetype/internal/ftobjs.h \ +- pdfium/third_party/freetype/include/freetype/internal/ftstream.h \ +- pdfium/third_party/freetype/include/freetype/internal/tttypes.h \ +- pdfium/third_party/freetype/include/freetype/tttables.h \ +- pdfium/third_party/freetype/include/ft2build.h \ +- pdfium/third_party/freetype/src/base/ftbase.h \ +- pdfium/third_party/freetype/src/cff/cffobjs.h \ +- pdfium/third_party/freetype/src/cff/cfftypes.h ++ pdfium/fpdfsdk/pdfwindow/PWL_Wnd.h + + SOURCES += main.cpp \ + dropshadowlabel.cpp \ +@@ -502,18 +458,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 \ +@@ -778,46 +722,6 @@ SOURCES += main.cpp \ + pdfium/core/fxcodec/jbig2/JBig2_Segment.cpp \ + pdfium/core/fxcodec/jbig2/JBig2_SymbolDict.cpp \ + pdfium/core/fxcodec/jbig2/JBig2_TrdProc.cpp \ +- pdfium/third_party/libjpeg/fpdfapi_jcapimin.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcapistd.c \ +- pdfium/third_party/libjpeg/fpdfapi_jccoefct.c \ +- pdfium/third_party/libjpeg/fpdfapi_jccolor.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcdctmgr.c \ +- pdfium/third_party/libjpeg/fpdfapi_jchuff.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcinit.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcmainct.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcmarker.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcmaster.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcomapi.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcparam.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcphuff.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcprepct.c \ +- pdfium/third_party/libjpeg/fpdfapi_jcsample.c \ +- pdfium/third_party/libjpeg/fpdfapi_jctrans.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdapimin.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdapistd.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdcoefct.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdcolor.c \ +- pdfium/third_party/libjpeg/fpdfapi_jddctmgr.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdhuff.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdinput.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdmainct.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdmarker.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdmaster.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdmerge.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdphuff.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdpostct.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdsample.c \ +- pdfium/third_party/libjpeg/fpdfapi_jdtrans.c \ +- pdfium/third_party/libjpeg/fpdfapi_jerror.c \ +- pdfium/third_party/libjpeg/fpdfapi_jfdctfst.c \ +- pdfium/third_party/libjpeg/fpdfapi_jfdctint.c \ +- pdfium/third_party/libjpeg/fpdfapi_jidctfst.c \ +- pdfium/third_party/libjpeg/fpdfapi_jidctint.c \ +- pdfium/third_party/libjpeg/fpdfapi_jidctred.c \ +- pdfium/third_party/libjpeg/fpdfapi_jmemmgr.c \ +- pdfium/third_party/libjpeg/fpdfapi_jmemnobs.c \ +- pdfium/third_party/libjpeg/fpdfapi_jutils.c \ + pdfium/third_party/lcms2-2.6/src/cmscam02.c \ + pdfium/third_party/lcms2-2.6/src/cmscgats.c \ + pdfium/third_party/lcms2-2.6/src/cmscnvrt.c \ +@@ -955,24 +859,7 @@ SOURCES += main.cpp \ + pdfium/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp \ + pdfium/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp \ + pdfium/fpdfsdk/pdfwindow/PWL_Utils.cpp \ +- pdfium/fpdfsdk/pdfwindow/PWL_Wnd.cpp \ +- pdfium/third_party/freetype/src/base/ftbase.c \ +- pdfium/third_party/freetype/src/base/ftbitmap.c \ +- pdfium/third_party/freetype/src/base/ftglyph.c \ +- pdfium/third_party/freetype/src/base/ftinit.c \ +- pdfium/third_party/freetype/src/base/ftlcdfil.c \ +- pdfium/third_party/freetype/src/base/ftmm.c \ +- pdfium/third_party/freetype/src/base/ftsystem.c \ +- pdfium/third_party/freetype/src/cff/cff.c \ +- pdfium/third_party/freetype/src/cid/type1cid.c \ +- pdfium/third_party/freetype/src/psaux/psaux.c \ +- pdfium/third_party/freetype/src/pshinter/pshinter.c \ +- pdfium/third_party/freetype/src/psnames/psmodule.c \ +- pdfium/third_party/freetype/src/raster/raster.c \ +- pdfium/third_party/freetype/src/sfnt/sfnt.c \ +- pdfium/third_party/freetype/src/smooth/smooth.c \ +- pdfium/third_party/freetype/src/truetype/truetype.c \ +- pdfium/third_party/freetype/src/type1/type1.c ++ pdfium/fpdfsdk/pdfwindow/PWL_Wnd.cpp + + equals(INTERNALBROWSER,yes){ + DEFINES += INTERNAL_BROWSER Index: pkgsrc/editors/texmaker/patches/patch-versiondialog.cpp diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-versiondialog.cpp:1.1 --- /dev/null Thu Sep 5 08:07:26 2019 +++ pkgsrc/editors/texmaker/patches/patch-versiondialog.cpp Thu Sep 5 08:07:25 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-versiondialog.cpp,v 1.1 2019/09/05 08:07:25 nros Exp $ +* set right version url +--- versiondialog.cpp.orig 2019-09-03 18:03:49.000000000 +0000 ++++ versiondialog.cpp +@@ -42,7 +42,7 @@ void VersionDialog::launchChecker() + { + ui.pushButtonCheck->setEnabled(false); + timer.start(10000); +-reply = manager.get ( QNetworkRequest(QUrl("http://www.xm1math.net/texmaker/version.txt")) ); ++reply = manager.get ( QNetworkRequest(QUrl("https://www.xm1math.net/texmaker/version.txt")) ); + QObject::connect (reply, SIGNAL (finished()),this, SLOT(showResultChecker())); + } + --_----------=_1567670846248520--