Attachment 149787 Details for Bug 195346 – [patch] svn diff for port update

[patch] [patch] svn diff for port update

texstudio-2.8.6.diff (text/plain), 10.77 KB, created by Abilio Marques on 2014-11-24 20:06:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Abilio Marques

Created: 2014-11-24 20:06:30 UTC

Size: 10.77 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 373345)
>+++ Makefile	(working copy)
>@@ -1,15 +1,14 @@
>-# Created by: lx
> # $FreeBSD$
> 
>-PORTNAME=	texmakerx
>-PORTVERSION=	2.1
>-PORTREVISION=	5
>+PORTNAME=	texstudio
>+PORTVERSION=	2.8.6
>+PORTREVISION=	0
> CATEGORIES=	editors
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
> DISTNAME=	${PORTNAME}-${PORTVERSION:S:.0::}
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	LaTeX IDE derived from Texmaker
>+MAINTAINER=	abiliojr@gmail.com
>+COMMENT=	Integrated writing environment for creating LaTeX documents.
> 
> LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
> 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
>@@ -17,6 +16,7 @@
> WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
> 
> USES=		dos2unix qmake
>+DOS2UNIX_REGEX=	.*\.(TXT|aff|bat|cpp|css|cwl|dic|filters|h|html|json|map|orig|pri|pro|qnfa|qxf|qxm|rc|sln|tex|txt|ui|vcproj|vcxproj|xml)
> USE_GHOSTSCRIPT_RUN=	yes
> USE_QT4=	gui network xml moc_build rcc_build \
> 		uic_build qtestlib script
>@@ -36,4 +36,5 @@
> 		-e 's,/usr/lib,${LOCALBASE}/lib,g' \
> 		${WRKSRC}/${PORTNAME}.pro
> 
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 373345)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (texmakerx-2.1.tar.gz) = 49e6bf7ffb5c2754861dbe9824255de4e6e5374e2f71e54e517cd57c3e31ba66
>-SIZE (texmakerx-2.1.tar.gz) = 11824680
>+SHA256 (texstudio-2.8.6.tar.gz) = b665040c34ad6cd98d8f6e041393028f115da4dfb5bb8829b49dfa5a96fa755f
>+SIZE (texstudio-2.8.6.tar.gz) = 25183578
>Index: files/patch-debughelper.cpp
>===================================================================
>--- files/patch-debughelper.cpp	(revision 0)
>+++ files/patch-debughelper.cpp	(working copy)
>@@ -0,0 +1,32 @@
>+--- 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 @@
>+ //===========================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
>+@@ -472,11 +473,19 @@
>+ #include "pthread.h"
>+ 
>+ #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]
>
>Property changes on: files/patch-debughelper.cpp
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-texstudio.pro
>===================================================================
>--- files/patch-texstudio.pro	(revision 0)
>+++ files/patch-texstudio.pro	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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
>+ }
>+ 
>+ # ################################
>
>Property changes on: files/patch-texstudio.pro
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 373345)
>+++ pkg-descr	(working copy)
>@@ -1,7 +1,8 @@
>-TexmakerX is a plain fork of the Free LaTeX IDE Texmaker. The editor
>-itself has been replaced with the more powerful QCodeEdit library,
>-giving you a lot of extended ways to write your documents. TexmakerX
>-extends the Texmaker editor to add new features like interactive
>-spellchecking and code folding.
>+TeXstudio is a fully featured LaTeX editor. Our goal is to make 
>+writing LaTeX documents as easy and comfortable as possible. 
>+Some of the outstanding features of TeXstudio are an integrated 
>+pdf viewer with (almost) word-level synchronization, live inline 
>+preview, advanced syntax-highlighting, live checking of references, 
>+citations, latex commands, spelling and grammar.  
> 
>-WWW: http://texmakerx.sourceforge.net/
>+WWW: http://texstudio.sourceforge.net/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 373345)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,24 @@
>-bin/texmakerx
>+%%QT_BINDIR%%/texstudio
>+share/applications/texstudio.desktop
>+share/icons/hicolor/scalable/apps/texstudio.svg
>+%%DATADIR%%/AUTHORS
>+%%DATADIR%%/CHANGELOG.txt
>+%%DATADIR%%/COPYING
>+%%DATADIR%%/block_selection.png
>+%%DATADIR%%/compile_toolbar.png
>+%%DATADIR%%/configure_build.png
>+%%DATADIR%%/configure_completion.png
>+%%DATADIR%%/configure_customToolbar.png
>+%%DATADIR%%/configure_customizeMenu.png
>+%%DATADIR%%/configure_editor.png
>+%%DATADIR%%/configure_general.png
>+%%DATADIR%%/configure_shortcuts.png
>+%%DATADIR%%/configure_svn.png
>+%%DATADIR%%/de.badWords
>+%%DATADIR%%/de.stopWords
>+%%DATADIR%%/de.stopWords.level2
>+%%DATADIR%%/de_DE.aff
>+%%DATADIR%%/de_DE.dic
> %%DATADIR%%/doc1.png
> %%DATADIR%%/doc10.png
> %%DATADIR%%/doc11.png
>@@ -12,6 +32,7 @@
> %%DATADIR%%/doc19.png
> %%DATADIR%%/doc2.png
> %%DATADIR%%/doc20.png
>+%%DATADIR%%/doc21.png
> %%DATADIR%%/doc3.png
> %%DATADIR%%/doc4.png
> %%DATADIR%%/doc5.png
>@@ -19,58 +40,100 @@
> %%DATADIR%%/doc7.png
> %%DATADIR%%/doc8.png
> %%DATADIR%%/doc9.png
>-%%DATADIR%%/latexhelp.html
>-%%DATADIR%%/AUTHORS
>-%%DATADIR%%/qt_fr.qm
>-%%DATADIR%%/qt_de.qm
>-%%DATADIR%%/usermanual_en.html
>-%%DATADIR%%/usermanual_fr.html
>+%%DATADIR%%/en.stopWords
> %%DATADIR%%/en_GB.aff
> %%DATADIR%%/en_GB.dic
>+%%DATADIR%%/en_US.aff
>+%%DATADIR%%/en_US.dic
>+%%DATADIR%%/fr.stopWords
> %%DATADIR%%/fr_FR.aff
> %%DATADIR%%/fr_FR.dic
>-%%DATADIR%%/COPYING
>-%%DATADIR%%/CHANGELOG.txt
>-%%DATADIR%%/texmaker16x16.png
>-%%DATADIR%%/texmaker22x22.png
>-%%DATADIR%%/texmaker32x32.png
>-%%DATADIR%%/texmaker48x48.png
>-%%DATADIR%%/texmaker64x64.png
>-%%DATADIR%%/texmaker128x128.png
>-share/applications/texmakerx.desktop
>-%%DATADIR%%/texmaker.svg
>-%%DATADIR%%/texmakerx_de.qm
>-%%DATADIR%%/texmakerx_fr.qm
>-%%DATADIR%%/texmakerx_it.qm
>-%%DATADIR%%/texmakerx_pt_BR.qm
>+%%DATADIR%%/hu_HU.aff
>+%%DATADIR%%/hu_HU.dic
>+%%DATADIR%%/latex2e.css
>+%%DATADIR%%/latex2e.html
>+%%DATADIR%%/pt_BR.aff
>+%%DATADIR%%/pt_BR.dic
>+%%DATADIR%%/qt_cs.qm
>+%%DATADIR%%/qt_de.qm
>+%%DATADIR%%/qt_fr.qm
>+%%DATADIR%%/qt_hu.qm
>+%%DATADIR%%/qt_ja.qm
>+%%DATADIR%%/qt_pl.qm
>+%%DATADIR%%/qt_zh.qm
>+%%DATADIR%%/spellcheck_menu.png
>+%%DATADIR%%/tabletemplate_fullyframed_firstBold.js
>+%%DATADIR%%/tabletemplate_fullyframed_firstBold.png
>+%%DATADIR%%/tabletemplate_fullyframed_longtable.js
>+%%DATADIR%%/tabletemplate_fullyframed_longtable.png
>+%%DATADIR%%/tabletemplate_plain_tabular.js
>+%%DATADIR%%/tabletemplate_plain_tabular.png
>+%%DATADIR%%/tabletemplate_plain_tabularx.js
>+%%DATADIR%%/tabletemplate_plain_tabularx.png
>+%%DATADIR%%/tabletemplate_rowcolors_tabular.js
>+%%DATADIR%%/tabletemplate_rowcolors_tabular.png
>+%%DATADIR%%/template.png
>+%%DATADIR%%/template_Article.json
>+%%DATADIR%%/template_Article.png
> %%DATADIR%%/template_Article.tex
>+%%DATADIR%%/template_Article_French.json
>+%%DATADIR%%/template_Article_French.png
>+%%DATADIR%%/template_Article_French.tex
>+%%DATADIR%%/template_Beamer.json
> %%DATADIR%%/template_Beamer.tex
>-%%DATADIR%%/template_Book.tex
>+%%DATADIR%%/template_Book.json
>+%%DATADIR%%/template_Book.png
>+%%DATADIR%%/template_Book.zip
>+%%DATADIR%%/template_HA-prosper.json
> %%DATADIR%%/template_HA-prosper.tex
>+%%DATADIR%%/template_Letter.json
>+%%DATADIR%%/template_Letter.png
> %%DATADIR%%/template_Letter.tex
>+%%DATADIR%%/template_Moderncv.json
>+%%DATADIR%%/template_Moderncv.png
>+%%DATADIR%%/template_Moderncv.tex
>+%%DATADIR%%/template_Moderncv_French.json
>+%%DATADIR%%/template_Moderncv_French.png
>+%%DATADIR%%/template_Moderncv_French.tex
>+%%DATADIR%%/template_Prosper.json
> %%DATADIR%%/template_Prosper.tex
>+%%DATADIR%%/template_Report.json
>+%%DATADIR%%/template_Report.png
> %%DATADIR%%/template_Report.tex
>+%%DATADIR%%/template_Scrartcl.json
>+%%DATADIR%%/template_Scrartcl.png
> %%DATADIR%%/template_Scrartcl.tex
>+%%DATADIR%%/template_Scrbook.json
> %%DATADIR%%/template_Scrbook.tex
>+%%DATADIR%%/template_Scrlttr2.json
> %%DATADIR%%/template_Scrlttr2.tex
>+%%DATADIR%%/template_Scrreprt.json
> %%DATADIR%%/template_Scrreprt.tex
>-%%DATADIR%%/de_DE.aff
>-%%DATADIR%%/de_DE.dic
>+%%DATADIR%%/texstudio128x128.png
>+%%DATADIR%%/texstudio16x16.png
>+%%DATADIR%%/texstudio22x22.png
>+%%DATADIR%%/texstudio32x32.png
>+%%DATADIR%%/texstudio48x48.png
>+%%DATADIR%%/texstudio64x64.png
>+%%DATADIR%%/texstudio_cs.qm
>+%%DATADIR%%/texstudio_de.qm
>+%%DATADIR%%/texstudio_es.qm
>+%%DATADIR%%/texstudio_fr.qm
>+%%DATADIR%%/texstudio_hu.qm
>+%%DATADIR%%/texstudio_it.qm
>+%%DATADIR%%/texstudio_ja.qm
>+%%DATADIR%%/texstudio_pl.qm
>+%%DATADIR%%/texstudio_pt_BR.qm
>+%%DATADIR%%/texstudio_ru.qm
>+%%DATADIR%%/texstudio_uk.qm
>+%%DATADIR%%/texstudio_zh_CN.qm
>+%%DATADIR%%/th_de_DE_v2.dat
> %%DATADIR%%/th_en_US_v2.dat
> %%DATADIR%%/th_fr_FR_v2.dat
>-%%DATADIR%%/th_de_DE_v2.dat
>-%%DATADIR%%/configure_completion.png
>-%%DATADIR%%/configure_customizeMenu.png
>-%%DATADIR%%/configure_customToolbar.png
>-%%DATADIR%%/configure_editor.png
>-%%DATADIR%%/configure_general.png
>-%%DATADIR%%/configure_shortcuts.png
>-%%DATADIR%%/configure_svn.png
>-%%DATADIR%%/template.png
> %%DATADIR%%/thesaurus.png
>-%%DATADIR%%/texmakerx_cs.qm
>-%%DATADIR%%/texmakerx_hu.qm
>-%%DATADIR%%/qt_hu.qm
>-%%DATADIR%%/qt_cs.qm
>-%%DATADIR%%/en_US.aff
>-%%DATADIR%%/en_US.dic
>+%%DATADIR%%/usermanual.css
>+%%DATADIR%%/usermanual_en.html
>+%%DATADIR%%/usermanual_fr.html
>+%%DATADIR%%/wizard_figure.png
>+/usr/share/appdata/texstudio.appdata.xml
>+@dir /usr/share/appdata

Actions: View | Diff

Attachments on bug 195346: 149787