app-office/texstudio: Version Bump, #439816

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 223 insertions, 1 deletions

diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index 6f3c0491b935..3f8585c74a38 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texstudio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.7 2012/09/05 07:28:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.8 2012/11/05 18:57:07 jlec Exp $
+
+*texstudio-2.5 (05 Nov 2012)
+
+  05 Nov 2012; Justin Lecher <jlec@gentoo.org> +texstudio-2.5.ebuild,
+  +files/texstudio-2.5-hunspell.patch, +files/texstudio-2.5-qtsingle.patch,
+  +files/texstudio-2.5-viewers-use-xdg-open.patch:
+  Version Bump, #439816
 
 *texstudio-2.4 (05 Sep 2012)
 
diff --git a/app-office/texstudio/files/texstudio-2.5-hunspell.patch b/app-office/texstudio/files/texstudio-2.5-hunspell.patch
new file mode 100644
index 000000000000..a895713ff557
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.5-hunspell.patch
@@ -0,0 +1,84 @@
+ spellerutility.h |  2 +-
+ texstudio.pro    | 37 ++++++-------------------------------
+ 2 files changed, 7 insertions(+), 32 deletions(-)
+
+diff --git a/spellerutility.h b/spellerutility.h
+index 1e1d6e2..083f412 100644
+--- a/spellerutility.h
++++ b/spellerutility.h
+@@ -13,7 +13,7 @@
+ 

+ #include "mostQtHeaders.h"

+ 

+-#include "hunspell/hunspell.hxx"

++#include <hunspell.hxx>

+ class SpellerUtility: public QObject {

+ 	Q_OBJECT

+ public:

+diff --git a/texstudio.pro b/texstudio.pro
+index 541b6b6..f801fc2 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -52,24 +52,6 @@ HEADERS += texmaker.h \
+     debughelper.h \

+     thesaurusdialog.h \

+     xmltagslistwidget.h \

+-    hunspell/affentry.hxx \

+-    hunspell/affixmgr.hxx \

+-    hunspell/atypes.hxx \

+-    hunspell/baseaffix.hxx \

+-    hunspell/csutil.hxx \

+-    hunspell/dictmgr.hxx \

+-    hunspell/hashmgr.hxx \

+-    hunspell/htypes.hxx \

+-    hunspell/hunspell.hxx \

+-    hunspell/hunspell.h \

+-    hunspell/langnum.hxx \

+-    hunspell/license.hunspell \

+-    hunspell/phonet.hxx \

+-    hunspell/suggestmgr.hxx \

+-    hunspell/license.myspell \

+-    hunspell/filemgr.hxx \

+-    hunspell/hunzip.hxx \

+-    hunspell/w_char.hxx \

+     qcodeedit/lib/qeditorinputbinding.h \

+     qcodeedit/lib/qeditorinputbindinginterface.h \

+     randomtextgenerator.h \

+@@ -85,7 +67,6 @@ HEADERS += texmaker.h \
+     latexdocument.h \

+     unicodeinsertion.h \

+     universalinputdialog.h \

+-    hunspell/replist.hxx \

+     scriptengine.h \

+     insertgraphics.h \

+     txstabwidget.h \

+@@ -157,18 +138,6 @@ SOURCES += main.cpp \
+     codesnippet.cpp \

+     thesaurusdialog.cpp \

+     xmltagslistwidget.cpp \

+-    hunspell/affentry.cxx \

+-    hunspell/affixmgr.cxx \

+-    hunspell/csutil.cxx \

+-    hunspell/dictmgr.cxx \

+-    hunspell/hashmgr.cxx \

+-    hunspell/hunspell.cxx \

+-    hunspell/phonet.cxx \

+-    hunspell/replist.cxx \

+-    hunspell/suggestmgr.cxx \

+-    hunspell/utf_info.cxx \

+-    hunspell/filemgr.cxx \

+-    hunspell/hunzip.cxx \

+     encodingdialog.cpp \

+     qcodeedit/lib/qeditorinputbinding.cpp \

+     randomtextgenerator.cpp \

+@@ -591,4 +560,10 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c
+ #QMAKE_CXXFLAGS_DEBUG += -Werror  -Wall -Wextra  -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas  -Wundef  -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered  -Wempty-body -Wsign-compare -Waddress -Wlogical-op   -Winline

+ QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra  -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas  -Wundef  -Wpointer-arith  -Wwrite-strings -Wempty-body -Wsign-compare -Waddress   -Winline

+ 

++# enable use of pkgconfig

++unix {

++  CONFIG   += link_pkgconfig

++  # use system hunspell

++  PKGCONFIG += hunspell

++}

+ 

diff --git a/app-office/texstudio/files/texstudio-2.5-qtsingle.patch b/app-office/texstudio/files/texstudio-2.5-qtsingle.patch
new file mode 100644
index 000000000000..9ef2cb44f68f
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.5-qtsingle.patch
@@ -0,0 +1,23 @@
+ texstudio.pro | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/texstudio.pro b/texstudio.pro
+index f801fc2..2b1d3df 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -10,8 +10,6 @@ QT += network \
+     QT += phonon

+     DEFINES += PHONON

+ }

