texstudio: update to 2.12.22.

This commit is contained in:
Piraty 2020-01-02 19:53:26 +01:00
parent ef0e5631bd
commit 11bb19e34f
4 changed files with 21 additions and 18 deletions

View file

@ -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]

View file

@ -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
}

View file

@ -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
}

View file

@ -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 <piraty1@inbox.ru>"
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