diff options
-rw-r--r-- | editors/texstudio/Makefile | 6 | ||||
-rw-r--r-- | editors/texstudio/PLIST | 213 | ||||
-rw-r--r-- | editors/texstudio/distinfo | 11 | ||||
-rw-r--r-- | editors/texstudio/patches/patch-manhattanstyle.cpp | 14 | ||||
-rw-r--r-- | editors/texstudio/patches/patch-mostQtHeaders.h | 14 | ||||
-rw-r--r-- | editors/texstudio/patches/patch-pdfviewer_PDFDocument.cpp | 15 |
6 files changed, 180 insertions, 93 deletions
diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile index c42bf2314d3..eec18fbc7ff 100644 --- a/editors/texstudio/Makefile +++ b/editors/texstudio/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.76 2022/11/23 16:19:57 adam Exp $ +# $NetBSD: Makefile,v 1.77 2022/12/13 19:47:35 markd Exp $ -DISTNAME= texstudio-2.12.22 -PKGREVISION= 29 +DISTNAME= texstudio-4.4.0 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GITHUB:=texstudio-org/} @@ -35,6 +34,7 @@ do-configure: .include "../../x11/qt5-qtscript/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" +.include "../../print/poppler-cpp/buildlink3.mk" .include "../../print/poppler-qt5/buildlink3.mk" .include "../../print/poppler-includes/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/texstudio/PLIST b/editors/texstudio/PLIST index 1bab5819a98..63bbc306da5 100644 --- a/editors/texstudio/PLIST +++ b/editors/texstudio/PLIST @@ -1,46 +1,174 @@ -@comment $NetBSD: PLIST,v 1.7 2020/03/01 12:48:13 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2022/12/13 19:47:35 markd Exp $ bin/texstudio share/applications/texstudio.desktop share/icons/hicolor/scalable/apps/texstudio.svg share/texstudio/AUTHORS share/texstudio/CHANGELOG.txt share/texstudio/COPYING -share/texstudio/block_selection.png -share/texstudio/compile_toolbar.png -share/texstudio/configure_build.png -share/texstudio/configure_commands.png -share/texstudio/configure_completion.png -share/texstudio/configure_customToolbar.png -share/texstudio/configure_customizeMenu.png -share/texstudio/configure_editor.png -share/texstudio/configure_general.png -share/texstudio/configure_shortcuts.png -share/texstudio/configure_svn.png +share/texstudio/_images/TOC_file.png +share/texstudio/_images/TOC_standard.png +share/texstudio/_images/Tool_Bar_Menu.png +share/texstudio/_images/Tool_Bar_Move.png +share/texstudio/_images/active_language.png +share/texstudio/_images/blockCursor.png +share/texstudio/_images/blockCursor_selection.png +share/texstudio/_images/block_selection.png +share/texstudio/_images/bookmark1.png +share/texstudio/_images/bookmark2.png +share/texstudio/_images/bookmark3.png +share/texstudio/_images/bookmark4.png +share/texstudio/_images/bookmark5.png +share/texstudio/_images/bookmark6.png +share/texstudio/_images/compile_toolbar.png +share/texstudio/_images/completer.png +share/texstudio/_images/completer_env.png +share/texstudio/_images/completer_env_before.png +share/texstudio/_images/completer_filename.png +share/texstudio/_images/completer_filename_preview.png +share/texstudio/_images/completer_keys.png +share/texstudio/_images/completer_length.png +share/texstudio/_images/completer_ref.png +share/texstudio/_images/completer_reference.png +share/texstudio/_images/completer_text.png +share/texstudio/_images/completer_usertag.png +share/texstudio/_images/completer_usertag_text.png +share/texstudio/_images/conf_LT.png +share/texstudio/_images/conf_LT_adv.png +share/texstudio/_images/conf_grammar_internal.png +share/texstudio/_images/conf_structurepanel.png +share/texstudio/_images/conf_tableautoformating.png +share/texstudio/_images/conf_thesaurus.png +share/texstudio/_images/configure_advancedEditor.png +share/texstudio/_images/configure_build.png +share/texstudio/_images/configure_commands.png +share/texstudio/_images/configure_completion.png +share/texstudio/_images/configure_completion_adv.png +share/texstudio/_images/configure_customToolbar.png +share/texstudio/_images/configure_customizeMenu.png +share/texstudio/_images/configure_editor.png +share/texstudio/_images/configure_editor_adv.png +share/texstudio/_images/configure_general.png +share/texstudio/_images/configure_general_adv.png +share/texstudio/_images/configure_guiscaling.png +share/texstudio/_images/configure_language.png +share/texstudio/_images/configure_preview.png +share/texstudio/_images/configure_shortcuts.png +share/texstudio/_images/configure_svn.png +share/texstudio/_images/configure_syntaxhighlighting.png +share/texstudio/_images/doc10.png +share/texstudio/_images/doc11.png +share/texstudio/_images/doc12.png +share/texstudio/_images/doc13.png +share/texstudio/_images/doc16.png +share/texstudio/_images/doc17.png +share/texstudio/_images/doc18.png +share/texstudio/_images/doc19.png +share/texstudio/_images/doc21.png +share/texstudio/_images/doc3.png +share/texstudio/_images/doc6.png +share/texstudio/_images/doc7.png +share/texstudio/_images/doc8.png +share/texstudio/_images/doc9.png +share/texstudio/_images/down.png +share/texstudio/_images/errorlog.png +share/texstudio/_images/extendedSearch.png +share/texstudio/_images/findUsage.png +share/texstudio/_images/format_example.png +share/texstudio/_images/grid4x2_book_col1.png +share/texstudio/_images/grid4x2_book_col2.png +share/texstudio/_images/hide_panes.png +share/texstudio/_images/insertImage_menu.png +share/texstudio/_images/insert_ref.png +share/texstudio/_images/insert_ref_fromStructure.png +share/texstudio/_images/menu_session.png +share/texstudio/_images/menu_svn.png +share/texstudio/_images/preview_color.png +share/texstudio/_images/preview_context.png +share/texstudio/_images/preview_image.png +share/texstudio/_images/preview_inline.png +share/texstudio/_images/preview_inline_context.png +share/texstudio/_images/preview_tooltip.png +share/texstudio/_images/quickstartwizard.png +share/texstudio/_images/searchpanel.png +share/texstudio/_images/spellcheck_menu.png +share/texstudio/_images/spellcheck_options.png +share/texstudio/_images/speller_dialog.png +share/texstudio/_images/spelling_error.png +share/texstudio/_images/structureview.png +share/texstudio/_images/symbol_panel.png +share/texstudio/_images/syntax_error.png +share/texstudio/_images/syntax_error_tooltip.png +share/texstudio/_images/table_addCol.png +share/texstudio/_images/table_addRow.png +share/texstudio/_images/table_alignCol.png +share/texstudio/_images/table_cutCol.png +share/texstudio/_images/table_pasteCol.png +share/texstudio/_images/table_remCol.png +share/texstudio/_images/table_remRow.png +share/texstudio/_images/tb_central_format.png +share/texstudio/_images/tb_central_math.png +share/texstudio/_images/tb_math.png +share/texstudio/_images/tb_pdf_magnifyPan.png +share/texstudio/_images/tb_reference.png +share/texstudio/_images/template.png +share/texstudio/_images/thesaurus.png +share/texstudio/_images/txs_compile.png +share/texstudio/_images/txs_equation.png +share/texstudio/_images/txs_overview.png +share/texstudio/_images/txs_section.png +share/texstudio/_images/txs_symbol.png +share/texstudio/_images/txs_view.png +share/texstudio/_images/txs_wizard.png +share/texstudio/_images/up.png +share/texstudio/_images/userfoldmarker.png +share/texstudio/_images/viewbutton.png +share/texstudio/_images/wizard_array.png +share/texstudio/_images/wizard_figure.png +share/texstudio/_images/wizard_tabbing.png +share/texstudio/_images/wizard_tabular.png +share/texstudio/_sphinx_design_static/design-style.4045f2051d55cab465a707391d5b2007.min.css +share/texstudio/_sphinx_design_static/design-tabs.js +share/texstudio/_static/_sphinx_javascript_frameworks_compat.js +share/texstudio/_static/basic.css +share/texstudio/_static/debug.css +share/texstudio/_static/design-style.4045f2051d55cab465a707391d5b2007.min.css +share/texstudio/_static/design-tabs.js +share/texstudio/_static/doctools.js +share/texstudio/_static/documentation_options.js +share/texstudio/_static/file.png +share/texstudio/_static/jquery-3.6.0.js +share/texstudio/_static/jquery.js +share/texstudio/_static/language_data.js +share/texstudio/_static/minus.png +share/texstudio/_static/plus.png +share/texstudio/_static/pygments.css +share/texstudio/_static/scripts/furo-extensions.js +share/texstudio/_static/scripts/furo.js +share/texstudio/_static/scripts/furo.js.LICENSE.txt +share/texstudio/_static/scripts/furo.js.map +share/texstudio/_static/searchtools.js +share/texstudio/_static/skeleton.css +share/texstudio/_static/sphinx_highlight.js +share/texstudio/_static/styles/furo-extensions.css +share/texstudio/_static/styles/furo-extensions.css.map +share/texstudio/_static/styles/furo.css +share/texstudio/_static/styles/furo.css.map +share/texstudio/_static/tabs.css +share/texstudio/_static/tabs.js +share/texstudio/_static/texstudio.ico +share/texstudio/_static/texstudio128x128.png +share/texstudio/_static/underscore-1.13.1.js +share/texstudio/_static/underscore.js +share/texstudio/advanced.html +share/texstudio/background.html +share/texstudio/compiling.html +share/texstudio/configuration.html share/texstudio/de_DE.aff share/texstudio/de_DE.badWords share/texstudio/de_DE.dic share/texstudio/de_DE.stopWords share/texstudio/de_DE.stopWords.level2 -share/texstudio/doc1.png -share/texstudio/doc10.png -share/texstudio/doc11.png -share/texstudio/doc12.png -share/texstudio/doc13.png -share/texstudio/doc14.png -share/texstudio/doc15.png -share/texstudio/doc16.png -share/texstudio/doc17.png -share/texstudio/doc18.png -share/texstudio/doc19.png -share/texstudio/doc2.png -share/texstudio/doc20.png -share/texstudio/doc21.png -share/texstudio/doc3.png -share/texstudio/doc5.png -share/texstudio/doc6.png -share/texstudio/doc7.png -share/texstudio/doc8.png -share/texstudio/doc9.png +share/texstudio/editing.html share/texstudio/en_GB.aff share/texstudio/en_GB.dic share/texstudio/en_GB.stopWords @@ -49,12 +177,14 @@ share/texstudio/en_US.dic share/texstudio/en_US.stopWords share/texstudio/es_ES.aff share/texstudio/es_ES.dic -share/texstudio/format_example.png share/texstudio/fr_FR.aff share/texstudio/fr_FR.dic share/texstudio/fr_FR.stopWords +share/texstudio/genindex.html +share/texstudio/getting_started.html share/texstudio/hu_HU.aff share/texstudio/hu_HU.dic +share/texstudio/index.html share/texstudio/it_IT.aff share/texstudio/it_IT.dic share/texstudio/latex2e.css @@ -68,8 +198,7 @@ share/texstudio/qt_hu.qm share/texstudio/qt_ja.qm share/texstudio/qt_pl.qm share/texstudio/qt_zh.qm -share/texstudio/spellcheck_menu.png -share/texstudio/spellcheck_options.png +share/texstudio/search.html share/texstudio/tabletemplate_fullyframed_firstBold.js share/texstudio/tabletemplate_fullyframed_firstBold.png share/texstudio/tabletemplate_fullyframed_longtable.js @@ -80,13 +209,15 @@ share/texstudio/tabletemplate_plain_tabularx.js share/texstudio/tabletemplate_plain_tabularx.png share/texstudio/tabletemplate_rowcolors_tabular.js share/texstudio/tabletemplate_rowcolors_tabular.png -share/texstudio/template.png share/texstudio/template_Article.json share/texstudio/template_Article.png share/texstudio/template_Article.tex share/texstudio/template_Article_French.json share/texstudio/template_Article_French.png share/texstudio/template_Article_French.tex +share/texstudio/template_Article_LuaLaTeX_French.json +share/texstudio/template_Article_LuaLaTeX_French.png +share/texstudio/template_Article_LuaLaTeX_French.tex share/texstudio/template_Beamer.json share/texstudio/template_Beamer.tex share/texstudio/template_Book.json @@ -125,6 +256,7 @@ share/texstudio/texstudio48x48.png share/texstudio/texstudio64x64.png share/texstudio/texstudio_ar.qm share/texstudio/texstudio_br.qm +share/texstudio/texstudio_ca.qm share/texstudio/texstudio_cs.qm share/texstudio/texstudio_de.qm share/texstudio/texstudio_el.qm @@ -133,18 +265,22 @@ share/texstudio/texstudio_fa.qm share/texstudio/texstudio_fr.qm share/texstudio/texstudio_hu.qm share/texstudio/texstudio_id_ID.qm +share/texstudio/texstudio_ie.qm share/texstudio/texstudio_it.qm share/texstudio/texstudio_ja.qm share/texstudio/texstudio_ko.qm share/texstudio/texstudio_ko_KR.qm +share/texstudio/texstudio_nb_NO.qm share/texstudio/texstudio_nl.qm share/texstudio/texstudio_pl.qm share/texstudio/texstudio_pt.qm share/texstudio/texstudio_pt_BR.qm share/texstudio/texstudio_ru_RU.qm +share/texstudio/texstudio_si.qm share/texstudio/texstudio_sk.qm share/texstudio/texstudio_sv.qm share/texstudio/texstudio_tr_TR.qm +share/texstudio/texstudio_ug.qm share/texstudio/texstudio_uk.qm share/texstudio/texstudio_vi.qm share/texstudio/texstudio_zh_CN.qm @@ -152,7 +288,4 @@ share/texstudio/th_de_DE_v2.dat share/texstudio/th_en_US_v2.dat share/texstudio/th_fr_FR_v2.dat share/texstudio/th_it_IT_v2.dat -share/texstudio/thesaurus.png -share/texstudio/usermanual.css -share/texstudio/usermanual_en.html -share/texstudio/wizard_figure.png +share/texstudio/viewing.html diff --git a/editors/texstudio/distinfo b/editors/texstudio/distinfo index 7640f2f0bef..bdac254252a 100644 --- a/editors/texstudio/distinfo +++ b/editors/texstudio/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.11 2021/10/26 10:21:42 nia Exp $ +$NetBSD: distinfo,v 1.12 2022/12/13 19:47:35 markd Exp $ -BLAKE2s (texstudio-2.12.22.tar.gz) = f0a386d2f9e2e132f179462d1e5f1b5425a89c7fe926117d078a1e1be0c51886 -SHA512 (texstudio-2.12.22.tar.gz) = c589285d1fba00812583a3d58602a99e044eb4bcf6a84b939d00ad7fe4ba8f15788031361fc9b4cb8df19f8098911c437d1de5459c1736fa40888b88d13b10d1 -Size (texstudio-2.12.22.tar.gz) = 35965795 bytes -SHA1 (patch-manhattanstyle.cpp) = 390e4026a44656e7fb2a675f958b8a6f315cffdc +BLAKE2s (texstudio-4.4.0.tar.gz) = a920fd04036f0cf4c553f54219ac977daaa7a429171cecff39d0eb666f91088b +SHA512 (texstudio-4.4.0.tar.gz) = 02b328c79fca6d9d2c3fd0039081d25279d803051f4459d83750e5b2bad23227871ed367d641e06a5bafd2f08699d1410a9ffcad5ff4d2de48b53f0b0f60d977 +Size (texstudio-4.4.0.tar.gz) = 111069980 bytes SHA1 (patch-minisplitter.cpp) = 93b1910a12308294a5ae4870da0b208cb4580ee7 -SHA1 (patch-mostQtHeaders.h) = debd3e35005a9fe014e65671db98904a0c76b8a5 -SHA1 (patch-pdfviewer_PDFDocument.cpp) = 3b897c52dcfd507682f52ef4b1a61a26f4ec00a3 diff --git a/editors/texstudio/patches/patch-manhattanstyle.cpp b/editors/texstudio/patches/patch-manhattanstyle.cpp deleted file mode 100644 index 247e8d9516e..00000000000 --- a/editors/texstudio/patches/patch-manhattanstyle.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-manhattanstyle.cpp,v 1.1 2020/06/10 06:36:14 markd Exp $ - -qt5.15 fix - ---- src/manhattanstyle.cpp.orig 2020-01-15 19:10:58.000000000 +0000 -+++ src/manhattanstyle.cpp -@@ -44,6 +44,7 @@ - #include <QMainWindow> - #include <QMenuBar> - #include <QPainter> -+#include <QPainterPath> - #include <QPixmap> - #include <QPixmapCache> - #include <QPushButton> diff --git a/editors/texstudio/patches/patch-mostQtHeaders.h b/editors/texstudio/patches/patch-mostQtHeaders.h deleted file mode 100644 index c0959073dd5..00000000000 --- a/editors/texstudio/patches/patch-mostQtHeaders.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mostQtHeaders.h,v 1.1 2020/06/10 06:36:14 markd Exp $ - -qt5.15 fix - ---- src/mostQtHeaders.h.orig 2020-01-15 19:10:58.000000000 +0000 -+++ src/mostQtHeaders.h -@@ -83,6 +83,7 @@ - #include <QObject>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QPixmapCache>
- #include <QPointer>
diff --git a/editors/texstudio/patches/patch-pdfviewer_PDFDocument.cpp b/editors/texstudio/patches/patch-pdfviewer_PDFDocument.cpp deleted file mode 100644 index a464dea806f..00000000000 --- a/editors/texstudio/patches/patch-pdfviewer_PDFDocument.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-pdfviewer_PDFDocument.cpp,v 1.2 2019/01/21 10:12:13 markd Exp $ - -Avoid ambiguous function call. - ---- src/pdfviewer/PDFDocument.cpp.orig 2017-08-12 12:00:03.000000000 +0000 -+++ src/pdfviewer/PDFDocument.cpp -@@ -3095,7 +3095,7 @@ retryNow: - pdfWidget->setFocus(); - - // set page viewer only once -- int maxDigits = 1 + qFloor(log10(pdfWidget->realNumPages())); -+ int maxDigits = 1 + qFloor(log10((float)pdfWidget->realNumPages())); - //if (maxDigits < 2) maxDigits = 2; - leCurrentPage->setMaxLength(maxDigits); - leCurrentPage->setFixedWidth(fontMetrics().width(QString(maxDigits + 1, '#'))); |