texstudio: update to 3.0.0.

This commit is contained in:
Piraty 2020-08-26 23:03:18 +02:00
parent 285236b8aa
commit a706696d6a
No known key found for this signature in database
GPG key ID: 82F2CC796BD07077
3 changed files with 12 additions and 33 deletions

View file

@ -1,21 +0,0 @@
--- 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]
#elif defined(CPU_IS_ARM)
-/*
#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_pc
#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_sp
#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_fp
#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_lr
-*/
+/*
#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R15]
#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R13]
#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R11]
#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R14]
+*/
#elif defined(CPU_IS_IA64)
#define PC_FROM_UCONTEXT(context) (context)->_u._mc.sc_ip
#define STACK_FROM_UCONTEXT(context) (context)->_u._mc.sc_gr[12] //is that register 12?

View file

@ -1,13 +1,13 @@
--- texstudio.pro
+++ texstudio.pro
@@ -28,8 +28,8 @@
}
@@ -79,8 +79,8 @@
uitools
!isEmpty(PHONON){
greaterThan(QT_MAJOR_VERSION, 4) { #Qt5
- QT += phonon4qt5
- LIBS += -lphonon4qt5
+ CONFIG += link_pkgconfig
+ PKGCONFIG += phonon4qt5
} else { #Qt4
QT += phonon
}
- QT += phonon4qt5
- LIBS += -lphonon4qt5
+ CONFIG += link_pkgconfig
+ PKGCONFIG += phonon4qt5
DEFINES += PHONON
}

View file

@ -1,6 +1,6 @@
# Template file for 'texstudio'
pkgname=texstudio
version=2.12.22
version=3.0.0
revision=1
build_style=qmake
configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y
@ -16,7 +16,7 @@ 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=101949620d055ab0224ecbb48b0ad38a7403f179832a28b86e4cb16f4c2adc46
checksum=c1f704f84b2007621c5f8ec7fd3b4cf96693f98fd25724ee8fe9c3dccdc7ab2a
build_options="phonon poppler"
desc_option_phonon="build with phonon (=media support for pdf preview)"