1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

editors/texstudio:

- Update it to 2.8.8
- Add missing Qt component

PR:		195795
Submitted by:	Abilio Marques (maintainer)
This commit is contained in:
Max Brazhnikov 2014-12-10 22:03:50 +00:00
parent 1ef33079b3
commit 334b43b730
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=374491
5 changed files with 47 additions and 37 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= texstudio
PORTVERSION= 2.8.6
PORTVERSION= 2.8.8
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
@ -14,7 +14,7 @@ LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler \
USES= desktop-file-utils dos2unix execinfo pkgconfig qmake
DOS2UNIX_FILES= ${PORTNAME}.pro
USE_GHOSTSCRIPT_RUN= yes
USE_QT4= gui network script svg xml \
USE_QT4= gui network script svg xml iconengines_run \
designer_build moc_build rcc_build uic_build
USE_TEX= latex dvipsk
INSTALLS_ICONS= yes

View File

@ -1,2 +1,2 @@
SHA256 (texstudio-2.8.6.tar.gz) = b665040c34ad6cd98d8f6e041393028f115da4dfb5bb8829b49dfa5a96fa755f
SIZE (texstudio-2.8.6.tar.gz) = 25183578
SHA256 (texstudio-2.8.8.tar.gz) = 5d00c42425c0d1464438c0c1701508fef281f5dbdd0fbcebdbba9de60ac6db95
SIZE (texstudio-2.8.8.tar.gz) = 25198033

View File

@ -1,6 +1,6 @@
--- debughelper.cpp.orig 2014-11-22 19:10:03.000000000 -0430
+++ debughelper.cpp 2014-11-22 19:12:01.000000000 -0430
@@ -107,6 +107,7 @@
--- debughelper.cpp.orig 2014-12-04 18:53:50 UTC
+++ debughelper.cpp
@@ -107,6 +107,7 @@ struct SimulatedCPU {
//===========================CRASH HANDLER HEADER==============================
#ifdef OS_IS_UNIX_LIKE
@ -8,25 +8,35 @@
#include "unistd.h"
#include "sys/wait.h"
#define SAFE_INT volatile sig_atomic_t
@@ -472,11 +473,19 @@
#include "pthread.h"
@@ -473,13 +474,25 @@ void print_backtrace(const QString& mess
#define USE_SIGNAL_HANDLER
-#ifdef CPU_IS_X86_64
+#if (defined(__FreeBSD__) && defined(CPU_IS_X86_64))
+#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rip
+#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rsp
+#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rbp
+#elif (defined(__FreeBSD__) && defined(CPU_IS_X86_32))
+#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_eip
+#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_esp
+#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_ebp
+#elif (!defined(__FreeBSD__) && defined(CPU_IS_X86_64))
#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RIP]
#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RSP]
#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RBP]
-#elif defined(CPU_IS_X86_32)
+#elif (!defined(__FreeBSD__) && defined(CPU_IS_X86_32))
#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EIP]
#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_ESP]
#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EBP]
#ifdef CPU_IS_X86_64
-#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RIP]
-#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RSP]
-#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RBP]
+ #if defined(__FreeBSD__)
+ #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rip
+ #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rsp
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_rbp
+ #else
+ #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RIP]
+ #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RSP]
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_RBP]
+ #endif
#elif defined(CPU_IS_X86_32)
-#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EIP]
-#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_ESP]
-#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EBP]
+ #if defined(__FreeBSD__)
+ #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_eip
+ #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_esp
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.mc_ebp
+ #else
+ #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EIP]
+ #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_ESP]
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gregs[REG_EBP]
+ #endif
#elif defined(CPU_IS_PPC)
#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[32]
#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[1]

View File

@ -1,12 +1,13 @@
--- texstudio.pro.orig 2014-11-22 18:10:47.000000000 -0430
+++ texstudio.pro 2014-11-22 18:11:56.000000000 -0430
@@ -529,7 +529,8 @@
unix {
LIBS += -L/usr/lib \
- -lz
+ -lz \
+ -lexecinfo
--- texstudio.pro.orig 2014-12-10 21:27:10 UTC
+++ texstudio.pro
@@ -531,6 +531,10 @@ unix {
-lz
}
+freebsd-* {
+ LIBS += -lexecinfo
+}
+
# ################################
# Poppler PDF Preview, will only be used if NO_POPPLER_PREVIEW is not set
isEmpty(NO_POPPLER_PREVIEW) {

View File

@ -134,5 +134,4 @@ share/icons/hicolor/scalable/apps/texstudio.svg
%%DATADIR%%/thesaurus.png
%%DATADIR%%/usermanual.css
%%DATADIR%%/usermanual_en.html
%%DATADIR%%/usermanual_fr.html
%%DATADIR%%/wizard_figure.png