From 61cef7cc008ad55ef0f0247d3d87e1945881bf5f Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja@gmail.com>
Date: Wed, 12 Oct 2016 09:07:05 -0700
Subject: office/texstudio: Updated for version 2.11.2

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
---
 office/texstudio/phonon-fix.patch     | 31 +++++++++++++++++++++++++++++++
 office/texstudio/texstudio.SlackBuild |  8 +++++---
 office/texstudio/texstudio.info       |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 office/texstudio/phonon-fix.patch

(limited to 'office')

diff --git a/office/texstudio/phonon-fix.patch b/office/texstudio/phonon-fix.patch
new file mode 100644
index 0000000000..867759f34e
--- /dev/null
+++ b/office/texstudio/phonon-fix.patch
@@ -0,0 +1,31 @@
+--- a/pdfviewer/PDFDocument.cpp
++++ b/pdfviewer/PDFDocument.cpp
+@@ -360,7 +360,7 @@
+ }
+ 
+ #ifdef PHONON
+-PDFMovie::PDFMovie(PDFWidget *parent, Poppler::MovieAnnotation *annot, int page): VideoPlayer(parent), page(page)
++PDFMovie::PDFMovie(PDFWidget *parent, QSharedPointer<Poppler::MovieAnnotation> annot, int page): VideoPlayer(parent), page(page)
+ {
+ 	REQUIRE(parent && annot && parent->getPDFDocument());
+ 	REQUIRE(annot->subType() == Poppler::Annotation::AMovie);
+@@ -862,7 +862,7 @@
+ 	case Poppler::Annotation::AMovie: {
+ #ifdef PHONON
+ 		if (movie) delete movie;
+-		movie = new PDFMovie(this, dynamic_cast<Poppler::MovieAnnotation *>(annotation), page);
++		movie = new PDFMovie(this, qSharedPointerDynamicCast<Poppler::MovieAnnotation>(annotation), page);
+ 		movie->place();
+ 		movie->show();
+ 		movie->play();
+--- a/pdfviewer/PDFDocument.h
++++ b/pdfviewer/PDFDocument.h
+@@ -104,7 +104,7 @@
+ {
+ 	Q_OBJECT
+ public:
+-	PDFMovie(PDFWidget *parent, Poppler::MovieAnnotation *annot, int page);
++	PDFMovie(PDFWidget *parent, QSharedPointer<Poppler::MovieAnnotation> annot, int page);
+ 	void place();
+ protected:
+ 	void contextMenuEvent(QContextMenuEvent *);
diff --git a/office/texstudio/texstudio.SlackBuild b/office/texstudio/texstudio.SlackBuild
index c65d2db1bc..a5208d9329 100644
--- a/office/texstudio/texstudio.SlackBuild
+++ b/office/texstudio/texstudio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for texstudio
 
-# Copyright 2013-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=texstudio
-VERSION=${VERSION:-2.11.0}
+VERSION=${VERSION:-2.11.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,8 @@ find -L . \
 
 # Fix .desktop item.
 sed -i -e '/^Encoding/d' -e "/^Icon/s|=.*|=$PRGNAM|" utilities/texstudio.desktop
+# https://sourceforge.net/p/texstudio/bugs/1927/
+patch -p1 < $CWD/phonon-fix.patch
 
 # Use Qt5 if QT5GUI is yes, otherwise, default to Qt4.
 if [ "${QT5GUI:-no}" == "yes" ]; then
@@ -99,7 +101,7 @@ install -D -m 0644 utilities/$PRGNAM.svg \
   $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a utilities/{AUTHORS,license.txt,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL utilities/{AUTHORS,license.txt,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -f $PKG/usr/share/$PRGNAM/{COPYING,CHANGELOG.txt,AUTHORS}
 
diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info
index afe2808d04..b17203baba 100644
--- a/office/texstudio/texstudio.info
+++ b/office/texstudio/texstudio.info
@@ -1,8 +1,8 @@
 PRGNAM="texstudio"
-VERSION="2.11.0"
+VERSION="2.11.2"
 HOMEPAGE="http://texstudio.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.11.0.tar.gz"
-MD5SUM="9bfd48e82e9cb1a9f1bb3055c262e658"
+DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.11.2.tar.gz"
+MD5SUM="4e0e4c6d2816a8c79744f46cbb17962d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3