+-contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")

+-else:include(qtsingleapplication/qtsingleapplication.pri)

+ 

+ # ##############################

+ PRECOMPILED_HEADER = mostQtHeaders.h

+@@ -567,3 +565,6 @@ unix {
+   PKGCONFIG += hunspell

+ }

+ 

++#use system qtsingleapplication

++CONFIG += qtsingleapplication

++

diff --git a/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch b/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
new file mode 100644
index 000000000000..667ee3186b34
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
@@ -0,0 +1,42 @@
+From f9a633402c81b7c252e33c0d9386ba4b48fcde7c Mon Sep 17 00:00:00 2001
+From: hannes <hannes@fedoraproject.org>
+Date: Sun, 9 Sep 2012 10:56:06 +0200
+Subject: [PATCH] viewer
+
+---
+ buildmanager.cpp | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git buildmanager.cpp buildmanager.cpp
+index ac7027a..ac913d0 100644
+--- buildmanager.cpp
++++ buildmanager.cpp
+@@ -762,25 +762,13 @@
+ // xdvi %.dvi  -sourceposition @:%.tex

+ // kdvi "file:%.dvi#src:@ %.tex"

+ QString getCommandLineViewDvi(){

+-	switch (x11desktop_env()) {

+-	case 3:	return "kdvi %.dvi > /dev/null";

+-	case 4:	return "okular %.dvi > /dev/null";

+-	default:return "evince %.dvi > /dev/null";

+-	}

++	return "xdg-open %.dvi > /dev/null";

+ };

+ QString getCommandLineViewPs(){

+-	switch (x11desktop_env()) {

+-	case 3:  return "kghostview %.ps > /dev/null";

+-	case 4:  return "okular %.ps > /dev/null";

+-	default: return "evince %.ps > /dev/null";

+-	};

++	return "xdg-open %.ps > /dev/null";

+ }

+ QString getCommandLineViewPdfExternal(){

+-	switch (x11desktop_env()) {

+-	case 3:  return "kpdf %.pdf > /dev/null";

+-	case 4:  return "okular %.pdf > /dev/null";

+-	default: return "evince %.pdf > /dev/null";

+-	};

++	return "xdg-open %.pdf > /dev/null";

+ }

+ QString getCommandLineGhostscript(){ return ""; }

+ 

diff --git a/app-office/texstudio/texstudio-2.5.ebuild b/app-office/texstudio/texstudio-2.5.ebuild
new file mode 100644
index 000000000000..a7ceeb4d0d02
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.5.ebuild,v 1.1 2012/11/05 18:57:07 jlec Exp $
+
+EAPI=4
+
+inherit base fdo-mime qt4-r2
+
+DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
+HOMEPAGE="http://texstudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler[qt4]
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/qt-gui-4.6.1:4
+	>=x11-libs/qt-core-4.6.1:4
+	>=x11-libs/qt-script-4.6.1:4
+	>=x11-libs/qt-test-4.6.1:4
+	>=x11-libs/qt-webkit-4.6.1:4
+	video? ( media-libs/phonon )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/-/}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hunspell.patch
+# 441914
+#	"${FILESDIR}"/${P}-qtsingle.patch
+	"${FILESDIR}"/${PN}-2.4-desktop.patch
+# Get it from fedora
+	"${FILESDIR}"/${P}-viewers-use-xdg-open.patch
+	)
+
+src_prepare() {
+	find hunspell -delete
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	for i in 16x16 22x22 32x32 48x48 64x64; do
+		insinto /usr/share/icons/hicolor/${i}
+		newins utilities/${PN}${i}.png ${PN}.png
+	done
+	qt4-r2_src_install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}