From adb5b23adb742d9d4274d80a53d0eaa7a68f6abe Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 13 Jan 2017 10:40:11 +0100 Subject: [PATCH 1/3] TeXstudio: update to 2.12.0 --- ...ate.patch => 30-disable-auto-update.patch} | 10 ++-- srcpkgs/texstudio/patches/30-phonon.patch | 48 ------------------- .../texstudio/patches/31-fix-desktop.patch | 23 +++++++++ srcpkgs/texstudio/template | 4 +- 4 files changed, 30 insertions(+), 55 deletions(-) rename srcpkgs/texstudio/patches/{20-disable-auto-update.patch => 30-disable-auto-update.patch} (86%) delete mode 100644 srcpkgs/texstudio/patches/30-phonon.patch create mode 100644 srcpkgs/texstudio/patches/31-fix-desktop.patch diff --git a/srcpkgs/texstudio/patches/20-disable-auto-update.patch b/srcpkgs/texstudio/patches/30-disable-auto-update.patch similarity index 86% rename from srcpkgs/texstudio/patches/20-disable-auto-update.patch rename to srcpkgs/texstudio/patches/30-disable-auto-update.patch index f1c019f97b0..d4edb364457 100644 --- a/srcpkgs/texstudio/patches/20-disable-auto-update.patch +++ b/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 @@ @@ -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, "", &pseudoDialog->comboBoxThesaurusFileName); //updates diff --git a/srcpkgs/texstudio/patches/30-phonon.patch b/srcpkgs/texstudio/patches/30-phonon.patch deleted file mode 100644 index 3dc88216b04..00000000000 --- a/srcpkgs/texstudio/patches/30-phonon.patch +++ /dev/null @@ -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 -+#include - - class PDFMovie: public Phonon::VideoPlayer - { -@@ -104,7 +104,7 @@ - { - Q_OBJECT - public: -- PDFMovie(PDFWidget *parent, Poppler::MovieAnnotation *annot, int page); -+ PDFMovie(PDFWidget *parent, QSharedPointer 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 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(annotation), page); -+ movie = new PDFMovie(this, qSharedPointerDynamicCast(annotation), page); - movie->place(); - movie->show(); - movie->play(); diff --git a/srcpkgs/texstudio/patches/31-fix-desktop.patch b/srcpkgs/texstudio/patches/31-fix-desktop.patch new file mode 100644 index 00000000000..3127c22837e --- /dev/null +++ b/srcpkgs/texstudio/patches/31-fix-desktop.patch @@ -0,0 +1,23 @@ +#based on debian's patch by Tom Jampen +# 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 diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index 6cd44449393..b8c1bfb8979 100644 --- a/srcpkgs/texstudio/template +++ b/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,7 +8,7 @@ maintainer="Piraty " 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" From 4e4830720e72771d75f0412910ba942378f92ba1 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 13 Jan 2017 14:46:40 +0100 Subject: [PATCH 2/3] TeXstudio: build with phonon by default upstream patched the issues of 2.11.2 --- srcpkgs/texstudio/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index b8c1bfb8979..1e13ebca66b 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -14,6 +14,8 @@ 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" From dfb32751e5bbbe254425e7cdc2449506d8853dd7 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 13 Jan 2017 15:02:58 +0100 Subject: [PATCH 3/3] TeXstudio: add update file --- srcpkgs/texstudio/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/texstudio/update diff --git a/srcpkgs/texstudio/update b/srcpkgs/texstudio/update new file mode 100644 index 00000000000..ff2cd1142e4 --- /dev/null +++ b/srcpkgs/texstudio/update @@ -0,0 +1 @@ +pattern='TeXstudio \K[\d.]+(?=)'