summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/texstudio/phonon-fix.patch31
-rw-r--r--office/texstudio/texstudio.SlackBuild12
-rw-r--r--office/texstudio/texstudio.info6
3 files changed, 8 insertions, 41 deletions
diff --git a/office/texstudio/phonon-fix.patch b/office/texstudio/phonon-fix.patch
deleted file mode 100644
index 867759f34e..0000000000
--- a/office/texstudio/phonon-fix.patch
+++ /dev/null
@@ -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 *);
diff --git a/office/texstudio/texstudio.SlackBuild b/office/texstudio/texstudio.SlackBuild
index a5208d9329..e7eb3aa51c 100644
--- a/office/texstudio/texstudio.SlackBuild
+++ b/office/texstudio/texstudio.SlackBuild
@@ -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
diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info
index b17203baba..251881ffb7 100644
--- a/office/texstudio/texstudio.info
+++ b/office/texstudio/texstudio.info
@@ -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=""