texstudio: update to 2.12.8

This commit is contained in:
Piraty 2018-04-20 14:30:25 +02:00 committed by Leah Neukirchen
parent 175dec7eed
commit 9d3f804179
8 changed files with 73 additions and 48 deletions

View File

@ -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]

View File

@ -1,23 +0,0 @@
# musl libc doesn't provide <execinfo.h> 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 <stdio.h>
#include <stdlib.h>
+#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";

View File

@ -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

View File

@ -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 @@
</item>
<item>
@ -13,8 +13,8 @@
<string>Update</string>
</property>
--- 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, "<dic not found>", &pseudoDialog->comboBoxThesaurusFileName);

View File

@ -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

View File

@ -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" <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:

View File

@ -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 <piraty1@inbox.ru>"
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"

View File

@ -1 +0,0 @@
pattern='<strong>TeXstudio \K[\d.]+(?=</strong>)'