diff --git a/.gitignore b/.gitignore index 08c37b4..dc933cd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ texmaker-2.0.tar.bz2 /texmaker-5.1.0.tar.bz2 /texmaker-5.1.1.tar.bz2 /texmaker-5.1.2.tar.bz2 +/texmaker-5.1.3.tar.bz2 diff --git a/sources b/sources index dbc84fd..6218db0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (texmaker-5.1.2.tar.bz2) = a9625bad6401a36b0a9db90d59aa8e4a2e8f692d4937cbe1c159c46360d2b6257a14f6b5df760acfa7969944c93767d463da395dd5486bf619f6f3db31af7885 +SHA512 (texmaker-5.1.3.tar.bz2) = 601e36e3d92d7cde93dca33e0841c5cad9829d8ae5461fcf3b271ffe8f1b154345a287cec3b74d3b1b7fe48b32ee1bd7eb874e64e0233e47327bcd59831ee4ec diff --git a/texmaker-5.1.0-unbundle-hunspell.patch b/texmaker-5.1.0-unbundle-hunspell.patch deleted file mode 100644 index 4f94b28..0000000 --- a/texmaker-5.1.0-unbundle-hunspell.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- texmaker.h.orig 2021-08-14 10:51:20.609264877 -0400 -+++ texmaker.h 2021-08-14 10:52:09.225379849 -0400 -@@ -50,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" ---- latexeditor.h.orig 2021-08-14 10:53:03.781507844 -0400 -+++ latexeditor.h 2021-08-14 10:56:49.250996591 -0400 -@@ -36,7 +36,7 @@ - - #include "latexhighlighter.h" - #include "textblockselection.h" --#include "hunspell/hunspell.hxx" -+#include - - typedef int UserBookmarkList[3]; - ---- latexhighlighter.h.orig 2021-08-14 10:57:28.013081401 -0400 -+++ latexhighlighter.h 2021-08-14 10:58:08.276172302 -0400 -@@ -21,7 +21,7 @@ - #include - #include - //#include "latexeditor.h" --#include "hunspell/hunspell.hxx" -+#include - - class QTextDocument; - class LatexEditor; ---- spellerdialog.h.orig 2021-08-14 10:57:39.306106898 -0400 -+++ spellerdialog.h 2021-08-14 10:58:24.882209791 -0400 -@@ -15,7 +15,7 @@ - - #include "ui_spellerdialog.h" - #include "latexeditor.h" --#include "hunspell/hunspell.hxx" -+#include - - #include - diff --git a/texmaker-5.1.0-unbundle-qtsingleapp.patch b/texmaker-5.1.0-unbundle-qtsingleapp.patch deleted file mode 100644 index 300e320..0000000 --- a/texmaker-5.1.0-unbundle-qtsingleapp.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- texmaker.pro.orig 2021-08-14 10:46:49.679639165 -0400 -+++ texmaker.pro 2021-08-14 10:48:47.547902861 -0400 -@@ -28,9 +28,11 @@ - } - - --CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release -+CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release qtsingleapplication link_pkgconfig - CONFIG -= precompile_header - -+PKGCONFIG += hunspell -+ - gcc { - QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter - } -@@ -127,28 +129,6 @@ - x11fontdialog.h \ - quickbeamerdialog.h \ - cmdparser.h \ -- hunspell/affentry.hxx \ -- hunspell/affixmgr.hxx \ -- hunspell/atypes.hxx \ -- hunspell/baseaffix.hxx \ -- hunspell/csutil.hxx \ -- hunspell/filemgr.hxx \ -- hunspell/hashmgr.hxx \ -- hunspell/htypes.hxx \ -- hunspell/hunvisapi.h \ -- hunspell/hunspell.h \ -- hunspell/hunspell.hxx \ -- hunspell/hunzip.hxx \ -- hunspell/langnum.hxx \ -- hunspell/phonet.hxx \ -- hunspell/replist.hxx \ -- hunspell/suggestmgr.hxx \ -- hunspell/utf_info.hxx \ -- hunspell/w_char.hxx \ -- singleapp/qtlocalpeer.h \ -- singleapp/qtlockedfile.h \ -- singleapp/qtsingleapplication.h \ -- singleapp/qtsinglecoreapplication.h \ - encodingprober/CharDistribution.h \ - encodingprober/ChineseGroupProber.h \ - encodingprober/ctype_test_p.h \ -@@ -567,20 +547,6 @@ - svnhelper.cpp \ - x11fontdialog.cpp \ - cmdparser.cpp \ -- hunspell/affentry.cxx \ -- hunspell/affixmgr.cxx \ -- hunspell/csutil.cxx \ -- hunspell/filemgr.cxx \ -- hunspell/hashmgr.cxx \ -- hunspell/hunspell.cxx \ -- hunspell/hunzip.cxx \ -- hunspell/phonet.cxx \ -- hunspell/replist.cxx \ -- hunspell/suggestmgr.cxx \ -- singleapp/qtlocalpeer.cpp \ -- singleapp/qtlockedfile.cpp \ -- singleapp/qtsingleapplication.cpp \ -- singleapp/qtsinglecoreapplication.cpp \ - encodingprober/CharDistribution.cpp \ - encodingprober/ChineseGroupProber.cpp \ - encodingprober/JapaneseGroupProber.cpp \ -@@ -1166,7 +1132,6 @@ - - - INSTALLS = target --SOURCES += singleapp/qtlockedfile_unix.cpp - - utilities.files = doc/doc10.png \ - doc/doc11.png \ ---- texmakerapp.h.orig 2021-08-14 10:49:06.254947107 -0400 -+++ texmakerapp.h 2021-08-14 10:49:34.610014175 -0400 -@@ -17,7 +17,7 @@ - - #include - #include "texmaker.h" --#include "singleapp/qtsingleapplication.h" -+#include - - class TexmakerApp : public QtSingleApplication - { diff --git a/texmaker-5.1.2-viewfiles.patch b/texmaker-5.1.2-viewfiles.patch deleted file mode 100644 index 02d4222..0000000 --- a/texmaker-5.1.2-viewfiles.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- texmaker.cpp-orig 2021-09-12 10:20:53.190530577 -0400 -+++ texmaker.cpp 2021-09-12 10:21:54.940315531 -0400 -@@ -5234,28 +5234,10 @@ - metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString(); - // xdvi %.dvi -sourceposition @:%.tex - // kdvi "file:%.dvi#src:@ %.tex" --switch (desktop_env) -- { -- case 1: -- { -- viewdvi_command=config->value("Tools/Dvi","evince %.dvi").toString(); -- viewps_command=config->value("Tools/Ps","evince %.ps").toString(); -- viewpdf_command=config->value("Tools/Pdf","evince %.pdf").toString(); -- }break; -- case 2: -- { -- viewdvi_command=config->value("Tools/Dvi","kdvi %.dvi").toString(); -- viewps_command=config->value("Tools/Ps","kghostview %.ps").toString(); -- viewpdf_command=config->value("Tools/Pdf","kpdf %.pdf").toString(); -- }break; -- case 3: -- { -- viewdvi_command=config->value("Tools/Dvi","okular %.dvi").toString(); -- viewps_command=config->value("Tools/Ps","okular %.ps").toString(); -- viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString(); -- }break; -- } - -+viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString(); -+viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString(); -+viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString(); - - - ghostscript_command=config->value("Tools/Ghostscript","gs").toString(); diff --git a/texmaker-5.1.3-unbundle-hunspell.patch b/texmaker-5.1.3-unbundle-hunspell.patch new file mode 100644 index 0000000..4f94b28 --- /dev/null +++ b/texmaker-5.1.3-unbundle-hunspell.patch @@ -0,0 +1,44 @@ +--- texmaker.h.orig 2021-08-14 10:51:20.609264877 -0400 ++++ texmaker.h 2021-08-14 10:52:09.225379849 -0400 +@@ -50,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" +--- latexeditor.h.orig 2021-08-14 10:53:03.781507844 -0400 ++++ latexeditor.h 2021-08-14 10:56:49.250996591 -0400 +@@ -36,7 +36,7 @@ + + #include "latexhighlighter.h" + #include "textblockselection.h" +-#include "hunspell/hunspell.hxx" ++#include + + typedef int UserBookmarkList[3]; + +--- latexhighlighter.h.orig 2021-08-14 10:57:28.013081401 -0400 ++++ latexhighlighter.h 2021-08-14 10:58:08.276172302 -0400 +@@ -21,7 +21,7 @@ + #include + #include + //#include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + class QTextDocument; + class LatexEditor; +--- spellerdialog.h.orig 2021-08-14 10:57:39.306106898 -0400 ++++ spellerdialog.h 2021-08-14 10:58:24.882209791 -0400 +@@ -15,7 +15,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + diff --git a/texmaker-5.1.3-unbundle-qtsingleapp.patch b/texmaker-5.1.3-unbundle-qtsingleapp.patch new file mode 100644 index 0000000..3123c66 --- /dev/null +++ b/texmaker-5.1.3-unbundle-qtsingleapp.patch @@ -0,0 +1,84 @@ +--- texmaker.pro.orig 2022-05-03 07:20:25.546664840 -0500 ++++ texmaker.pro 2022-05-03 07:22:43.381847901 -0500 +@@ -28,9 +28,11 @@ + } + + +-CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release ++CONFIG += qt hide_symbols warn_off rtti_off exceptions_off c++11 release qtsingleapplication link_pkgconfig + CONFIG -= precompile_header + ++PKGCONFIG += hunspell ++ + gcc { + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter + } +@@ -127,28 +129,6 @@ + x11fontdialog.h \ + quickbeamerdialog.h \ + cmdparser.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/filemgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunvisapi.h \ +- hunspell/hunspell.h \ +- hunspell/hunspell.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/langnum.hxx \ +- hunspell/phonet.hxx \ +- hunspell/replist.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/utf_info.hxx \ +- hunspell/w_char.hxx \ +- singleapp/qtlocalpeer.h \ +- singleapp/qtlockedfile.h \ +- singleapp/qtsingleapplication.h \ +- singleapp/qtsinglecoreapplication.h \ + encodingprober/CharDistribution.h \ + encodingprober/ChineseGroupProber.h \ + encodingprober/ctype_test_p.h \ +@@ -567,20 +547,6 @@ + svnhelper.cpp \ + x11fontdialog.cpp \ + cmdparser.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/hunzip.cxx \ +- hunspell/phonet.cxx \ +- hunspell/replist.cxx \ +- hunspell/suggestmgr.cxx \ +- singleapp/qtlocalpeer.cpp \ +- singleapp/qtlockedfile.cpp \ +- singleapp/qtsingleapplication.cpp \ +- singleapp/qtsinglecoreapplication.cpp \ + encodingprober/CharDistribution.cpp \ + encodingprober/ChineseGroupProber.cpp \ + encodingprober/JapaneseGroupProber.cpp \ +@@ -1167,7 +1133,6 @@ + DEFINES += DEBIAN_SPELLDIR + + INSTALLS = target +-SOURCES += singleapp/qtlockedfile_unix.cpp + + utilities.files = doc/doc10.png \ + doc/doc11.png \ +--- texmakerapp.h.orig 2022-05-03 07:23:14.167783607 -0500 ++++ texmakerapp.h 2022-05-03 07:23:28.039205209 -0500 +@@ -17,7 +17,7 @@ + + #include + #include "texmaker.h" +-#include "singleapp/qtsingleapplication.h" ++#include + + class TexmakerApp : public QtSingleApplication + { diff --git a/texmaker-5.1.3-viewfiles.patch b/texmaker-5.1.3-viewfiles.patch new file mode 100644 index 0000000..250f0ec --- /dev/null +++ b/texmaker-5.1.3-viewfiles.patch @@ -0,0 +1,34 @@ +--- texmaker.cpp.orig 2022-05-03 07:26:20.198440252 -0500 ++++ texmaker.cpp 2022-05-03 07:27:55.747347581 -0500 +@@ -5234,28 +5234,10 @@ + metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString(); + // xdvi %.dvi -sourceposition @:%.tex + // kdvi "file:%.dvi#src:@ %.tex" +-switch (desktop_env) +- { +- case 1: +- { +- viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString(); +- viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString(); +- viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString(); +- }break; +- case 2: +- { +- viewdvi_command=config->value("Tools/Dvi","kdvi %.dvi").toString(); +- viewps_command=config->value("Tools/Ps","kghostview %.ps").toString(); +- viewpdf_command=config->value("Tools/Pdf","kpdf %.pdf").toString(); +- }break; +- case 3: +- { +- viewdvi_command=config->value("Tools/Dvi","okular %.dvi").toString(); +- viewps_command=config->value("Tools/Ps","okular %.ps").toString(); +- viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString(); +- }break; +- } + ++viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString(); ++viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString(); ++viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString(); + + + ghostscript_command=config->value("Tools/Ghostscript","gs").toString(); diff --git a/texmaker.spec b/texmaker.spec index 1d20ba6..32b99d1 100644 --- a/texmaker.spec +++ b/texmaker.spec @@ -1,6 +1,6 @@ Summary: LaTeX editor Name: texmaker -Version: 5.1.2 +Version: 5.1.3 Release: %{autorelease} Epoch: 1 License: GPLv2+ @@ -28,10 +28,10 @@ Requires: tetex-dvipost # setup the .pro file to unbundle qtsingleapplication and hunspell # also fixes a single header file to use system singleapp -Patch0: %{name}-5.1.0-unbundle-qtsingleapp.patch +Patch0: %{name}-%{version}-unbundle-qtsingleapp.patch # fix header files to use system hunspell -Patch1: %{name}-5.1.0-unbundle-hunspell.patch +Patch1: %{name}-%{version}-unbundle-hunspell.patch # use system pdf viewers instead of hardcoded evince Patch2: %{name}-%{version}-viewfiles.patch