Attachment #162465 for bug #203841

Lines 1-8 Link Here

(-)Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= texstudio	3	PORTNAME= texstudio
4	PORTVERSION= 2.9.4	4	PORTVERSION= 2.10.4
5	PORTREVISION= 3
6	CATEGORIES= editors	5	CATEGORIES= editors
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}	6	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
8		7

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (texstudio-2.9.4.tar.gz) = dc71590e3745ac193a640667737befd665d549e642e268eec7a8238d3b61b5ea	1	SHA256 (texstudio-2.10.4.tar.gz) = 87e7b7c52d51791178fac4c48feeded7a920bc39bcfb710a745b467d80111c3c
2	SIZE (texstudio-2.9.4.tar.gz) = 25292627	2	SIZE (texstudio-2.10.4.tar.gz) = 25810583




--- debughelper.cpp.orig	2015-03-24 07:20:40 UTC
+++ debughelper.cpp
@@ -499,10 +499,16 @@ void print_backtrace(const QString& mess
 #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?

Lines 35-41 Link Here

(-)pkg-plist (-1 / +2 lines)
35	%%DATADIR%%/doc20.png	35	%%DATADIR%%/doc20.png
36	%%DATADIR%%/doc21.png	36	%%DATADIR%%/doc21.png
37	%%DATADIR%%/doc3.png	37	%%DATADIR%%/doc3.png
38	%%DATADIR%%/doc4.png
39	%%DATADIR%%/doc5.png	38	%%DATADIR%%/doc5.png
40	%%DATADIR%%/doc6.png	39	%%DATADIR%%/doc6.png
41	%%DATADIR%%/doc7.png	40	%%DATADIR%%/doc7.png
Lines 46-51 Link Here
46	%%DATADIR%%/en_GB.dic	45	%%DATADIR%%/en_GB.dic
47	%%DATADIR%%/en_US.aff	46	%%DATADIR%%/en_US.aff
48	%%DATADIR%%/en_US.dic	47	%%DATADIR%%/en_US.dic
		48	%%DATADIR%%/es_ES.aff
		49	%%DATADIR%%/es_ES.dic
49	%%DATADIR%%/fr.stopWords	50	%%DATADIR%%/fr.stopWords
50	%%DATADIR%%/fr_FR.aff	51	%%DATADIR%%/fr_FR.aff
51	%%DATADIR%%/fr_FR.dic	52	%%DATADIR%%/fr_FR.dic

Return to bug 203841

Lines 1-19 Link Here

(-)files/patch-debughelper.cpp (-19 lines)
1	--- debughelper.cpp.orig 2015-03-24 07:20:40 UTC
2	+++ debughelper.cpp
3	@@ -499,10 +499,16 @@ void print_backtrace(const QString& mess
4	#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[31] //not always used
5	#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[34]
6	#elif defined(CPU_IS_ARM)
7	+/*
8	#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_pc
9	#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_sp
10	#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_fp
11	#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_lr
12	+*/
13	+#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R15]
14	+#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R13]
15	+#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R11]
16	+#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R14]
17	#elif defined(CPU_IS_IA64)
18	#define PC_FROM_UCONTEXT(context) (context)->_u._mc.sc_ip
19	#define STACK_FROM_UCONTEXT(context) (context)->_u._mc.sc_gr[12] //is that register 12?