summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/texstudio/README5
-rw-r--r--office/texstudio/texstudio-2.6.4-phonon-build-fix.patch51
-rw-r--r--office/texstudio/texstudio.SlackBuild18
-rw-r--r--office/texstudio/texstudio.info6
4 files changed, 19 insertions, 61 deletions
diff --git a/office/texstudio/README b/office/texstudio/README
index 1aa94dc615..401134bcc7 100644
--- a/office/texstudio/README
+++ b/office/texstudio/README
@@ -1,3 +1,8 @@
Texstudio is a free LaTeX editor that integrates many
tools needed to develop documents with LaTeX in just
one application.
+
+Note: Texstudio can be optionally compiled with
+poppler-qt5 by passing the argument QT5GUI=yes.
+
+ QT5GUI=yes ./texstudio.SlackBuild
diff --git a/office/texstudio/texstudio-2.6.4-phonon-build-fix.patch b/office/texstudio/texstudio-2.6.4-phonon-build-fix.patch
deleted file mode 100644
index 2dea40f603..0000000000
--- a/office/texstudio/texstudio-2.6.4-phonon-build-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/PDFDocument.cpp
-+++ b/PDFDocument.cpp
-@@ -781,19 +781,17 @@
- event->accept();
- }
-
--void PDFWidget::annotationClicked(Poppler::Annotation *annotation, const QPointF &scaledPos) {
-+void PDFWidget::annotationClicked(Poppler::Annotation *annotation, int page) {
- switch (annotation->subType()) {
- case Poppler::Annotation::AMovie: {
- #ifdef PHONON
-- if (page > -1 && clickedAnnotation->boundary().contains(scaledPos) ) {
-- if (movie) delete movie;
-- movie = new PDFMovie(this, dynamic_cast<Poppler::MovieAnnotation*>(clickedAnnotation), page);
-- movie->place();
-- movie->show();
-- movie->play();
-- }
-+ if (movie) delete movie;
-+ movie = new PDFMovie(this, dynamic_cast<Poppler::MovieAnnotation*>(annotation), page);
-+ movie->place();
-+ movie->show();
-+ movie->play();
- #else
-- Q_UNUSED(scaledPos)
-+ Q_UNUSED(page)
- txsWarning("You clicked on a video, but the video playing mode was disabled by you or the package creator.\nRecompile TeXstudio with the option PHONON=true");
- #endif
- break;
-@@ -826,7 +824,9 @@
- int page;
- QPointF scaledPos;
- mapToScaledPosition(event->pos(), page, scaledPos);
-- annotationClicked(clickedAnnotation, scaledPos);
-+ if (page > -1 && clickedAnnotation->boundary().contains(scaledPos)) {
-+ annotationClicked(clickedAnnotation, page);
-+ }
- } else if (currentTool == kPresentation) {
- if (event->button() == Qt::LeftButton) goNext();
- else if (event->button() == Qt::RightButton) goPrev();
---- a/PDFDocument.h
-+++ b/PDFDocument.h
-@@ -237,7 +237,7 @@
- void useMagnifier(const QMouseEvent *inEvent);
- void goToDestination(const Poppler::LinkDestination& dest);
- void doLink(const Poppler::Link *link);
-- void annotationClicked(Poppler::Annotation *annotation, const QPointF &scaledPos);
-+ void annotationClicked(Poppler::Annotation *annotation, int page);
- void doZoom(const QPoint& clickPos, int dir, qreal newScaleFactor=1.0);
-
- PDFScrollArea* getScrollArea();
diff --git a/office/texstudio/texstudio.SlackBuild b/office/texstudio/texstudio.SlackBuild
index 223039861a..cc7be84837 100644
--- a/office/texstudio/texstudio.SlackBuild
+++ b/office/texstudio/texstudio.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=texstudio
-VERSION=${VERSION:-2.6.4}
+VERSION=${VERSION:-2.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,13 +71,17 @@ find -L . \
# Fix .desktop item.
sed -i -e '/^Encoding/d' -e "/^Icon/s|=.*|=$PRGNAM|" utilities/texstudio.desktop
-# Fix PHONON compile issue.
-patch -p1 < $CWD/texstudio-2.6.4-phonon-build-fix.patch
-
-qmake LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \
- PHONON=true INCLUDEPATH+="/usr/include/KDE" QMAKE_CXXFLAGS+="$SLKCFLAGS"\
- CONFIG-=debug -o Makefile $PRGNAM.pro
+# Use Qt5 if QT5GUI is yes, otherwise, default to Qt4.
+if [ "${QT5GUI:-no}" == "yes" ]; then
+ qmake-qt5 LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \
+ INCLUDEPATH+="/usr/include/KDE /usr/include/poppler/qt5" QMAKE_CXXFLAGS+="$SLKCFLAGS"\
+ CONFIG-=debug -o Makefile $PRGNAM.pro
+else
+ qmake LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \
+ PHONON=true INCLUDEPATH+="/usr/include/KDE" QMAKE_CXXFLAGS+="$SLKCFLAGS"\
+ CONFIG-=debug -o Makefile $PRGNAM.pro
+fi
make
make install INSTALL_ROOT=$PKG
diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info
index 9f65020468..3b3b06c31f 100644
--- a/office/texstudio/texstudio.info
+++ b/office/texstudio/texstudio.info
@@ -1,8 +1,8 @@
PRGNAM="texstudio"
-VERSION="2.6.4"
+VERSION="2.7.0"
HOMEPAGE="http://texstudio.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.6.4.tar.gz"
-MD5SUM="216b30880b1a73bd98c2250cc6450f37"
+DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.7.0.tar.gz"
+MD5SUM="e2745d828d2c945bea97ea42e57fc881"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""