From 677aeecdef08bb37b6bf6b30caee8d18bde59c78 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Jul 11 2018 18:48:34 +0000
Subject: Update to 2.12.10


---

diff --git a/texstudio-debughelper-arm-fix.patch b/texstudio-debughelper-arm-fix.patch
index 9a291d2..7e3f2b7 100644
--- a/texstudio-debughelper-arm-fix.patch
+++ b/texstudio-debughelper-arm-fix.patch
@@ -11,7 +11,13 @@ diff --git a/src/debughelper.cpp b/src/debughelper.cpp
 index 2918b43..74b94bc 100644
 --- a/src/debughelper.cpp
 +++ b/src/debughelper.cpp
-@@ -522,11 +522,7 @@ QString print_backtrace(const QString &message)
+@@ -517,16 +517,12 @@ QString print_backtrace(const QString &message)
+ #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
@@ -24,25 +30,7 @@ index 2918b43..74b94bc 100644
  #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?
---- a/src/debughelper.cpp
-+++ b/src/debughelper.cpp
-@@ -517,7 +517,7 @@ QString print_backtrace(const QString &message)
- #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
-@@ -1111,6 +1111,7 @@ void SimulatedCPU::set_from_real()
- #else
- #error Unknown processor architecture
- #endif
-+#undef geteip
- geteip:
- 	this->pc = (char *) && geteip;
- }
 -- 
-2.14.3
+2.17.1
+
 
diff --git a/texstudio.spec b/texstudio.spec
index 920feee..dbeac9f 100644
--- a/texstudio.spec
+++ b/texstudio.spec
@@ -1,6 +1,6 @@
 Name:           texstudio
-Version:        2.12.8
-Release:        7%{?dist}
+Version:        2.12.10
+Release:        1%{?dist}
 
 Summary:        A feature-rich editor for LaTeX documents
 Group:          Applications/Publishing
@@ -120,6 +120,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
 %doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
 
 %changelog
+* Wed Jul 11 2018 Johannes Lips <hannes@fedoraproject.org> 2.12.10-1
+- Update to latest upstream bugfix release 2.12.10
+
 * Thu May 17 2018 Johannes Lips <hannes@fedoraproject.org> 2.12.8-7
 - fixing the texlive dependencies