diff --git a/.gitignore b/.gitignore index 47295b5..698387a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /texstudio-2.12.2.tar.gz /texstudio-2.12.4.tar.gz /texstudio-2.12.6.tar.gz +/texstudio-2.12.8.tar.gz diff --git a/sources b/sources index 4c6a8a2..4785b38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (texstudio-2.12.6.tar.gz) = 3557ca1323534729a2adcd2fc7839117e2254c5c8ed0e9db0ac03b444ecfcdcf8bbbd940a139b43052d6499a55d8964168485db46dd11423746dfbc0b6eccf1c +SHA512 (texstudio-2.12.8.tar.gz) = 0076617f6421fa959c8c327bc81d4d27779358481b377d83856fe26b963d7c3c1e04d3b11e8f7eeb99cab9c089c8e7afcbb9c93a5aaccd00cf493792b802bfcb diff --git a/texstudio-debughelper-arm-fix.patch b/texstudio-debughelper-arm-fix.patch index ccbe6ce..aa950c8 100644 --- a/texstudio-debughelper-arm-fix.patch +++ b/texstudio-debughelper-arm-fix.patch @@ -1,23 +1,17 @@ -From 7f41bb239a89d1e66e954577d03b92373ad4da0e Mon Sep 17 00:00:00 2001 +From b0cf44fde92b66fbaefceb643b6124bc5bf0b087 Mon Sep 17 00:00:00 2001 From: hannes -Date: Sun, 13 Sep 2015 16:40:51 +0200 -Subject: [PATCH 3/3] debughelper arm fix +Date: Sun, 11 Feb 2018 07:39:00 +0100 +Subject: [PATCH 2/2] armfix --- - debughelper.cpp | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) + src/debughelper.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) -diff --git a/debughelper.cpp b/debughelper.cpp -index 4b14ae3..f07c48e 100644 ---- a/debughelper.cpp -+++ b/debughelper.cpp -@@ -501,16 +501,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 +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) #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 @@ -31,5 +25,5 @@ index 4b14ae3..f07c48e 100644 #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? -- -2.4.3 +2.14.3 diff --git a/texstudio-disable-update-check.patch b/texstudio-disable-update-check.patch index 6818706..0e976f9 100644 --- a/texstudio-disable-update-check.patch +++ b/texstudio-disable-update-check.patch @@ -1,23 +1,20 @@ -From 6855f6912aff21c5aec73777c504bfce9e62d37b Mon Sep 17 00:00:00 2001 +From 6647a0026bb16993707350d4829920e78918fb9e Mon Sep 17 00:00:00 2001 From: hannes -Date: Wed, 16 Dec 2015 20:34:51 +0100 -Subject: [PATCH] update_check +Date: Sun, 11 Feb 2018 07:45:11 +0100 +Subject: [PATCH 3/3] update fix --- - configdialog.ui | 10 ++++++++-- - configmanager.cpp | 2 +- - 2 files changed, 9 insertions(+), 3 deletions(-) + src/configdialog.ui | 6 ++++++ + src/configmanager.cpp | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) -diff --git a/configdialog.ui b/configdialog.ui -index 2e7e131..a8f69b1 100644 ---- a/configdialog.ui -+++ b/configdialog.ui -@@ -557,15 +557,21 @@ - 1 - +diff --git a/src/configdialog.ui b/src/configdialog.ui +index 0f3cbe6..1b11b92 100644 +--- a/src/configdialog.ui ++++ b/src/configdialog.ui +@@ -578,6 +578,9 @@ -- 7 -+ 7 + 7 + + true @@ -25,22 +22,21 @@ index 2e7e131..a8f69b1 100644 - +@@ -585,6 +588,9 @@ Automatically check every -- -+ -+ -+ false -+ + ++ ++ false ++ -diff --git a/configmanager.cpp b/configmanager.cpp -index e1ddbdb..443f4a7 100644 ---- a/configmanager.cpp -+++ b/configmanager.cpp -@@ -467,7 +467,7 @@ ConfigManager::ConfigManager(QObject *parent): QObject (parent), +diff --git a/src/configmanager.cpp b/src/configmanager.cpp +index 41f2e49..088924e 100644 +--- a/src/configmanager.cpp ++++ b/src/configmanager.cpp +@@ -479,7 +479,7 @@ ConfigManager::ConfigManager(QObject *parent): QObject (parent), registerOption("Thesaurus/Database", &thesaurus_database, "", &pseudoDialog->comboBoxThesaurusFileName); //updates @@ -50,5 +46,5 @@ index e1ddbdb..443f4a7 100644 registerOption("Update/AutoCheckInvervalDays", &autoUpdateCheckIntervalDays, 7, &pseudoDialog->spinBoxAutoUpdateCheckIntervalDays); registerOption("Update/LastCheck", &lastUpdateCheck, QDateTime()); -- -2.5.0 +2.14.3 diff --git a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch index 30e68f2..d1632b1 100644 --- a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch +++ b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch @@ -1,19 +1,32 @@ -diff -up texstudio2.11.2/.qtsingleapplication texstudio2.11.2/ -diff -up texstudio2.11.2/texstudio.pro.qtsingleapplication texstudio2.11.2/texstudio.pro ---- texstudio2.11.2/texstudio.pro.qtsingleapplication 2016-10-11 15:02:44.000000000 -0500 -+++ texstudio2.11.2/texstudio.pro 2016-12-08 10:17:52.533768367 -0600 -@@ -35,7 +35,13 @@ QT += \ +From 6eb7d610c440c4656943879be0f673dc168cc9fb Mon Sep 17 00:00:00 2001 +From: hannes +Date: Sat, 10 Feb 2018 10:21:23 +0100 +Subject: [PATCH] qtsingle patch + +--- + texstudio.pro | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/texstudio.pro b/texstudio.pro +index 74cd63c..572558f 100644 +--- a/texstudio.pro ++++ b/texstudio.pro +@@ -35,8 +35,13 @@ QT += \ DEFINES += PHONON } contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x") --else:include(qtsingleapplication/qtsingleapplication.pri) -+else: { -+isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){ -+include(qtsingleapplication/qtsingleapplication.pri) -+} else { -+CONFIG += qtsingleapplication -+} -+} - +-else:include(src/qtsingleapplication/qtsingleapplication.pri) +- ++else: { ++isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){ ++include(qtsingleapplication/qtsingleapplication.pri) ++} else { ++CONFIG += qtsingleapplication ++} ++} # ############################## # precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h + # principal sources +-- +2.14.3 + diff --git a/texstudio-wtf_flags.patch b/texstudio-wtf_flags.patch index bc1bf32..a4e6669 100644 --- a/texstudio-wtf_flags.patch +++ b/texstudio-wtf_flags.patch @@ -1,9 +1,9 @@ diff -up texstudio2.11.2/texstudio.pro.wtf texstudio2.11.2/texstudio.pro --- texstudio2.11.2/texstudio.pro.wtf 2016-12-08 10:17:52.533768367 -0600 +++ texstudio2.11.2/texstudio.pro 2016-12-08 10:32:54.422599376 -0600 -@@ -627,9 +627,9 @@ exists(./.hg2) | exists(./.hg) { - #QMAKE_CXXFLAGS_DEBUG += -Werror -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline - QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline +@@ -419,9 +426,9 @@ exists(./.git) { + #QMAKE_CXXFLAGS_DEBUG += -Werror -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline + QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline QMAKE_CXXFLAGS += -std=c++0x -!win32: QMAKE_LFLAGS += -rdynamic # option not supported by mingw -else { @@ -11,9 +11,12 @@ diff -up texstudio2.11.2/texstudio.pro.wtf texstudio2.11.2/texstudio.pro - QMAKE_LFLAGS -= -Wl,-s - QMAKE_LFLAGS_RELEASE -= -Wl,-s -} -+#!win32: QMAKE_LFLAGS += -rdynamic # option not supported by mingw ++#!win32: QMAKE_LFLAGS += -rdynamic # option not supported by #mingw +#else { +# QMAKE_CXXFLAGS += -gstabs -g +# QMAKE_LFLAGS -= -Wl,-s +# QMAKE_LFLAGS_RELEASE -= -Wl,-s +#} +-- +2.14.3 + diff --git a/texstudio.spec b/texstudio.spec index cda432b..ef0f767 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -1,15 +1,15 @@ Name: texstudio -Version: 2.12.6 -Release: 4%{?dist} +Version: 2.12.8 +Release: 1%{?dist} Summary: A feature-rich editor for LaTeX documents Group: Applications/Publishing # texstudio binary: GPLv3 due to static linkage of bundled qcodeedit # texstudio data and image files: GPLv2+ License: GPLv2+ and GPLv3 -URL: http://texstudio.sourceforge.net +URL: https://www.texstudio.org -Source0: http://downloads.sourceforge.net/texstudio/texstudio-%{version}.tar.gz +Source0: https://github.com/texstudio-org/texstudio/archive/%{version}.tar.gz Source1: texstudio.desktop Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch Patch2: texstudio-debughelper-arm-fix.patch @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt %changelog +* Sun Feb 11 2018 Johannes Lips 2.12.8-1 +- Update to latest upstream bugfix release 2.12.8 + * Fri Feb 09 2018 Fedora Release Engineering - 2.12.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild