Merge pull request #5536 from Piraty/texstudio

TeXstudio: update to 2.12.0

srcpkgs/texstudio/patches/30-disable-auto-update.patch

@@ -1,8 +1,8 @@
 #initially based on debian's patch: https://sources.debian.net/patches/texstudio/2.11.2+debian-1/
-#modification: in Settings menu: disable whole groupBox instead of all single elements inside it
---- configdialog.ui	2016-10-11 22:02:43.000000000 +0200
-+++ configdialog.ui	2016-11-02 13:40:22.780668671 +0100
-@@ -507,6 +507,9 @@
+#modification: in Settings menu: disable whole groupBox instead of all single elements
+--- configdialog.ui
++++ configdialog.ui
+@@ -485,6 +485,9 @@
             </item>
             <item>
              <widget class="QGroupBox" name="groupBox_Update">
@@ -15,7 +15,7 @@
 
 --- configmanager.cpp	2016-10-11 22:02:43.000000000 +0200
 +++ configmanager.cpp	2016-11-09 12:56:50.392812690 +0100
-@@ -472,7 +472,7 @@
+@@ -477,7 +477,7 @@
  	registerOption("Thesaurus/Database", &thesaurus_database, "<dic not found>", &pseudoDialog->comboBoxThesaurusFileName);
  
  	//updates

srcpkgs/texstudio/patches/30-phonon.patch

@@ -1,48 +0,0 @@
-#fixing the dynamic_cast issue with patches provided by the texstudio author here:
-# ) https://sourceforge.net/p/texstudio/bugs/1927/
-# 	) https://sourceforge.net/p/texstudio/hg/ci/5f9e814ad8f20c0e9653a49f793aad713628e66c/
-# 	) https://sourceforge.net/p/texstudio/hg/ci/5903721d443a01780dae861fa3cf6c05d67868f9/
-
---- pdfviewer/PDFDocument.h	2016-11-25 11:50:49.758719915 +0100
-+++ pdfviewer/PDFDocument.h	2016-11-25 11:53:47.580496837 +0100
-@@ -98,7 +98,7 @@
- };
- 
- #ifdef PHONON
--#include <Phonon/VideoPlayer>
-+#include <phonon/VideoPlayer>
- 
- class PDFMovie: public Phonon::VideoPlayer
- {
-@@ -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 *);
-
-
---- pdfviewer/PDFDocument.cpp	2016-10-11 22:02:43.000000000 +0200
-+++ pdfviewer/PDFDocument.cpp	2016-11-25 11:51:06.366512289 +0100
-@@ -359,7 +359,8 @@
- }
- 
- #ifdef PHONON
--PDFMovie::PDFMovie(PDFWidget *parent, Poppler::MovieAnnotation *annot, int page): VideoPlayer(parent), page(page)
-+//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);
-@@ -861,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();

srcpkgs/texstudio/patches/31-fix-desktop.patch

@@ -0,0 +1,23 @@
+#based on debian's patch by Tom Jampen <tom@cryptography.ch>
+#	Description:
+#	Patches texstudio.desktop to add important keywords. It also removes the
+#	useless categories and no longer needed encoding entry.
+
+--- utilities/texstudio.desktop
++++ utilities/texstudio.desktop
+@@ -1,13 +1,12 @@
+ [Desktop Entry]
+-Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
+-Encoding=UTF-8
++Categories=Office;Publishing;
+ Exec=texstudio %F
+ GenericName=LaTeX Editor
+ GenericName[fr]=Editeur LaTeX
+ Comment=LaTeX development environment
+ Comment[fr]=Environnement de développement LaTeX
++Keywords=editor;latex;pdflatex;xelatex;lualatex;context;bibtex;tex;
+ Icon=texstudio
+-Keywords=LaTeX;TeX;editor;
+ MimeType=text/x-tex;
+ Name=TeXstudio
+ StartupNotify=false

srcpkgs/texstudio/template

@@ -1,6 +1,6 @@
 # Template file for 'texstudio'
 pkgname=texstudio
-version=2.11.2
+version=2.12.0
 revision=1
 build_style=qmake
 short_desc="Powerful Tex/LaTeX editor based on texmaker"
@@ -8,12 +8,14 @@ maintainer="Piraty <Piraty@users.noreply.github.com>"
 license="GPL-3"
 homepage="http://texstudio.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/TeXstudio%20${version}/${pkgname}-${version}.tar.gz"
-checksum=02fdd4d1552593ba6ee85965f8043272230fa053b5b8e148405e80547c51d2dc
+checksum=165e00de19a964ffffd377bc46dfce23e33e30a9f071acfeb5ee9b55ba1c1221
 wrksrc="${pkgname}${version}"
 hostmakedepends="pkg-config qt5-qmake"
 makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel"
 depends="qt5-svg"
 
+build_options_default="phonon"
+
 configure_args="-unix"
 configure_args+=" -spec linux-g++"
 configure_args+=" NO_TESTS=true"

srcpkgs/texstudio/update

@@ -0,0 +1 @@
+pattern='<strong>TeXstudio \K[\d.]+(?=</strong>)'