Update to 2.10.0

This commit is contained in:
hannes 2015-09-11 19:13:25 +02:00
parent 4fc8e183ef
commit 3db42289f6
5 changed files with 47 additions and 41 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@
/texstudio-2.9.0.tar.gz
/texstudio-2.9.2.tar.gz
/texstudio-2.9.4.tar.gz
/texstudio-2.10.0.tar.gz

View File

@ -1 +1 @@
398baea51cf9f9f15ab961da09efb263 texstudio-2.9.4.tar.gz
22ca96706605ccdc1f3f098c13373b71 texstudio-2.10.0.tar.gz

View File

@ -1,36 +1,37 @@
From 7ac1dda09bf5241aca7c09af5fac5c173a6ea653 Mon Sep 17 00:00:00 2001
From 755d3ac64401a27b01258fd488b435b30fc53cb1 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Tue, 9 Sep 2014 20:27:22 +0200
Subject: [PATCH] hunspell_patch
Date: Fri, 11 Sep 2015 07:23:30 +0200
Subject: [PATCH] hunspell-patch
---
texstudio.pro | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro
index 4f778dd..e125fef 100644
index 66f99e9..f375e7e 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -466,7 +466,7 @@ unix {
}
DEFINES += HUNSPELL_STATIC
-include(hunspell/hunspell.pri)
+include(hunspell.pri)
include(qcodeedit/qcodeedit.pri)
@@ -672,4 +672,9 @@ else {
QMAKE_LFLAGS -= -Wl,-s
QMAKE_LFLAGS_RELEASE -= -Wl,-s
}
-
@@ -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
+}
+}
--
1.9.3
2.4.3

View File

@ -1,30 +1,31 @@
From 74c852ca1acfd5613bf45153c8ca9780c698241a Mon Sep 17 00:00:00 2001
From ab41ef57f93d6db1d78fdcaca3c917c8aaf291b6 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Tue, 9 Sep 2014 20:29:09 +0200
Date: Fri, 11 Sep 2015 07:27:50 +0200
Subject: [PATCH 2/2] qtsingle
---
texstudio.pro | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
texstudio.pro | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/texstudio.pro b/texstudio.pro
index e125fef..5f1e323 100644
index f375e7e..821f7d5 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
@@ -678,3 +676,5 @@ unix {
}
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
--
1.9.3

View File

@ -1,6 +1,6 @@
Name: texstudio
Version: 2.9.4
Release: 4%{?dist}
Version: 2.10.0
Release: 1%{?dist}
Summary: A feature-rich editor for LaTeX documents
Group: Applications/Publishing
@ -126,9 +126,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/apps/*.svg
%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
%doc utilities/AUTHORS utilities/COPYING utilities/manual/CHANGELOG.txt
%changelog
* Fri Sep 11 2015 Johannes Lips <hannes@fedoraproject.org> 2.10.0-1
- Update to latest upstream version 2.10.0
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild