Update to 4.0.0

This commit is contained in:
hannes 2021-09-27 07:50:13 +02:00
parent a4c639b880
commit f275022bc0
5 changed files with 29 additions and 19 deletions

1
.gitignore vendored
View File

@ -44,3 +44,4 @@
/texstudio-3.1.0.tar.gz
/texstudio-3.1.1.tar.gz
/texstudio-3.1.2.tar.gz
/texstudio-4.0.0.tar.gz

View File

@ -1 +1 @@
SHA512 (texstudio-3.1.2.tar.gz) = c8ce74cca6620ba725c4e8ff66564cc4804f3b922877af5c4952a8cd5b43fdf2deb88c1515f457f75a67d7d29ca1d6307779b8304c0b78b37f585c61a12221c4
SHA512 (texstudio-4.0.0.tar.gz) = 9025e0709145ed9c352f9cfd748087b331fd2894c913d7b7707254050ea41d5df74077c8f94cc3fb19c4700d468d55e91895da1ea474759d83af499ef436cdbc

View File

@ -1,18 +1,18 @@
From de9459977429efa602aeeab47471a93446f68a8c Mon Sep 17 00:00:00 2001
From 80f36b2b857c73ce4c74d3e16fc0745b83d4fbff Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Thu, 20 May 2021 18:23:43 +0200
Subject: [PATCH] qtsingle patch
Date: Sun, 26 Sep 2021 07:45:00 +0200
Subject: [PATCH] qtsingle
---
texstudio.pro | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/texstudio.pro b/texstudio.pro
index 40a4e51..e499cfd 100644
index 16e704b..c59894e 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -105,7 +105,11 @@ isEmpty(INTERNAL_TERMINAL):pkgAtLeastVersion("qtermwidget5", "0.9.0") {
message(Use experimental JS engine)
@@ -105,7 +105,11 @@ versionGreaterOrEqual($$QT_VERSION, "6.0.0") {
}
}
-include(src/qtsingleapplication/qtsingleapplication.pri)

View File

@ -1,24 +1,26 @@
From 790f4430c0347a1ca51aabc8ad2566a761a0f91a Mon Sep 17 00:00:00 2001
From c2904af9565f2e23c758923eea250b88c468d15c Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Thu, 20 May 2021 18:31:19 +0200
Date: Sun, 26 Sep 2021 07:48:15 +0200
Subject: [PATCH 2/2] wtf
---
texstudio.pro | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
texstudio.pro | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro
index e499cfd..1656c8c 100644
index c59894e..dc2734f 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -438,18 +438,17 @@ exists(./.git) {
@@ -440,19 +440,19 @@ 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 -= -O -O1 -O2 -O3
+# QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Wmissing-include-dirs -Wunknown-pragmas -Wundef -Wpointer-arith -Winline -O0
QMAKE_CXXFLAGS += -std=c++11 -fno-omit-frame-pointer
QMAKE_CXXFLAGS += -fno-omit-frame-pointer
!isEmpty(MXE): QMAKE_CXXFLAGS += -fpermissive
- !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw and haiku
- else {
@ -34,11 +36,10 @@ index e499cfd..1656c8c 100644
+ # QMAKE_LFLAGS -= -Wl,-s
+ # isEmpty(STRIP){
+ # QMAKE_LFLAGS_RELEASE -= -Wl,-s
+ # }
+ # }
+ # }
} else {
DEFINES += _CRT_SECURE_NO_WARNINGS
}
--
2.31.1

View File

@ -1,6 +1,6 @@
Name: texstudio
Version: 3.1.2
Release: 3%{?dist}
Version: 4.0.0
Release: 1%{?dist}
Summary: A feature-rich editor for LaTeX documents
# texstudio binary: GPLv3 due to static linkage of bundled qcodeedit
@ -17,6 +17,7 @@ Patch3: texstudio-wtf_flags.patch
BuildRequires: make
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qttools-static
BuildRequires: qt5-qtsvg-devel
@ -24,8 +25,12 @@ BuildRequires: qt5-qtscript-devel
BuildRequires: hunspell-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: poppler-devel
BuildRequires: poppler-qt5-devel
BuildRequires: poppler-cpp-devel
BuildRequires: qtsingleapplication-devel
BuildRequires: qtsingleapplication-qt5-devel
BuildRequires: qtsinglecoreapplication-devel
BuildRequires: qtsinglecoreapplication-qt5-devel
BuildRequires: qtermwidget-devel
BuildRequires: quazip-qt5-devel
@ -66,7 +71,7 @@ pushd %{_target_platform}
USE_SYSTEM_HUNSPELL=1 \
USE_SYSTEM_QTSINGLEAPPLICATION=1 \
INTERNAL_TERMINAL=1 \
USE_SYSTEM_QUAZIP=1 QUAZIP_LIB=-lquazip5 QUAZIP_INCLUDE=%{_includedir}/quazip5/ \
USE_SYSTEM_QUAZIP=1 QUAZIP_LIB=-lquazip QUAZIP_INCLUDE=%{_includedir}/quazip/ \
../texstudio.pro
popd
@ -119,6 +124,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
%doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
%changelog
* Sun Sep 26 2021 Johannes Lips <hannes@fedoraproject.org> 4.0.0-1
- Update to latest upstream release 4.0.0
* Thu Aug 19 2021 Björn Esser <besser82@fedoraproject.org> - 3.1.2-3
- Rebuild (quazip)