Attachment #160136 for bug #202511

View | Details | Raw Unified | Return to bug 202511
Collapse All | Expand All





PORTNAME=	texstudio
PORTVERSION=	2.9.4
PORTREVISION=	2
CATEGORIES=	editors
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}

MAINTAINER=	abiliojr@gmail.com
COMMENT=	Integrated writing environment for LaTeX documents

LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4

USES=		desktop-file-utils dos2unix execinfo ghostscript:run \
		pkgconfig qmake
DOS2UNIX_FILES=	${PORTNAME}.pro

_USE_QT4=	gui network script svg xml \
		iconengines_run designer_build moc_build rcc_build uic_build
_USE_QT5=	gui network script svg xml \
		printsupport concurrent uitools buildtools_build

USE_TEX=	latex dvipsk
INSTALLS_ICONS=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}

OPTIONS_SINGLE=		TOOLKIT
OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
OPTIONS_DEFAULT=	QT5

TOOLKIT_DESC=	Qt toolkit
QT4_USE=	${_USE_QT4:S/^/QT4=/}
QT4_LIB_DEPENDS=libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
QT5_USE=	${_USE_QT5:S/^/QT5=/}
QT5_LIB_DEPENDS=libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5



post-patch:
	@${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
		-e 's,/usr/include,${LOCALBASE}/include,g' \




--- debughelper.cpp.orig	2015-08-20 06:01:48.825027000 -0430
+++ debughelper.cpp	2015-08-20 06:02:55.614528000 -0430
@@ -499,10 +499,16 @@
 #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?

Return to bug 202511

Lines 2-27 Link Here

(-)Makefile (-6 / +21 lines)
2		2
3	PORTNAME= texstudio	3	PORTNAME= texstudio
4	PORTVERSION= 2.9.4	4	PORTVERSION= 2.9.4
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= editors	6	CATEGORIES= editors
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
8		8
9	MAINTAINER= abiliojr@gmail.com	9	MAINTAINER= abiliojr@gmail.com
10	COMMENT= Integrated writing environment for creating LaTeX documents	10	COMMENT= Integrated writing environment for LaTeX documents
11		11
12	LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler \	12	LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler
13	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
14		13
15	USES= desktop-file-utils dos2unix execinfo ghostscript:run \	14	USES= desktop-file-utils dos2unix execinfo ghostscript:run \
16	pkgconfig qmake	15	pkgconfig qmake
17	DOS2UNIX_FILES= ${PORTNAME}.pro	16	DOS2UNIX_FILES= ${PORTNAME}.pro
18	USE_QT4= gui network script svg xml iconengines_run \	17
19	designer_build moc_build rcc_build uic_build	18	_USE_QT4= gui network script svg xml \
		19	iconengines_run designer_build moc_build rcc_build uic_build
		20	_USE_QT5= gui network script svg xml \
		21	printsupport concurrent uitools buildtools_build
		22
20	USE_TEX= latex dvipsk	23	USE_TEX= latex dvipsk
21	INSTALLS_ICONS= yes	24	INSTALLS_ICONS= yes
22		25
23	WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}	26	WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
24		27
		28	OPTIONS_SINGLE= TOOLKIT
		29	OPTIONS_SINGLE_TOOLKIT= QT4 QT5
		30	OPTIONS_DEFAULT= QT5
		31
		32	TOOLKIT_DESC= Qt toolkit
		33	QT4_USE= ${_USE_QT4:S/^/QT4=/}
		34	QT4_LIB_DEPENDS=libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
		35	QT5_USE= ${_USE_QT5:S/^/QT5=/}
		36	QT5_LIB_DEPENDS=libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5
		37
		38
		39
25	post-patch:	40	post-patch:
26	@${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \	41	@${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
27	-e 's,/usr/include,${LOCALBASE}/include,g' \	42	-e 's,/usr/include,${LOCALBASE}/include,g' \

Line 0 Link Here

(-)files/patch-debughelper.cpp (+19 lines)
	1	--- debughelper.cpp.orig 2015-08-20 06:01:48.825027000 -0430
	2	+++ debughelper.cpp 2015-08-20 06:02:55.614528000 -0430
	3	@@ -499,10 +499,16 @@
	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?