diff --git a/.gitignore b/.gitignore index 4d20b91..4166c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /texstudio-4.0.1.tar.gz /texstudio-4.0.2.tar.gz /texstudio-4.0.4.tar.gz +/texstudio-4.2.0.tar.gz diff --git a/sources b/sources index dfc8608..8183cd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (texstudio-4.0.4.tar.gz) = 1b31e05058a3ec4f82745dbd74f130ab8a40bca3740a845c0a3f06dc97467b25e08330cffb16e914ad9c7a2b97a744d8c63e552287b469a07bbe995dcd75eb82 +SHA512 (texstudio-4.2.0.tar.gz) = aff5ae645a3b3c362e0456270576770c5b39212902a37633b7279476cf6278ee292ef93c4a0c917b1d4d513aaf597d634f4cf7a469fd4e918f35ddbbe5cb1700 diff --git a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch index 23f64a8..5e2d2a5 100644 --- a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch +++ b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch @@ -1,6 +1,6 @@ -From 80f36b2b857c73ce4c74d3e16fc0745b83d4fbff Mon Sep 17 00:00:00 2001 +From 67ef0d913ce3e830ba8c7ae6cba70869da7b048a Mon Sep 17 00:00:00 2001 From: hannes -Date: Sun, 26 Sep 2021 07:45:00 +0200 +Date: Fri, 14 Jan 2022 01:20:28 +0100 Subject: [PATCH] qtsingle --- @@ -8,7 +8,7 @@ Subject: [PATCH] qtsingle 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/texstudio.pro b/texstudio.pro -index 16e704b..c59894e 100644 +index 05831aa..9c56c74 100644 --- a/texstudio.pro +++ b/texstudio.pro @@ -105,7 +105,11 @@ versionGreaterOrEqual($$QT_VERSION, "6.0.0") { @@ -25,5 +25,4 @@ index 16e704b..c59894e 100644 # ############################## # precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h -- -2.31.1 - +2.34.1 diff --git a/texstudio-wtf_flags.patch b/texstudio-wtf_flags.patch index 8a025e5..3d6ea6b 100644 --- a/texstudio-wtf_flags.patch +++ b/texstudio-wtf_flags.patch @@ -1,45 +1,31 @@ -From c2904af9565f2e23c758923eea250b88c468d15c Mon Sep 17 00:00:00 2001 +From fe2a4f3166a22e002bbf7fb80802bbf96111340a Mon Sep 17 00:00:00 2001 From: hannes -Date: Sun, 26 Sep 2021 07:48:15 +0200 +Date: Fri, 14 Jan 2022 01:24:46 +0100 Subject: [PATCH 2/2] wtf --- - texstudio.pro | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + texstudio.pro | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/texstudio.pro b/texstudio.pro -index c59894e..dc2734f 100644 +index 9c56c74..9a0a6bc 100644 --- a/texstudio.pro +++ b/texstudio.pro -@@ -440,19 +440,19 @@ exists(./.git) { +@@ -443,12 +443,12 @@ exists(./.git) { } !win32-msvc*: { - QMAKE_CXXFLAGS_DEBUG -= -O -O1 -O2 -O3 -- QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0 +- QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0 -Wno-deprecated-declarations +# QMAKE_CXXFLAGS_DEBUG -= -O -O1 -O2 -O3 -+# QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0 ++# QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0 -Wno-deprecated-declarations QMAKE_CXXFLAGS += -fno-omit-frame-pointer - !isEmpty(MXE): QMAKE_CXXFLAGS += -fpermissive + win32: QMAKE_CXXFLAGS += -fpermissive - !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku -- else { -- QMAKE_CXXFLAGS += -gstabs -g -- QMAKE_LFLAGS -= -Wl,-s -- isEmpty(STRIP){ -- QMAKE_LFLAGS_RELEASE -= -Wl,-s -- } -- } -+ # !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku -+ # else { -+ # QMAKE_CXXFLAGS += -gstabs -g -+ # QMAKE_LFLAGS -= -Wl,-s -+ # isEmpty(STRIP){ -+ # QMAKE_LFLAGS_RELEASE -= -Wl,-s -+ # } -+ # } ++# !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku } else { DEFINES += _CRT_SECURE_NO_WARNINGS } -- -2.31.1 +2.34.1 diff --git a/texstudio.spec b/texstudio.spec index bdc41ff..19f86e5 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -1,6 +1,6 @@ Name: texstudio -Version: 4.0.4 -Release: 2%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Summary: A feature-rich editor for LaTeX documents # texstudio binary: GPLv3 due to static linkage of bundled qcodeedit @@ -124,6 +124,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} %doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt %changelog +* Fri Jan 14 2022 Johannes Lips 4.2.0-1 +- Update to latest upstream release 4.2.0 + * Mon Jan 03 2022 Ian McInerney 4.0.4-2 - Rebuild due to qtermwidget soname bump (fixes rhbz: 2036642)