added patch to fix arm build
This commit is contained in:
parent
3db42289f6
commit
c06419ce4a
35
texstudio-debughelper-arm-fix.patch
Normal file
35
texstudio-debughelper-arm-fix.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 7f41bb239a89d1e66e954577d03b92373ad4da0e Mon Sep 17 00:00:00 2001
|
||||||
|
From: hannes <hannes@fedoraproject.org>
|
||||||
|
Date: Sun, 13 Sep 2015 16:40:51 +0200
|
||||||
|
Subject: [PATCH 3/3] debughelper arm fix
|
||||||
|
|
||||||
|
---
|
||||||
|
debughelper.cpp | 8 ++------
|
||||||
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/debughelper.cpp b/debughelper.cpp
|
||||||
|
index 4b14ae3..f07c48e 100644
|
||||||
|
--- a/debughelper.cpp
|
||||||
|
+++ b/debughelper.cpp
|
||||||
|
@@ -501,16 +501,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.4.3
|
||||||
|
|
@ -14,6 +14,7 @@ Source1: texstudio.desktop
|
|||||||
Patch0: texstudio-use-system-hunspell-instead-of-bundled-one.patch
|
Patch0: texstudio-use-system-hunspell-instead-of-bundled-one.patch
|
||||||
Patch1: texstudio-viewers-use-xdg-open.patch
|
Patch1: texstudio-viewers-use-xdg-open.patch
|
||||||
Patch2: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
Patch2: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
||||||
|
Patch3: texstudio-debughelper-arm-fix.patch.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
@ -50,6 +51,7 @@ so it keeps it look&feel.
|
|||||||
%patch0 -p1 -b .hunspell
|
%patch0 -p1 -b .hunspell
|
||||||
%patch1 -p1 -b .xdg
|
%patch1 -p1 -b .xdg
|
||||||
%patch2 -p1 -b .qtsingle
|
%patch2 -p1 -b .qtsingle
|
||||||
|
%patch3 -p1 -b .arm
|
||||||
|
|
||||||
rm -rf {hunspell,qtsingleapplication}
|
rm -rf {hunspell,qtsingleapplication}
|
||||||
|
|
||||||
@ -131,6 +133,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
|
|||||||
%changelog
|
%changelog
|
||||||
* Fri Sep 11 2015 Johannes Lips <hannes@fedoraproject.org> 2.10.0-1
|
* Fri Sep 11 2015 Johannes Lips <hannes@fedoraproject.org> 2.10.0-1
|
||||||
- Update to latest upstream version 2.10.0
|
- Update to latest upstream version 2.10.0
|
||||||
|
- added patch to fix arm build #1262987
|
||||||
|
|
||||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.4-4
|
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.4-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user