Update to 2.12.18
This commit is contained in:
hannes
parent
39e080cd44
commit
e071c638a9
|
|
@ -9,8 +9,8 @@ Subject: [PATCH 2/2] armfix
|
|||
|
||||
diff --git a/src/debughelper.cpp b/src/debughelper.cpp
|
||||
index 2918b43..74b94bc 100644
|
||||
--- a/src/debughelper.cpp
|
||||
+++ b/src/debughelper.cpp
|
||||
--- a/src/debug/debughelper.cpp
|
||||
+++ b/src/debug/debughelper.cpp
|
||||
@@ -517,16 +517,12 @@ QString print_backtrace(const QString &message)
|
||||
#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]
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
From 5ba8c70f0c60e76b6b79b5025a61eb055b5695a7 Mon Sep 17 00:00:00 2001
|
||||
From 57ac2462153cb86f149e6509047b8044d60133a6 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Fri, 7 Jun 2019 17:33:08 +0200
|
||||
Subject: [PATCH] qtsingle
|
||||
Date: Thu, 26 Dec 2019 11:43:04 +0100
|
||||
Subject: [PATCH] qtsingle_patch
|
||||
|
||||
---
|
||||
texstudio.pro | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index e360316..17e4af8 100644
|
||||
index 87b6d25..88b115d 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -35,7 +35,13 @@ QT += \
|
||||
DEFINES += PHONON
|
||||
}
|
||||
contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
|
||||
-else:include(src/qtsingleapplication/qtsingleapplication.pri)
|
||||
+else: {
|
||||
+isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){
|
||||
+include(qtsingleapplication/qtsingleapplication.pri)
|
||||
+} else {
|
||||
+CONFIG += qtsingleapplication
|
||||
+}
|
||||
+}
|
||||
|
||||
# ##############################
|
||||
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
|
||||
@@ -42,7 +42,13 @@ QT += \
|
||||
}
|
||||
|
||||
contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
|
||||
-else:include(src/qtsingleapplication/qtsingleapplication.pri)
|
||||
+else: {
|
||||
+isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){
|
||||
+include(qtsingleapplication/qtsingleapplication.pri)
|
||||
+} else {
|
||||
+CONFIG += qtsingleapplication
|
||||
+}
|
||||
+}
|
||||
|
||||
# ##############################
|
||||
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
|
||||
--
|
||||
2.21.0
|
||||
2.24.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
From f36d3dbb8e2b7c8998d637eae493a0314942a21d Mon Sep 17 00:00:00 2001
|
||||
From 49be56617e3a720a0c93d1c8ff13f3c4dbd89471 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Fri, 7 Jun 2019 17:39:22 +0200
|
||||
Subject: [PATCH 2/2] wtf
|
||||
Date: Thu, 26 Dec 2019 11:46:48 +0100
|
||||
Subject: [PATCH 2/2] debughelper
|
||||
|
||||
---
|
||||
texstudio.pro | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index 17e4af8..a1e6390 100644
|
||||
index 88b115d..6de000f 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -420,14 +420,14 @@ exists(./.git) {
|
||||
}
|
||||
|
||||
!win32-msvc*: {
|
||||
- QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline
|
||||
+# QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline
|
||||
QMAKE_CXXFLAGS += -std=c++0x
|
||||
- !win32: QMAKE_LFLAGS += -rdynamic # option not supported by mingw
|
||||
- else {
|
||||
- QMAKE_CXXFLAGS += -gstabs -g
|
||||
- QMAKE_LFLAGS -= -Wl,-s
|
||||
- QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
- }
|
||||
+# !win32: QMAKE_LFLAGS += -rdynamic # option not supported by mingw
|
||||
+# else {
|
||||
+# QMAKE_CXXFLAGS += -gstabs -g
|
||||
+# QMAKE_LFLAGS -= -Wl,-s
|
||||
+# QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
+# }
|
||||
} else {
|
||||
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
}
|
||||
@@ -442,14 +442,14 @@ exists(./.git) {
|
||||
|
||||
!win32-msvc*: {
|
||||
QMAKE_CXXFLAGS_DEBUG -= -O -O1 -O2 -O3
|
||||
- QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0
|
||||
+# QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0
|
||||
QMAKE_CXXFLAGS += -std=c++0x
|
||||
- !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku
|
||||
- else {
|
||||
- QMAKE_CXXFLAGS += -gstabs -g
|
||||
- QMAKE_LFLAGS -= -Wl,-s
|
||||
- QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
- }
|
||||
+# !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku
|
||||
+# else {
|
||||
+# QMAKE_CXXFLAGS += -gstabs -g
|
||||
+# QMAKE_LFLAGS -= -Wl,-s
|
||||
+# QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
+# }
|
||||
} else {
|
||||
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.24.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Name: texstudio
|
||||
Version: 2.12.16
|
||||
Release: 2%{?dist}
|
||||
Version: 2.12.18
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A feature-rich editor for LaTeX documents
|
||||
# texstudio binary: GPLv3 due to static linkage of bundled qcodeedit
|
||||
|
|
@ -120,6 +120,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
|
|||
%doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
|
||||
|
||||
%changelog
|
||||
* Thu Dec 26 2019 Johannes Lips <hannes@fedoraproject.org> 2.12.18-1
|
||||
- Update to latest upstream bugfix release 2.12.18
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue