diff --git a/texstudio-debughelper-arm-fix.patch b/texstudio-debughelper-arm-fix.patch index aa950c8..9a291d2 100644 --- a/texstudio-debughelper-arm-fix.patch +++ b/texstudio-debughelper-arm-fix.patch @@ -24,6 +24,25 @@ index 2918b43..74b94bc 100644 #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? +--- a/src/debughelper.cpp ++++ b/src/debughelper.cpp +@@ -517,7 +517,7 @@ 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 +@@ -1111,6 +1111,7 @@ void SimulatedCPU::set_from_real() + #else + #error Unknown processor architecture + #endif ++#undef geteip + geteip: + this->pc = (char *) && geteip; + } -- 2.14.3 diff --git a/texstudio.spec b/texstudio.spec index ef0f767..218a8ff 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -9,7 +9,7 @@ Group: Applications/Publishing License: GPLv2+ and GPLv3 URL: https://www.texstudio.org -Source0: https://github.com/texstudio-org/texstudio/archive/%{version}.tar.gz +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