diff --git a/srcpkgs/texstudio/patches/10-arm-debug.patch b/srcpkgs/texstudio/patches/10-arm-debug.patch index 9557f73064..5d4469e7c1 100644 --- a/srcpkgs/texstudio/patches/10-arm-debug.patch +++ b/srcpkgs/texstudio/patches/10-arm-debug.patch @@ -1,5 +1,5 @@ ---- src/debughelper.cpp 2016-10-11 22:02:43.000000000 +0200 -+++ src/debughelper.cpp 2016-11-25 12:47:39.937086819 +0100 +--- src/debug/debughelper.cpp ++++ src/debug/debughelper.cpp @@ -511,16 +511,16 @@ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[31] //not always used #define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[34] diff --git a/srcpkgs/texstudio/patches/40-phonon-cross.patch b/srcpkgs/texstudio/patches/40-phonon-cross.patch new file mode 100644 index 0000000000..0df501046c --- /dev/null +++ b/srcpkgs/texstudio/patches/40-phonon-cross.patch @@ -0,0 +1,13 @@ +--- texstudio.pro ++++ texstudio.pro +@@ -28,8 +28,8 @@ + } + !isEmpty(PHONON){ + greaterThan(QT_MAJOR_VERSION, 4) { #Qt5 +- QT += phonon4qt5 +- LIBS += -lphonon4qt5 ++ CONFIG += link_pkgconfig ++ PKGCONFIG += phonon4qt5 + } else { #Qt4 + QT += phonon + } diff --git a/srcpkgs/texstudio/patches/phonon-cross.patch b/srcpkgs/texstudio/patches/phonon-cross.patch deleted file mode 100644 index 8b151ee8df..0000000000 --- a/srcpkgs/texstudio/patches/phonon-cross.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- texstudio.pro 2019-05-18 18:23:33.000000000 +0200 -+++ - 2020-04-06 22:35:28.379953691 +0200 -@@ -28,7 +28,8 @@ - } - !isEmpty(PHONON){ - greaterThan(QT_MAJOR_VERSION, 4) { #Qt5 -- QT += phonon4qt5 -+ CONFIG += link_pkgconfig -+ PKGCONFIG += phonon4qt5 - } else { #Qt4 - QT += phonon - } diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index 88df5425e1..9ca28dbf7f 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -1,11 +1,11 @@ # Template file for 'texstudio' pkgname=texstudio -version=2.12.16 +version=2.12.22 revision=1 build_style=qmake configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y $(vopt_if phonon PHONON=true) $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)" -hostmakedepends="pkg-config qt5-qmake" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel hunspell-devel quazip-qt5-devel $(vopt_if phonon phonon-qt5-devel) $(vopt_if poppler poppler-qt5-devel)" @@ -14,12 +14,14 @@ short_desc="Powerful Tex/LaTeX editor based on texmaker" maintainer="Piraty " license="GPL-2.0-or-later" homepage="https://texstudio.org/" +changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/utilities/manual/CHANGELOG.txt" distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz" -checksum=a14b8912bfd15d982cfbe5f00deed37ca85fb6e38d3aa0c2dac23b4ecaab0984 +checksum=101949620d055ab0224ecbb48b0ad38a7403f179832a28b86e4cb16f4c2adc46 build_options="phonon poppler" -desc_option_phonon="build with phonon support" +desc_option_phonon="build with phonon (=media support for pdf preview)" desc_option_poppler="build with poppler (=internal pdf preview)" + build_options_default="phonon poppler" if [ "$CROSS_BUILD" ]; then