Update to 3.0.0
This commit is contained in:
hannes
parent
254f04e735
commit
666b925ed2
|
|
@ -1,36 +0,0 @@
|
|||
From b0cf44fde92b66fbaefceb643b6124bc5bf0b087 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Sun, 11 Feb 2018 07:39:00 +0100
|
||||
Subject: [PATCH 2/2] armfix
|
||||
|
||||
---
|
||||
src/debughelper.cpp | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/debughelper.cpp b/src/debughelper.cpp
|
||||
index 2918b43..74b94bc 100644
|
||||
--- 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]
|
||||
#elif defined(CPU_IS_ARM)
|
||||
-/*
|
||||
+
|
||||
#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_pc
|
||||
#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_sp
|
||||
#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_fp
|
||||
#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_lr
|
||||
-*/
|
||||
-#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R15]
|
||||
-#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R13]
|
||||
-#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R11]
|
||||
-#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R14]
|
||||
+
|
||||
#elif defined(CPU_IS_IA64)
|
||||
#define PC_FROM_UCONTEXT(context) (context)->_u._mc.sc_ip
|
||||
#define STACK_FROM_UCONTEXT(context) (context)->_u._mc.sc_gr[12] //is that register 12?
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 40c8d06b99065e79045ed0371b025c5ab7d6b065 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Mon, 30 May 2016 21:44:02 +0200
|
||||
Subject: [PATCH] hunspell-patch
|
||||
|
||||
---
|
||||
texstudio.pro | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index d479d11..5410558 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -480,7 +480,7 @@ unix {
|
||||
|
||||
isEmpty(USE_SYSTEM_HUNSPELL){
|
||||
DEFINES += HUNSPELL_STATIC
|
||||
- include(hunspell/hunspell.pri)
|
||||
+ include(hunspell.pri)
|
||||
} else {
|
||||
CONFIG += link_pkgconfig
|
||||
PKGCONFIG += hunspell
|
||||
@@ -610,3 +610,9 @@ else {
|
||||
QMAKE_LFLAGS -= -Wl,-s
|
||||
QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
}
|
||||
+# enable use of pkgconfig
|
||||
+unix {
|
||||
+ CONFIG += link_pkgconfig
|
||||
+ # use system hunspell
|
||||
+ PKGCONFIG += hunspell
|
||||
+}
|
||||
--
|
||||
2.5.5
|
||||
|
||||
|
|
@ -1,31 +1,29 @@
|
|||
From 57ac2462153cb86f149e6509047b8044d60133a6 Mon Sep 17 00:00:00 2001
|
||||
From bdd7b1385d47af230bc3bdd788d37527f3a8cf35 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Thu, 26 Dec 2019 11:43:04 +0100
|
||||
Subject: [PATCH] qtsingle_patch
|
||||
Date: Tue, 25 Aug 2020 20:31:22 +0200
|
||||
Subject: [PATCH 1/2] qtsingle
|
||||
|
||||
---
|
||||
texstudio.pro | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
texstudio.pro | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index 87b6d25..88b115d 100644
|
||||
index 05eb87f..b23f7e6 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -42,7 +42,13 @@ QT += \
|
||||
@@ -100,7 +100,11 @@ isEmpty(INTERNAL_TERMINAL):pkgAtLeastVersion("qtermwidget5", "0.9.0") {
|
||||
message(Use experimental JS engine)
|
||||
}
|
||||
|
||||
contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
|
||||
-else:include(src/qtsingleapplication/qtsingleapplication.pri)
|
||||
+else: {
|
||||
-include(src/qtsingleapplication/qtsingleapplication.pri)
|
||||
+isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){
|
||||
+include(qtsingleapplication/qtsingleapplication.pri)
|
||||
+ include(qtsingleapplication/qtsingleapplication.pri)
|
||||
+} else {
|
||||
+CONFIG += qtsingleapplication
|
||||
+}
|
||||
+ CONFIG += qtsingleapplication
|
||||
+}
|
||||
|
||||
# ##############################
|
||||
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
|
||||
--
|
||||
2.24.1
|
||||
2.26.2
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,17 @@ Subject: [PATCH 2/2] debughelper
|
|||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index 88b115d..6de000f 100644
|
||||
index b23f7e6..77b0397 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -442,14 +442,14 @@ exists(./.git) {
|
||||
@@ -414,15 +414,14 @@ exists(./.git) {
|
||||
}
|
||||
|
||||
!win32-msvc*: {
|
||||
QMAKE_CXXFLAGS_DEBUG -= -O -O1 -O2 -O3
|
||||
- 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
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
- !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku
|
||||
- else {
|
||||
- QMAKE_CXXFLAGS += -gstabs -g
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Name: texstudio
|
||||
Version: 2.12.22
|
||||
Release: 3%{?dist}
|
||||
Version: 3.0.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A feature-rich editor for LaTeX documents
|
||||
# texstudio binary: GPLv3 due to static linkage of bundled qcodeedit
|
||||
|
|
@ -11,10 +11,9 @@ URL: https://www.texstudio.org
|
|||
Source0: https://github.com/texstudio-org/texstudio#/archive/%{name}-%{version}.tar.gz
|
||||
Source1: texstudio.desktop
|
||||
Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
||||
Patch2: texstudio-debughelper-arm-fix.patch
|
||||
Patch3: texstudio-disable-update-check.patch
|
||||
Patch2: texstudio-disable-update-check.patch
|
||||
# don't muck with default build flags
|
||||
Patch4: texstudio-wtf_flags.patch
|
||||
Patch3: texstudio-wtf_flags.patch
|
||||
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qttools-devel
|
||||
|
|
@ -52,9 +51,8 @@ so it keeps it look&feel.
|
|||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p1 -b .qtsingle
|
||||
%patch2 -p1 -b .arm
|
||||
%patch3 -p1 -b .update_check
|
||||
%patch4 -p1 -b .wtf_flags
|
||||
%patch2 -p1 -b .update_check
|
||||
%patch3 -p1 -b .wtf_flags
|
||||
|
||||
rm -rf {hunspell,qtsingleapplication,quazip}
|
||||
|
||||
|
|
@ -113,13 +111,16 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
|
|||
%{_datadir}/texstudio/th_*.dat
|
||||
%{_datadir}/texstudio/usermanual_*.html
|
||||
%{_datadir}/applications/texstudio.desktop
|
||||
%{_datadir}/appdata/texstudio.appdata.xml
|
||||
%{_datadir}/metainfo/texstudio.appdata.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||
%{_datadir}/icons/hicolor/*/apps/*.svg
|
||||
|
||||
%doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
|
||||
|
||||
%changelog
|
||||
* Tue Aug 25 2020 Johannes Lips <hannes@fedoraproject.org> 3.0.0-1
|
||||
- Update to latest upstream release 3.0.0
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.22-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue