Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1B7E41A9239 for ; Tue, 26 Oct 2021 17:56:58 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 7C4FD84EEE; Tue, 26 Oct 2021 17:56:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B54DF84EEB for ; Tue, 26 Oct 2021 17:56:56 +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 tEJeKLuofWo2 for ; Tue, 26 Oct 2021 17:56:54 +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 A93B784CDC for ; Tue, 26 Oct 2021 17:56:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9D065FA97; Tue, 26 Oct 2021 17:56:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1635271014217390" MIME-Version: 1.0 Date: Tue, 26 Oct 2021 17:56:54 +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: <20211026175654.9D065FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1635271014217390 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Tue Oct 26 17:56:54 UTC 2021 Modified Files: pkgsrc/editors/texmaker: Makefile PLIST distinfo 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_fxge_apple_fx__mac__imp.cpp patch-pdfium_core_fxge_ge_fx__ge__linux.cpp patch-pdfium_third__party_libopenjpeg20_opj__malloc.h patch-spellerdialog.h patch-texmaker.h patch-texmaker.pro Added Files: pkgsrc/editors/texmaker/patches: patch-pdfium_core_fxcrt_fx__system.h patch-pdfium_xfa_fgas_font_cfgas__fontmgr.cpp Removed Files: pkgsrc/editors/texmaker/patches: patch-pdfium_core_fxcrt_include_fx__system.h patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp Log Message: Update editors/texmaker to version 5.1.2 pkgsrc changes: qt5script is not used anymore, this means that only qt5declarative is needed as a dependency. USE_LIBTOOL line removed since qt5 doesn't use libtool. Changes from ChangeLog: version 5.1.1 -> 5.1.2 : - a bug related to replace action with a regular expression has been fixed - a bug related to mouse wheel events in the pdf viewer has been fixed - support for non integer dpi scale factor has been added (such as Windows using 125% or 150% scale on laptops) version 5.1.0 -> 5.1.1 : - a critical bug on the windows version compiled with msvc 2019 while inserting a symbol has been fixed - a trouble in the syntax highlighting with the verb latex command has been fixed version 5.0.4 -> 5.1.0 : - compatibility with Qt6 has been added. Texmaker can now be compiled with Qt5 (>=5.7) and Qt6 (>= 6.2). This ensures that Texmaker will be available for, at least, the next ten years. - the internal pdf engine (from chromium) has been updated - hunspell has been updated to 1.7.O - synctex has been updated to 1.21 - default windows paths are now searched in the windows registry and path - a potential trouble with user commands beginning with a space has been fixed - the texmaker.appdata.xml file has been updated - GTK-based theming for systems without a "GTK+" theme has been added - a bug with the use of latexmk with the use of the "output directory" option has been fixed - the pdf viewer is replaced in the default position on the main screen if it has been closed on a screen which is no more connected - the scale in the pdf viewer is now automatically adapted after closing/restoring the list of pages panel - layout has been improved in the find/replace widgets - the obsolete use of QTScript has been replaced by QJSEngine - the ability to change the interface font has been expanded to windows and macos - the ability to check spelling/grammar the text extracted from a pdf page in the internal pdf viewer is back (via online languagetool) - a link to import more spell dictionaries has been added to the configuration dialog To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 pkgsrc/editors/texmaker/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/texmaker/PLIST cvs rdiff -u -r1.19 -r1.20 pkgsrc/editors/texmaker/distinfo cvs rdiff -u -r1.1 -r1.2 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_fxge_apple_fx__mac__imp.cpp \ pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h \ pkgsrc/editors/texmaker/patches/patch-spellerdialog.h \ pkgsrc/editors/texmaker/patches/patch-texmaker.h \ pkgsrc/editors/texmaker/patches/patch-texmaker.pro cvs rdiff -u -r0 -r1.1 \ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_fx__system.h \ pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_cfgas__fontmgr.cpp cvs rdiff -u -r1.1 -r0 \ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx__system.h cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp cvs rdiff -u -r1.2 -r0 \ pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1635271014217390 Content-Disposition: inline Content-Length: 21920 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.121 pkgsrc/editors/texmaker/Makefile:1.122 --- pkgsrc/editors/texmaker/Makefile:1.121 Fri Jul 30 12:26:47 2021 +++ pkgsrc/editors/texmaker/Makefile Tue Oct 26 17:56:54 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.121 2021/07/30 12:26:47 ryoon Exp $ +# $NetBSD: Makefile,v 1.122 2021/10/26 17:56:54 nros Exp $ -DISTNAME= texmaker-5.0.4 -PKGREVISION= 4 +DISTNAME= texmaker-5.1.2 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ EXTRACT_SUFX= .tar.bz2 @@ -14,7 +13,6 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= pkg-config USE_LANGUAGES= c++ c -USE_LIBTOOL= yes INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} @@ -37,6 +35,6 @@ pre-configure: .include "../../graphics/freetype2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/hunspell/buildlink3.mk" +.include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../x11/qt5-qtscript/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/texmaker/PLIST diff -u pkgsrc/editors/texmaker/PLIST:1.11 pkgsrc/editors/texmaker/PLIST:1.12 --- pkgsrc/editors/texmaker/PLIST:1.11 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/PLIST Tue Oct 26 17:56:54 2021 @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.11 2019/09/05 08:07:25 nros Exp $ +@comment $NetBSD: PLIST,v 1.12 2021/10/26 17:56:54 nros Exp $ bin/texmaker -share/appdata/texmaker.appdata.xml +share/appdata/texmaker.metainfo.xml share/applications/texmaker.desktop share/pixmaps/texmaker.png share/texmaker/AUTHORS Index: pkgsrc/editors/texmaker/distinfo diff -u pkgsrc/editors/texmaker/distinfo:1.19 pkgsrc/editors/texmaker/distinfo:1.20 --- pkgsrc/editors/texmaker/distinfo:1.19 Tue Oct 26 10:21:41 2021 +++ pkgsrc/editors/texmaker/distinfo Tue Oct 26 17:56:54 2021 @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.19 2021/10/26 10:21:41 nia Exp $ +$NetBSD: distinfo,v 1.20 2021/10/26 17:56:54 nros Exp $ -BLAKE2s (texmaker-5.0.4.tar.bz2) = f22ddae0d5bc41ad30d6f4df3e6997682c753e61529b4e3c5ca285e0b3fdd109 -SHA512 (texmaker-5.0.4.tar.bz2) = 34ff5773358c2fffbc9e7e61028cd74eef231152e3483531b66cb0d907dd8f70a4e8b6d6ea09b0b11387b592f6d1676ba8a1e737b26c86a45b16882e53edff1f -Size (texmaker-5.0.4.tar.bz2) = 15812468 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) = 40470e35f0b5fb7ee4ec5c49d40752060486513e -SHA1 (patch-pdfium_third__party_libopenjpeg20_opj__malloc.h) = aef984a63025c8d386f2230fbc8d438dc6e1a03e -SHA1 (patch-pdfium_xfa_fgas_font_fgas__stdfontmgr.cpp) = aae2d9aeccb631f429c38c6f7a45205dbed1bf6d -SHA1 (patch-spellerdialog.h) = f98ca3305e8dd8ba1c65bb32e21d965f536094ed -SHA1 (patch-texmaker.h) = b418f9b515acbe3960e78bf984ca9c7f8549359a -SHA1 (patch-texmaker.pro) = 7f20deec767057ad4d3e6a0cda6fab483b6656c0 +RMD160 (texmaker-5.1.2.tar.bz2) = 7d91038621ae9090a4aa3b08a19d98da443a90ac +SHA512 (texmaker-5.1.2.tar.bz2) = a9625bad6401a36b0a9db90d59aa8e4a2e8f692d4937cbe1c159c46360d2b6257a14f6b5df760acfa7969944c93767d463da395dd5486bf619f6f3db31af7885 +Size (texmaker-5.1.2.tar.bz2) = 15199358 bytes +SHA1 (patch-latexeditor.h) = 2168a70e6911aff17e10997948fbc555d18cd567 +SHA1 (patch-latexeditorview.h) = b1a474fb47af2fd78b468328d7582ac79f4e81bb +SHA1 (patch-latexhighlighter.h) = 0268fc657fae4071a5c8392df270f3666621457e +SHA1 (patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp) = 78255906cbc72bc539c41120e23765fcf4baa87f +SHA1 (patch-pdfium_core_fxcrt_fx__system.h) = d79065ef0ef64748f99cd04774f137aaf358c4a9 +SHA1 (patch-pdfium_core_fxge_apple_fx__mac__imp.cpp) = eb21c8516bae912ab2ddcbbe15fb570ac5dc9984 +SHA1 (patch-pdfium_core_fxge_ge_fx__ge__linux.cpp) = a332a849a4a0966abb0cc6c8e14442a5b9d917c7 +SHA1 (patch-pdfium_third__party_libopenjpeg20_opj__malloc.h) = b782865712ce4fc695fcc0803dd3d051c2952a9e +SHA1 (patch-pdfium_xfa_fgas_font_cfgas__fontmgr.cpp) = 50b4b262a75582810ddb62a360f71311cb3f442c +SHA1 (patch-spellerdialog.h) = 89487a11158f43a4e2a2bab898817d23e4ad8b68 +SHA1 (patch-texmaker.h) = 34f14f84325d175af63a18c0825ecf622164e936 +SHA1 (patch-texmaker.pro) = 10a629c34f796847d4cac909cdb290c1bc841db9 Index: pkgsrc/editors/texmaker/patches/patch-latexeditor.h diff -u pkgsrc/editors/texmaker/patches/patch-latexeditor.h:1.1 pkgsrc/editors/texmaker/patches/patch-latexeditor.h:1.2 --- pkgsrc/editors/texmaker/patches/patch-latexeditor.h:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-latexeditor.h Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-latexeditor.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-latexeditor.h,v 1.2 2021/10/26 17:56:54 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 @@ Index: pkgsrc/editors/texmaker/patches/patch-latexeditorview.h diff -u pkgsrc/editors/texmaker/patches/patch-latexeditorview.h:1.1 pkgsrc/editors/texmaker/patches/patch-latexeditorview.h:1.2 --- pkgsrc/editors/texmaker/patches/patch-latexeditorview.h:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-latexeditorview.h Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-latexeditorview.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-latexeditorview.h,v 1.2 2021/10/26 17:56:54 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 @@ Index: pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h diff -u pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h:1.1 pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h:1.2 --- pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-latexhighlighter.h Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-latexhighlighter.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-latexhighlighter.h,v 1.2 2021/10/26 17:56:54 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 @@ Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp diff -u pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp:1.1 pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp:1.2 --- pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-pdfium_core_fxcodec_codec_fx__codec__png.cpp,v 1.2 2021/10/26 17:56:54 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 @@ Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp diff -u pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp:1.1 pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp:1.2 --- pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_apple_fx__mac__imp.cpp Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-pdfium_core_fxge_apple_fx__mac__imp.cpp,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-pdfium_core_fxge_apple_fx__mac__imp.cpp,v 1.2 2021/10/26 17:56:54 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_ Index: pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h diff -u pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h:1.1 pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h:1.2 --- pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_third__party_libopenjpeg20_opj__malloc.h Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-pdfium_third__party_libopenjpeg20_opj__malloc.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-pdfium_third__party_libopenjpeg20_opj__malloc.h,v 1.2 2021/10/26 17:56:54 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 Index: pkgsrc/editors/texmaker/patches/patch-spellerdialog.h diff -u pkgsrc/editors/texmaker/patches/patch-spellerdialog.h:1.1 pkgsrc/editors/texmaker/patches/patch-spellerdialog.h:1.2 --- pkgsrc/editors/texmaker/patches/patch-spellerdialog.h:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-spellerdialog.h Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-spellerdialog.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-spellerdialog.h,v 1.2 2021/10/26 17:56:54 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 @@ Index: pkgsrc/editors/texmaker/patches/patch-texmaker.h diff -u pkgsrc/editors/texmaker/patches/patch-texmaker.h:1.1 pkgsrc/editors/texmaker/patches/patch-texmaker.h:1.2 --- pkgsrc/editors/texmaker/patches/patch-texmaker.h:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-texmaker.h Tue Oct 26 17:56:54 2021 @@ -1,13 +1,10 @@ -$NetBSD: patch-texmaker.h,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-texmaker.h,v 1.2 2021/10/26 17:56:54 nros Exp $ + * use pkgsrc (system) hunspell, from openbsd ports ---- texmaker.h.orig 2019-09-03 13:27:59.000000000 +0000 + +--- texmaker.h.orig 2021-08-13 06:55:34.000000000 +0000 +++ texmaker.h -@@ -1,3 +1,4 @@ -+ - /*************************************************************************** - * copyright : (C) 2003-2017 by Pascal Brachet * - * http://www.xm1math.net/texmaker/ * -@@ -49,7 +50,7 @@ +@@ -50,7 +50,7 @@ #include "usertagslistwidget.h" #include "xmltagslistwidget.h" #include "logeditor.h" Index: pkgsrc/editors/texmaker/patches/patch-texmaker.pro diff -u pkgsrc/editors/texmaker/patches/patch-texmaker.pro:1.1 pkgsrc/editors/texmaker/patches/patch-texmaker.pro:1.2 --- pkgsrc/editors/texmaker/patches/patch-texmaker.pro:1.1 Thu Sep 5 08:07:25 2019 +++ pkgsrc/editors/texmaker/patches/patch-texmaker.pro Tue Oct 26 17:56:54 2021 @@ -1,8 +1,10 @@ -$NetBSD: patch-texmaker.pro,v 1.1 2019/09/05 08:07:25 nros Exp $ +$NetBSD: patch-texmaker.pro,v 1.2 2021/10/26 17:56:54 nros Exp $ + * use pkgsrc (system) freetype2, hunspell, libjpeg and libpng ---- texmaker.pro.orig 2018-10-31 06:58:22.000000000 +0000 + +--- texmaker.pro.orig 2021-09-02 18:08:25.000000000 +0000 +++ texmaker.pro -@@ -25,6 +25,9 @@ message("Qt>=5.7 is required.") +@@ -31,6 +31,9 @@ QT += webenginewidgets CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release CONFIG -= precompile_header @@ -12,14 +14,12 @@ $NetBSD: patch-texmaker.pro,v 1.1 2019/0 gcc { QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter } -@@ -38,16 +41,14 @@ DEFINES += \ - PNG_PREFIX \ +@@ -45,15 +48,13 @@ DEFINES += \ PNG_USE_READ_MACROS \ V8_DEPRECATION_WARNINGS \ -- NOMINMAX \ + NOMINMAX \ - FT2_BUILD_LIBRARY -+ USE_SYSTEM_LIBJPEG \ -+ NOMINMAX ++ USE_SYSTEM_LIBJPEG INCLUDEPATH += \ @@ -28,39 +28,38 @@ $NetBSD: patch-texmaker.pro,v 1.1 2019/0 pdfium/third_party/ \ - pdfium/third_party/freetype/include \ - pdfium/third_party/freetype/include/freetype \ - pdfium/fpdfsdk/include \ + pdfium/fpdfsdk \ pdfium/third_party/zlib_v128 -@@ -117,25 +118,6 @@ HEADERS += texmaker.h \ - unicodeview.h \ - svnhelper.h \ +@@ -127,24 +128,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 \ -@@ -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 \ +@@ -190,20 +173,6 @@ HEADERS += texmaker.h \ + pdfium/third_party/base/numerics/safe_math.h \ + pdfium/third_party/base/numerics/safe_math_impl.h \ + pdfium/third_party/base/stl_util.h \ - pdfium/third_party/libjpeg/cderror.h \ - pdfium/third_party/libjpeg/cdjpeg.h \ - pdfium/third_party/libjpeg/jchuff.h \ @@ -75,14 +74,13 @@ $NetBSD: patch-texmaker.pro,v 1.1 2019/0 - 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/lcms/include/lcms2.h \ + pdfium/third_party/lcms/include/lcms2_plugin.h \ + pdfium/third_party/agg23/agg_basics.h \ +@@ -216,18 +185,6 @@ HEADERS += texmaker.h \ + pdfium/third_party/agg23/agg_renderer_scanline.h \ + pdfium/third_party/agg23/agg_rendering_buffer.h \ + pdfium/third_party/agg23/agg_scanline_u.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 \ @@ -94,34 +92,31 @@ $NetBSD: patch-texmaker.pro,v 1.1 2019/0 - 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 \ +- pdfium/third_party/freetype/src/cff/cfftypes.h \ + pdfium/fpdfsdk/cba_annotiterator.h \ + pdfium/fpdfsdk/cfx_systemhandler.h \ + pdfium/fpdfsdk/cpdfsdk_annot.h \ +@@ -567,16 +524,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 \ -@@ -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 \ +@@ -616,46 +563,6 @@ SOURCES += main.cpp \ + pdfium/third_party/bigint/BigIntegerUtils.cc \ + pdfium/third_party/bigint/BigUnsigned.cc \ + pdfium/third_party/bigint/BigUnsignedInABase.cc \ - pdfium/third_party/libjpeg/fpdfapi_jcapimin.c \ - pdfium/third_party/libjpeg/fpdfapi_jcapistd.c \ - pdfium/third_party/libjpeg/fpdfapi_jccoefct.c \ @@ -162,14 +157,13 @@ $NetBSD: patch-texmaker.pro,v 1.1 2019/0 - 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/lcms/src/cmsalpha.c \ + pdfium/third_party/lcms/src/cmscam02.c \ + pdfium/third_party/lcms/src/cmscgats.c \ +@@ -721,23 +628,6 @@ SOURCES += main.cpp \ + pdfium/third_party/agg23/agg_rasterizer_scanline_aa.cpp \ + pdfium/third_party/agg23/agg_vcgen_dash.cpp \ + pdfium/third_party/agg23/agg_vcgen_stroke.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 \ @@ -186,8 +180,7 @@ $NetBSD: patch-texmaker.pro,v 1.1 2019/0 - 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 +- pdfium/third_party/freetype/src/type1/type1.c \ + pdfium/fpdfsdk/cba_annotiterator.cpp \ + pdfium/fpdfsdk/cfx_systemhandler.cpp \ + pdfium/fpdfsdk/cpdfsdk_annot.cpp \ Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp diff -u pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp:1.2 pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp:1.3 --- pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp:1.2 Tue Sep 10 16:17:13 2019 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxge_ge_fx__ge__linux.cpp Tue Oct 26 17:56:54 2021 @@ -1,5 +1,7 @@ -$NetBSD: patch-pdfium_core_fxge_ge_fx__ge__linux.cpp,v 1.2 2019/09/10 16:17:13 nros Exp $ +$NetBSD: patch-pdfium_core_fxge_ge_fx__ge__linux.cpp,v 1.3 2021/10/26 17:56:54 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 @@ Added files: Index: pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_fx__system.h diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_fx__system.h:1.1 --- /dev/null Tue Oct 26 17:56:54 2021 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_core_fxcrt_fx__system.h Tue Oct 26 17:56:54 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-pdfium_core_fxcrt_fx__system.h,v 1.1 2021/10/26 17:56:54 nros Exp $ + +* build in BSD and solaris + +--- pdfium/core/fxcrt/fx_system.h.orig 2019-12-05 18:23:22.000000000 +0000 ++++ 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(__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_xfa_fgas_font_cfgas__fontmgr.cpp diff -u /dev/null pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_cfgas__fontmgr.cpp:1.1 --- /dev/null Tue Oct 26 17:56:54 2021 +++ pkgsrc/editors/texmaker/patches/patch-pdfium_xfa_fgas_font_cfgas__fontmgr.cpp Tue Oct 26 17:56:54 2021 @@ -0,0 +1,18 @@ +$NetBSD: patch-pdfium_xfa_fgas_font_cfgas__fontmgr.cpp,v 1.1 2021/10/26 17:56:54 nros Exp $ + +* add X11 and pkgsrc font paths + +--- pdfium/xfa/fgas/font/cfgas_fontmgr.cpp.orig 2021-10-25 14:58:20.286381904 +0000 ++++ pdfium/xfa/fgas/font/cfgas_fontmgr.cpp +@@ -425,8 +425,11 @@ 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", ++#include "fgas_stdfontmgr_x11fonts.inc" ++#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 --_----------=_1635271014217390--