Update to 2.10.4
This commit is contained in:
hannes
parent
69bc61d5da
commit
951f9a2cc4
|
|
@ -19,3 +19,4 @@
|
|||
/texstudio-2.9.4.tar.gz
|
||||
/texstudio-2.10.0.tar.gz
|
||||
/texstudio-2.10.2.tar.gz
|
||||
/texstudio-2.10.4.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
b5e434e27bd4730654f5b18cb971999d texstudio-2.10.2.tar.gz
|
||||
96b34746e5a2b7b41111cc7ac83d7a92 texstudio-2.10.4.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,37 +1,37 @@
|
|||
From 755d3ac64401a27b01258fd488b435b30fc53cb1 Mon Sep 17 00:00:00 2001
|
||||
From c48ab724c814e2b825b299ce16d2b4a31f7814de Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Fri, 11 Sep 2015 07:23:30 +0200
|
||||
Subject: [PATCH] hunspell-patch
|
||||
Date: Tue, 27 Oct 2015 06:56:09 +0100
|
||||
Subject: [PATCH] hunspell_patch
|
||||
|
||||
---
|
||||
texstudio.pro | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index 66f99e9..f375e7e 100644
|
||||
index a7a82b4..6cefb60 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -480,7 +480,7 @@ unix {
|
||||
}
|
||||
|
||||
DEFINES += HUNSPELL_STATIC
|
||||
-include(hunspell/hunspell.pri)
|
||||
+include(hunspell.pri)
|
||||
|
||||
include(qcodeedit/qcodeedit.pri)
|
||||
|
||||
@@ -665,6 +665,11 @@ else {
|
||||
QMAKE_LFLAGS -= -Wl,-s
|
||||
QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
}
|
||||
-
|
||||
+# enable use of pkgconfig
|
||||
+unix {
|
||||
+ CONFIG += link_pkgconfig
|
||||
+ # use system hunspell
|
||||
+ PKGCONFIG += hunspell
|
||||
+}
|
||||
|
||||
|
||||
@@ -486,7 +486,7 @@ unix {
|
||||
}
|
||||
|
||||
DEFINES += HUNSPELL_STATIC
|
||||
-include(hunspell/hunspell.pri)
|
||||
+include(hunspell.pri)
|
||||
|
||||
include(qcodeedit/qcodeedit.pri)
|
||||
|
||||
@@ -671,6 +671,11 @@ else {
|
||||
QMAKE_LFLAGS -= -Wl,-s
|
||||
QMAKE_LFLAGS_RELEASE -= -Wl,-s
|
||||
}
|
||||
-
|
||||
+# enable use of pkgconfig
|
||||
+unix {
|
||||
+ CONFIG += link_pkgconfig
|
||||
+ # use system hunspell
|
||||
+ PKGCONFIG += hunspell
|
||||
+}
|
||||
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
|
|
|||
|
|
@ -1,31 +1,33 @@
|
|||
From ab41ef57f93d6db1d78fdcaca3c917c8aaf291b6 Mon Sep 17 00:00:00 2001
|
||||
From 2aa5bfbd44cafa25e50ff67255ed1cc51ef94943 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Fri, 11 Sep 2015 07:27:50 +0200
|
||||
Subject: [PATCH 2/2] qtsingle
|
||||
Date: Tue, 27 Oct 2015 07:01:25 +0100
|
||||
Subject: [PATCH 2/2] qtsingle_patch
|
||||
|
||||
---
|
||||
texstudio.pro | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
texstudio.pro | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index f375e7e..821f7d5 100644
|
||||
index 6cefb60..abbeb06 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -33,8 +33,6 @@ QT += \
|
||||
}
|
||||
DEFINES += PHONON
|
||||
}
|
||||
-contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
|
||||
-else:include(qtsingleapplication/qtsingleapplication.pri)
|
||||
|
||||
# ##############################
|
||||
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
|
||||
@@ -671,5 +669,6 @@ unix {
|
||||
# use system hunspell
|
||||
PKGCONFIG += hunspell
|
||||
}
|
||||
-
|
||||
+#use system qtsingleapplication
|
||||
+CONFIG += qtsingleapplication
|
||||
|
||||
@@ -34,8 +34,6 @@ QT += \
|
||||
}
|
||||
DEFINES += PHONON
|
||||
}
|
||||
-contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
|
||||
-else:include(qtsingleapplication/qtsingleapplication.pri)
|
||||
|
||||
# ##############################
|
||||
# precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h
|
||||
@@ -677,5 +675,7 @@ unix {
|
||||
# use system hunspell
|
||||
PKGCONFIG += hunspell
|
||||
}
|
||||
+#use system qtsingleapplication
|
||||
+CONFIG += qtsingleapplication
|
||||
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
From e9b106503d9da08e33ba7ff1433d6c0deb3bafc2 Mon Sep 17 00:00:00 2001
|
||||
From: hannes <hannes@fedoraproject.org>
|
||||
Date: Fri, 20 Jun 2014 19:26:55 +0200
|
||||
Subject: [PATCH 3/3] xdg
|
||||
|
||||
---
|
||||
buildmanager.cpp | 18 +++---------------
|
||||
1 file changed, 3 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/buildmanager.cpp b/buildmanager.cpp
|
||||
index d4c8a83..a33a04b 100644
|
||||
--- a/buildmanager.cpp
|
||||
+++ b/buildmanager.cpp
|
||||
@@ -826,25 +826,13 @@ QString getCommandLineGhostscript(){
|
||||
// xdvi %.dvi -sourceposition @:%.tex
|
||||
// kdvi "file:%.dvi#src:@ %.tex"
|
||||
QString getCommandLineViewDvi(){
|
||||
- switch (x11desktop_env()) {
|
||||
- case 3: return "kdvi %.dvi > /dev/null";
|
||||
- case 4: return "okular %.dvi > /dev/null";
|
||||
- default:return "evince %.dvi > /dev/null";
|
||||
- }
|
||||
+ return "xdg-open %.dvi > /dev/null";
|
||||
};
|
||||
QString getCommandLineViewPs(){
|
||||
- switch (x11desktop_env()) {
|
||||
- case 3: return "kghostview %.ps > /dev/null";
|
||||
- case 4: return "okular %.ps > /dev/null";
|
||||
- default: return "evince %.ps > /dev/null";
|
||||
- };
|
||||
+ return "xdg-open %.ps > /dev/null";
|
||||
}
|
||||
QString getCommandLineViewPdfExternal(){
|
||||
- switch (x11desktop_env()) {
|
||||
- case 3: return "kpdf %.pdf > /dev/null";
|
||||
- case 4: return "okular %.pdf > /dev/null";
|
||||
- default: return "evince %.pdf > /dev/null";
|
||||
- };
|
||||
+ return "xdg-open %.pdf > /dev/null";
|
||||
}
|
||||
QString getCommandLineGhostscript(){ return ""; }
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
Name: texstudio
|
||||
Version: 2.10.2
|
||||
Version: 2.10.4
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A feature-rich editor for LaTeX documents
|
||||
|
|
@ -12,9 +12,8 @@ URL: http://texstudio.sourceforge.net
|
|||
Source0: http://downloads.sourceforge.net/texstudio/texstudio-%{version}.tar.gz
|
||||
Source1: texstudio.desktop
|
||||
Patch0: texstudio-use-system-hunspell-instead-of-bundled-one.patch
|
||||
Patch1: texstudio-viewers-use-xdg-open.patch
|
||||
Patch2: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
||||
Patch3: texstudio-debughelper-arm-fix.patch
|
||||
Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
||||
Patch2: texstudio-debughelper-arm-fix.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
|
|
@ -49,9 +48,8 @@ so it keeps it look&feel.
|
|||
%prep
|
||||
%setup -q -n %{name}%{version}
|
||||
%patch0 -p1 -b .hunspell
|
||||
%patch1 -p1 -b .xdg
|
||||
%patch2 -p1 -b .qtsingle
|
||||
%patch3 -p1 -b .arm
|
||||
%patch1 -p1 -b .qtsingle
|
||||
%patch2 -p1 -b .arm
|
||||
|
||||
rm -rf {hunspell,qtsingleapplication}
|
||||
|
||||
|
|
@ -131,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
|
|||
%doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
|
||||
|
||||
%changelog
|
||||
* Tue Oct 27 2015 Johannes Lips <hannes@fedoraproject.org> 2.10.4-1
|
||||
- Update to latest upstream bugfix release 2.10.4
|
||||
|
||||
* Thu Sep 17 2015 Johannes Lips <hannes@fedoraproject.org> 2.10.2-1
|
||||
- Update to latest upstream bugfix release 2.10.2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue