Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Dec 2014 22:03:51 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r374491 - in head/editors/texstudio: . files
Message-ID:  <201412102203.sBAM3pQm045017@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Wed Dec 10 22:03:50 2014
New Revision: 374491
URL: https://svnweb.freebsd.org/changeset/ports/374491
QAT: https://qat.redports.org/buildarchive/r374491/

Log:
  editors/texstudio:
  - Update it to 2.8.8
  - Add missing Qt component
  
  PR:		195795
  Submitted by:	Abilio Marques (maintainer)

Modified:
  head/editors/texstudio/Makefile
  head/editors/texstudio/distinfo
  head/editors/texstudio/files/patch-debughelper.cpp
  head/editors/texstudio/files/patch-texstudio.pro
  head/editors/texstudio/pkg-plist

Modified: head/editors/texstudio/Makefile
==============================================================================
--- head/editors/texstudio/Makefile	Wed Dec 10 21:44:02 2014	(r374490)
+++ head/editors/texstudio/Makefile	Wed Dec 10 22:03:50 2014	(r374491)
@@ -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}/g
 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

Modified: head/editors/texstudio/distinfo
==============================================================================
--- head/editors/texstudio/distinfo	Wed Dec 10 21:44:02 2014	(r374490)
+++ head/editors/texstudio/distinfo	Wed Dec 10 22:03:50 2014	(r374491)
@@ -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

Modified: head/editors/texstudio/files/patch-debughelper.cpp
==============================================================================
--- head/editors/texstudio/files/patch-debughelper.cpp	Wed Dec 10 21:44:02 2014	(r374490)
+++ head/editors/texstudio/files/patch-debughelper.cpp	Wed Dec 10 22:03:50 2014	(r374491)
@@ -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]

Modified: head/editors/texstudio/files/patch-texstudio.pro
==============================================================================
--- head/editors/texstudio/files/patch-texstudio.pro	Wed Dec 10 21:44:02 2014	(r374490)
+++ head/editors/texstudio/files/patch-texstudio.pro	Wed Dec 10 22:03:50 2014	(r374491)
@@ -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) {

Modified: head/editors/texstudio/pkg-plist
==============================================================================
--- head/editors/texstudio/pkg-plist	Wed Dec 10 21:44:02 2014	(r374490)
+++ head/editors/texstudio/pkg-plist	Wed Dec 10 22:03:50 2014	(r374491)
@@ -134,5 +134,4 @@ share/icons/hicolor/scalable/apps/texstu
 %%DATADIR%%/thesaurus.png
 %%DATADIR%%/usermanual.css
 %%DATADIR%%/usermanual_en.html
-%%DATADIR%%/usermanual_fr.html
 %%DATADIR%%/wizard_figure.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412102203.sBAM3pQm045017>