Fixed build and upstream URL

This commit is contained in:
hannes 2018-02-20 13:04:19 +01:00
parent e9f76f9674
commit 4dcc51fa59
2 changed files with 20 additions and 1 deletions

View File

@ -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

View File

@ -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