office/texstudio: Updated for version 2.12.0

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
This commit is contained in:
Larry Hajali 2017-01-10 17:54:42 -08:00 committed by Willy Sudiarto Raharjo
parent dcb976eb56
commit 18079ad6aa
No known key found for this signature in database
GPG key ID: 887B8374D7333381
3 changed files with 8 additions and 41 deletions

View file

@ -1,31 +0,0 @@
--- 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 *);

View file

@ -2,7 +2,7 @@
# Slackware build script for texstudio
# Copyright 2013-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
# Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=texstudio
VERSION=${VERSION:-2.11.2}
VERSION=${VERSION:-2.12.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@ -71,8 +71,6 @@ 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

View file

@ -1,8 +1,8 @@
PRGNAM="texstudio"
VERSION="2.11.2"
VERSION="2.12.0"
HOMEPAGE="http://texstudio.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.11.2.tar.gz"
MD5SUM="4e0e4c6d2816a8c79744f46cbb17962d"
DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.12.0.tar.gz"
MD5SUM="9cbb61e34bf86165b06f7fe6196f036e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""