From c06419ce4aa0fb999966c3ae8f2f860a2a92996d Mon Sep 17 00:00:00 2001 From: hannes Date: Tue, 15 Sep 2015 07:01:42 +0200 Subject: [PATCH] added patch to fix arm build --- texstudio-debughelper-arm-fix.patch | 35 +++++++++++++++++++++++++++++ texstudio.spec | 3 +++ 2 files changed, 38 insertions(+) create mode 100644 texstudio-debughelper-arm-fix.patch diff --git a/texstudio-debughelper-arm-fix.patch b/texstudio-debughelper-arm-fix.patch new file mode 100644 index 0000000..ccbe6ce --- /dev/null +++ b/texstudio-debughelper-arm-fix.patch @@ -0,0 +1,35 @@ +From 7f41bb239a89d1e66e954577d03b92373ad4da0e Mon Sep 17 00:00:00 2001 +From: hannes +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 + diff --git a/texstudio.spec b/texstudio.spec index e6123fa..527d35e 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -14,6 +14,7 @@ Source1: texstudio.desktop Patch0: texstudio-use-system-hunspell-instead-of-bundled-one.patch Patch1: texstudio-viewers-use-xdg-open.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) BuildRequires: qt5-qtbase-devel @@ -50,6 +51,7 @@ so it keeps it look&feel. %patch0 -p1 -b .hunspell %patch1 -p1 -b .xdg %patch2 -p1 -b .qtsingle +%patch3 -p1 -b .arm rm -rf {hunspell,qtsingleapplication} @@ -131,6 +133,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: %changelog * Fri Sep 11 2015 Johannes Lips 2.10.0-1 - Update to latest upstream version 2.10.0 +- added patch to fix arm build #1262987 * Fri Jun 19 2015 Fedora Release Engineering - 2.9.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild