Attachment 158036 Details for Bug 201092 – The patch.

[patch] The patch.

texstudio-2.9.4.diff (text/plain), 3.53 KB, created by Sergey Brunov on 2015-06-24 10:56:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Brunov

Created: 2015-06-24 10:56:44 UTC

Size: 3.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 390475)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	texstudio
>-PORTVERSION=	2.8.8
>-PORTREVISION=	1
>+PORTVERSION=	2.9.4
> CATEGORIES=	editors
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 390475)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (texstudio-2.8.8.tar.gz) = 5d00c42425c0d1464438c0c1701508fef281f5dbdd0fbcebdbba9de60ac6db95
>-SIZE (texstudio-2.8.8.tar.gz) = 25198033
>+SHA256 (texstudio-2.9.4.tar.gz) = dc71590e3745ac193a640667737befd665d549e642e268eec7a8238d3b61b5ea
>+SIZE (texstudio-2.9.4.tar.gz) = 25292627
>Index: files/patch-debughelper.cpp
>===================================================================
>--- files/patch-debughelper.cpp	(revision 390475)
>+++ files/patch-debughelper.cpp	(working copy)
>@@ -1,42 +0,0 @@
>---- 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
>-+#include "signal.h"
>- #include "unistd.h"
>- #include "sys/wait.h"
>- #define SAFE_INT volatile sig_atomic_t
>-@@ -473,13 +474,25 @@ void print_backtrace(const QString& mess
>- 
>- #define USE_SIGNAL_HANDLER
>- #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]
>Index: files/patch-texstudio.pro
>===================================================================
>--- files/patch-texstudio.pro	(revision 390475)
>+++ files/patch-texstudio.pro	(working copy)
>@@ -1,13 +0,0 @@
>---- 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) {

Actions: View | Diff

Attachments on bug 201092: 158036