Update to 2.12.16
This commit is contained in:
hannes
parent
9e9e584040
commit
b4c6ebdc1f
|
|
@ -32,3 +32,4 @@
|
|||
/texstudio-2.12.10.tar.gz
|
||||
/texstudio-2.12.12.tar.gz
|
||||
/texstudio-2.12.14.tar.gz
|
||||
/texstudio-2.12.16.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (texstudio-2.12.14.tar.gz) = fe2fe641a455425f87e28f3058f63df103823a97990365e3a3d67d14c4959a6e59db9205ce100f4ebbdb7c8a5c914b0514333b9b9537dd48053bf166e4326984
|
||||
SHA512 (texstudio-2.12.16.tar.gz) = 0c17fda78e0cd491d2869ccb1a164ae2348281a39f9883d813ceb2ed6a0287c4cf9e784cafb9c0a12b8839d7afc8897f8f74acffd87a5dfcb50d3b344f33ad28
|
||||
|
|
|
|||
|
|
@ -1,32 +1,31 @@
|
|||
From 6eb7d610c440c4656943879be0f673dc168cc9fb Mon Sep 17 00:00:00 2001
|
||||
From 5ba8c70f0c60e76b6b79b5025a61eb055b5695a7 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Sat, 10 Feb 2018 10:21:23 +0100
|
||||
Subject: [PATCH] qtsingle patch
|
||||
Date: Fri, 7 Jun 2019 17:33:08 +0200
|
||||
Subject: [PATCH] qtsingle
|
||||
|
||||
---
|
||||
texstudio.pro | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
texstudio.pro | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index 74cd63c..572558f 100644
|
||||
index e360316..17e4af8 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -35,8 +35,13 @@ QT += \
|
||||
@@ -35,7 +35,13 @@ QT += \
|
||||
DEFINES += PHONON
|
||||
}
|
||||
contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
|
||||
-else:include(src/qtsingleapplication/qtsingleapplication.pri)
|
||||
-
|
||||
+else: {
|
||||
+isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){
|
||||
+include(qtsingleapplication/qtsingleapplication.pri)
|
||||
+} else {
|
||||
+CONFIG += qtsingleapplication
|
||||
+}
|
||||
+}
|
||||
+else: {
|
||||
+isEmpty(USE_SYSTEM_QTSINGLEAPPLICATION){
|
||||
+include(qtsingleapplication/qtsingleapplication.pri)
|
||||
+} else {
|
||||
+CONFIG += qtsingleapplication
|
||||
+}
|
||||
+}
|
||||
|
||||
# ##############################
|
||||
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
|
||||
# principal sources
|
||||
--
|
||||
2.14.3
|
||||
2.21.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,38 @@
|
|||
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
|
||||
@@ -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 {
|
||||
- QMAKE_CXXFLAGS += -gstabs -g
|
||||
- QMAKE_LFLAGS -= -Wl,-s
|
||||
- QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
-}
|
||||
+#!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
|
||||
From f36d3dbb8e2b7c8998d637eae493a0314942a21d Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Fri, 7 Jun 2019 17:39:22 +0200
|
||||
Subject: [PATCH 2/2] wtf
|
||||
|
||||
---
|
||||
texstudio.pro | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index 17e4af8..a1e6390 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -420,14 +420,14 @@ exists(./.git) {
|
||||
}
|
||||
|
||||
!win32-msvc*: {
|
||||
- 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_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 {
|
||||
- QMAKE_CXXFLAGS += -gstabs -g
|
||||
- QMAKE_LFLAGS -= -Wl,-s
|
||||
- QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
- }
|
||||
+# !win32: QMAKE_LFLAGS += -rdynamic # option not supported by mingw
|
||||
+# else {
|
||||
+# QMAKE_CXXFLAGS += -gstabs -g
|
||||
+# QMAKE_LFLAGS -= -Wl,-s
|
||||
+# QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
+# }
|
||||
} else {
|
||||
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Name: texstudio
|
||||
Version: 2.12.14
|
||||
Release: 2%{?dist}
|
||||
Version: 2.12.16
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A feature-rich editor for LaTeX documents
|
||||
# texstudio binary: GPLv3 due to static linkage of bundled qcodeedit
|
||||
|
|
@ -10,7 +10,7 @@ URL: https://www.texstudio.org
|
|||
|
||||
Source0: https://github.com/texstudio-org/texstudio#/archive/%{name}-%{version}.tar.gz
|
||||
Source1: texstudio.desktop
|
||||
Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
||||
Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
||||
Patch2: texstudio-debughelper-arm-fix.patch
|
||||
Patch3: texstudio-disable-update-check.patch
|
||||
# don't muck with default build flags
|
||||
|
|
@ -33,6 +33,7 @@ BuildRequires: zlib-devel
|
|||
Requires: tex(latex)
|
||||
Requires: tex(preview.sty)
|
||||
Requires: tex-dvipng
|
||||
Requires: qt5-qtsvg
|
||||
Provides: bundled(qcodeedit)
|
||||
Provides: texmakerx = %{version}-%{release}
|
||||
Obsoletes: texmakerx < 2.2-1
|
||||
|
|
@ -119,6 +120,10 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
|
|||
%doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
|
||||
|
||||
%changelog
|
||||
* Sun May 19 2019 Johannes Lips <hannes@fedoraproject.org> 2.12.16-1
|
||||
- Update to latest upstream bugfix release 2.12.16
|
||||
- added qt5-qtsvg as requires to fix bug #1716129
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue