From 9d3f804179ea22a83c744fb54ff224ecb416e5c1 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 20 Apr 2018 14:30:25 +0200 Subject: [PATCH] texstudio: update to 2.12.8 --- srcpkgs/texstudio/patches/10-arm-debug.patch | 4 +- .../texstudio/patches/11-musl-backtrace.patch | 23 --------- .../patches/12-aarch64-backtrace.patch | 8 ++-- .../patches/30-disable-auto-update.patch | 8 ++-- .../texstudio/patches/31-fix-desktop.patch | 10 ++-- .../patches/40-fix-struct-view.patch | 48 +++++++++++++++++++ srcpkgs/texstudio/template | 19 ++++---- srcpkgs/texstudio/update | 1 - 8 files changed, 73 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/texstudio/patches/11-musl-backtrace.patch create mode 100644 srcpkgs/texstudio/patches/40-fix-struct-view.patch delete mode 100644 srcpkgs/texstudio/update diff --git a/srcpkgs/texstudio/patches/10-arm-debug.patch b/srcpkgs/texstudio/patches/10-arm-debug.patch index 44906a37a42..9557f730648 100644 --- a/srcpkgs/texstudio/patches/10-arm-debug.patch +++ b/srcpkgs/texstudio/patches/10-arm-debug.patch @@ -1,5 +1,5 @@ ---- debughelper.cpp 2016-10-11 22:02:43.000000000 +0200 -+++ debughelper.cpp 2016-11-25 12:47:39.937086819 +0100 +--- src/debughelper.cpp 2016-10-11 22:02:43.000000000 +0200 ++++ src/debughelper.cpp 2016-11-25 12:47:39.937086819 +0100 @@ -511,16 +511,16 @@ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[31] //not always used #define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[34] diff --git a/srcpkgs/texstudio/patches/11-musl-backtrace.patch b/srcpkgs/texstudio/patches/11-musl-backtrace.patch deleted file mode 100644 index 0728c599215..00000000000 --- a/srcpkgs/texstudio/patches/11-musl-backtrace.patch +++ /dev/null @@ -1,23 +0,0 @@ -# musl libc doesn't provide and therefore no backtrace functionality ---- debughelper.cpp 2016-11-25 13:37:11.403938371 +0100 -+++ debughelper.cpp 2016-11-25 18:42:49.939675125 +0100 -@@ -3,6 +3,9 @@ - #include "smallUsefulFunctions.h" - #include - #include -+#ifndef __GLIBC__ -+#define NO_CRASH_HANDLER -+#endif - #ifndef NO_CRASH_HANDLER - #if (defined(x86_64) || defined(__x86_64__)) - #define CPU_IS_X86_64 -@@ -409,7 +412,9 @@ - } - - #else -+// # ifdef __GLIBC__ - #include "execinfo.h" -+// # endif - QString temporaryFileNameFormat() - { - return "/tmp/texstudio_backtrace%1.txt"; diff --git a/srcpkgs/texstudio/patches/12-aarch64-backtrace.patch b/srcpkgs/texstudio/patches/12-aarch64-backtrace.patch index f6faf92368e..72c99ec0393 100644 --- a/srcpkgs/texstudio/patches/12-aarch64-backtrace.patch +++ b/srcpkgs/texstudio/patches/12-aarch64-backtrace.patch @@ -1,12 +1,12 @@ ---- debughelper.cpp 2016-11-25 18:45:18.441818593 +0100 -+++ debughelper.cpp. 2016-11-25 18:45:31.166659511 +0100 -@@ -6,6 +6,9 @@ +--- src/debughelper.cpp ++++ src/debughelper.cpp +@@ -8,6 +8,9 @@ #ifndef __GLIBC__ #define NO_CRASH_HANDLER #endif +#ifdef __aarch64__ +#define NO_CRASH_HANDLER +#endif + #ifndef NO_CRASH_HANDLER #if (defined(x86_64) || defined(__x86_64__)) - #define CPU_IS_X86_64 diff --git a/srcpkgs/texstudio/patches/30-disable-auto-update.patch b/srcpkgs/texstudio/patches/30-disable-auto-update.patch index d4edb364457..b8df055e5de 100644 --- a/srcpkgs/texstudio/patches/30-disable-auto-update.patch +++ b/srcpkgs/texstudio/patches/30-disable-auto-update.patch @@ -1,7 +1,7 @@ #initially based on debian's patch: https://sources.debian.net/patches/texstudio/2.11.2+debian-1/ #modification: in Settings menu: disable whole groupBox instead of all single elements ---- configdialog.ui -+++ configdialog.ui +--- src/configdialog.ui ++++ src/configdialog.ui @@ -485,6 +485,9 @@ @@ -13,8 +13,8 @@ Update ---- configmanager.cpp 2016-10-11 22:02:43.000000000 +0200 -+++ configmanager.cpp 2016-11-09 12:56:50.392812690 +0100 +--- src/configmanager.cpp ++++ src/configmanager.cpp @@ -477,7 +477,7 @@ registerOption("Thesaurus/Database", &thesaurus_database, "", &pseudoDialog->comboBoxThesaurusFileName); diff --git a/srcpkgs/texstudio/patches/31-fix-desktop.patch b/srcpkgs/texstudio/patches/31-fix-desktop.patch index 3127c22837e..815d0034f29 100644 --- a/srcpkgs/texstudio/patches/31-fix-desktop.patch +++ b/srcpkgs/texstudio/patches/31-fix-desktop.patch @@ -5,19 +5,19 @@ --- utilities/texstudio.desktop +++ utilities/texstudio.desktop -@@ -1,13 +1,12 @@ +@@ -1,5 +1,5 @@ [Desktop Entry] -Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc; --Encoding=UTF-8 +Categories=Office;Publishing; Exec=texstudio %F GenericName=LaTeX Editor - GenericName[fr]=Editeur LaTeX - Comment=LaTeX development environment + GenericName[de]=LaTeX Editor +@@ -8,7 +8,7 @@ + Comment[de]=LaTeX Entwicklungsumgebung Comment[fr]=Environnement de développement LaTeX -+Keywords=editor;latex;pdflatex;xelatex;lualatex;context;bibtex;tex; Icon=texstudio -Keywords=LaTeX;TeX;editor; ++Keywords=LaTeX;TeX;editor;pdflatex;xelatex;lualatex;context;bibtex; MimeType=text/x-tex; Name=TeXstudio StartupNotify=false diff --git a/srcpkgs/texstudio/patches/40-fix-struct-view.patch b/srcpkgs/texstudio/patches/40-fix-struct-view.patch new file mode 100644 index 00000000000..d65d692434f --- /dev/null +++ b/srcpkgs/texstudio/patches/40-fix-struct-view.patch @@ -0,0 +1,48 @@ +source: https://github.com/texstudio-org/texstudio/commit/4cf5c2eb2a8a0353335c0ed6d6be4b3f19c950c3.patch + +From 4cf5c2eb2a8a0353335c0ed6d6be4b3f19c950c3 Mon Sep 17 00:00:00 2001 +From: "sunderme@gmx.de" +Date: Wed, 9 May 2018 22:41:16 +0200 +Subject: [PATCH] fix messed structureview with qt >=5.10 + +--- + src/latexdocument.cpp | 8 ++++---- + src/latexstructure.h | 1 - + 2 files changed, 4 insertions(+), 5 deletions(-) + +--- src/latexdocument.cpp ++++ src/latexdocument.cpp +@@ -358,8 +358,8 @@ void LatexDocument::patchStructureRemoval(QDocumentLineHandle *dlh) + } + } + +- //emit structureUpdated(this, newSection); +- emit setHighlightedEntry(newSection); ++ emit structureUpdated(this, newSection); ++ //emit setHighlightedEntry(newSection); + + if (bibTeXFilesNeedsUpdate) + emit updateBibTeXFiles(); +@@ -1176,8 +1176,8 @@ bool LatexDocument::patchStructure(int linenr, int count, bool recheck) + } + } + +- //emit structureUpdated(this, newSection); +- emit setHighlightedEntry(newSection); ++ emit structureUpdated(this, newSection); ++ //emit setHighlightedEntry(newSection); + } + StructureEntry *se; + foreach (se, MapOfTodo.values()) + + +--- src/latexstructure.h ++++ src/latexstructure.h +@@ -114,7 +114,6 @@ + bool getSingleDocMode(); + void moveDocs(int from, int to); + +-public slots: + void setHighlightedEntry(StructureEntry *entry); + + private slots: diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index 9cc62f527c5..7c4a8d86139 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -1,19 +1,20 @@ # Template file for 'texstudio' pkgname=texstudio -version=2.12.6 +version=2.12.8 revision=1 build_style=qmake -wrksrc=${pkgname}${version} +configure_args="NO_TESTS=true $(vopt_if phonon PHONON=true) + $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)" +hostmakedepends="pkg-config qt5-qmake" +makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel + $(vopt_if phonon phonon-qt5-devel) $(vopt_if poppler poppler-qt5-devel)" +depends="qt5-svg" short_desc="Powerful Tex/LaTeX editor based on texmaker" maintainer="Piraty " license="GPL-2" -homepage="http://texstudio.org/" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/TeXstudio%20${version}/${pkgname}-${version}.tar.gz" -checksum=cdae8c9f3fa84af2424cfef6d4a3abb2437cc71ecb24c1883e4ecca2f2693da3 -configure_args="NO_TESTS=true $(vopt_if phonon PHONON=true) $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)" -hostmakedepends="pkg-config qt5-qmake" -makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel $(vopt_if phonon phonon-qt5-devel) $(vopt_if poppler poppler-qt5-devel)" -depends="qt5-svg" +homepage="https://texstudio.org/" +distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz" +checksum=3dec30ded3f36bb0591f8ed1b78b86fa23f276f5744925bc91075715c3f58062 build_options="phonon poppler" desc_option_phonon="build with phonon support" diff --git a/srcpkgs/texstudio/update b/srcpkgs/texstudio/update deleted file mode 100644 index ff2cd1142e4..00000000000 --- a/srcpkgs/texstudio/update +++ /dev/null @@ -1 +0,0 @@ -pattern='TeXstudio \K[\d.]+(?=)'