From owner-svn-ports-head@freebsd.org Mon Aug 24 21:00:39 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A98B9C156A; Mon, 24 Aug 2015 21:00:39 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6B4F71062; Mon, 24 Aug 2015 21:00:39 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7OL0dXM031469; Mon, 24 Aug 2015 21:00:39 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7OL0d8v031467; Mon, 24 Aug 2015 21:00:39 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201508242100.t7OL0d8v031467@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Mon, 24 Aug 2015 21:00:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395189 - in head/editors/texstudio: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2015 21:00:39 -0000 Author: makc Date: Mon Aug 24 21:00:38 2015 New Revision: 395189 URL: https://svnweb.freebsd.org/changeset/ports/395189 Log: editors/texstudio: - Add patch to fix build on armv6 [1,2] - Add option to build with Qt 4 or 5, enable Qt 5 by default [2] - Remove needless INSTALLS_ICONS PR: 199487 [1] Reported by: Ulrich Grey Patch by: mikael.urankar@gmail.com PR: 202511 [2] Submitted by: Abilio Marques (maintainer) Added: head/editors/texstudio/files/ head/editors/texstudio/files/patch-debughelper.cpp (contents, props changed) Modified: head/editors/texstudio/Makefile Modified: head/editors/texstudio/Makefile ============================================================================== --- head/editors/texstudio/Makefile Mon Aug 24 20:55:40 2015 (r395188) +++ head/editors/texstudio/Makefile Mon Aug 24 21:00:38 2015 (r395189) @@ -2,26 +2,38 @@ PORTNAME= texstudio PORTVERSION= 2.9.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION} MAINTAINER= abiliojr@gmail.com -COMMENT= Integrated writing environment for creating LaTeX documents +COMMENT= Integrated writing environment for LaTeX documents -LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler \ - libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 +LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler 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_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' \ Added: head/editors/texstudio/files/patch-debughelper.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/texstudio/files/patch-debughelper.cpp Mon Aug 24 21:00:38 2015 (r395189) @@ -0,0 +1,19 @@ +--- 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?