Update to version 2.6.4

This commit is contained in:
hannes 2013-11-02 07:44:06 +00:00
parent b28dd2713f
commit 33d44b1c73
5 changed files with 48 additions and 79 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/texstudio-2.5.2.tar.gz
/texstudio-2.6.0.tar.gz
/texstudio-2.6.2.tar.gz
/texstudio-2.6.4.tar.gz

View File

@ -1 +1 @@
3a6f63c823d7c1a0417136e6e6b44265 texstudio-2.6.2.tar.gz
216b30880b1a73bd98c2250cc6450f37 texstudio-2.6.4.tar.gz

View File

@ -1,14 +1,14 @@
From 30c73dbd1c85c86b23db63ebd8adf41e14286c23 Mon Sep 17 00:00:00 2001
From ba7a762549297d85e838f07c959786bd35095927 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Sun, 16 Jun 2013 09:53:46 +0200
Subject: [PATCH 1/2] patch_hunspell
Date: Sat, 2 Nov 2013 07:13:52 +0000
Subject: [PATCH] hunspell fix
---
spellerutility.h | 2 +-
texstudio.pro | 38 ++++++--------------------------------
2 files changed, 7 insertions(+), 33 deletions(-)
spellerutility.h | 2 +-
texstudio.pro | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git spellerutility.h spellerutility.h
diff --git a/spellerutility.h b/spellerutility.h
index 7e1b980..c973220 100644
--- spellerutility.h
+++ spellerutility.h
@ -21,66 +21,30 @@ index 7e1b980..c973220 100644
class SpellerUtility: public QObject {
Q_OBJECT
public:
diff --git texstudio.pro texstudio.pro
index b073255..d72f7ea 100644
diff --git a/texstudio.pro b/texstudio.pro
index d9c9e64..31e1589 100644
--- texstudio.pro
+++ texstudio.pro
@@ -53,25 +53,6 @@ HEADERS += texmaker.h \
debughelper.h \
thesaurusdialog.h \
xmltagslistwidget.h \
- hunspell/affentry.hxx \
- hunspell/affixmgr.hxx \
- hunspell/atypes.hxx \
- hunspell/baseaffix.hxx \
- hunspell/csutil.hxx \
- hunspell/dictmgr.hxx \
- hunspell/hashmgr.hxx \
- hunspell/htypes.hxx \
- hunspell/hunspell.hxx \
- hunspell/hunspell.h \
- hunspell/langnum.hxx \
- hunspell/license.hunspell \
- hunspell/phonet.hxx \
- hunspell/suggestmgr.hxx \
- hunspell/license.myspell \
- hunspell/filemgr.hxx \
- hunspell/hunzip.hxx \
- hunspell/w_char.hxx \
- hunspell/replist.hxx \
qcodeedit/lib/qeditorinputbinding.h \
qcodeedit/lib/qeditorinputbindinginterface.h \
qcodeedit/lib/qformat.h \
@@ -171,18 +152,6 @@ SOURCES += main.cpp \
codesnippet.cpp \
thesaurusdialog.cpp \
xmltagslistwidget.cpp \
- hunspell/affentry.cxx \
- hunspell/affixmgr.cxx \
- hunspell/csutil.cxx \
- hunspell/dictmgr.cxx \
- hunspell/hashmgr.cxx \
- hunspell/hunspell.cxx \
- hunspell/phonet.cxx \
- hunspell/replist.cxx \
- hunspell/suggestmgr.cxx \
- hunspell/utf_info.cxx \
- hunspell/filemgr.cxx \
- hunspell/hunzip.cxx \
encodingdialog.cpp \
qcodeedit/lib/qeditorinputbinding.cpp \
qcodeedit/lib/qformat.cpp \
@@ -676,4 +645,9 @@ else {
@@ -432,7 +432,7 @@ unix {
utilities
}
-include(hunspell/hunspell.pri)
+include(hunspell.pri)
include(qcodeedit/qcodeedit.pri)
@@ -623,4 +623,10 @@ else {
QMAKE_LFLAGS -= -Wl,-s
QMAKE_LFLAGS_RELEASE -= -Wl,-s
}
-
+# enable use of pkgconfig
+unix {
+ CONFIG += link_pkgconfig
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
+# enable use of pkgconfig
+unix {
+ CONFIG += link_pkgconfig
+ # use system hunspell
+ PKGCONFIG += hunspell
+}
--
1.8.2.1
1.8.3.1

View File

@ -1,17 +1,17 @@
From 99c3b431788b0810fea667ff70a0cb20536a4dd8 Mon Sep 17 00:00:00 2001
From e2b9b897bc064fd75ac9c1a6bfa9b061cb2bc097 Mon Sep 17 00:00:00 2001
From: hannes <hannes@fedoraproject.org>
Date: Sun, 16 Jun 2013 10:02:15 +0200
Subject: [PATCH 2/2] qtsingle_patch
Date: Sat, 2 Nov 2013 07:20:05 +0000
Subject: [PATCH] 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 d72f7ea..af56822 100644
index 31e1589..77f8343 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -11,8 +11,6 @@ QT += network \
@@ -18,8 +18,6 @@ QT += \
QT += phonon
DEFINES += PHONON
}
@ -20,12 +20,13 @@ index d72f7ea..af56822 100644
# ##############################
PRECOMPILED_HEADER = mostQtHeaders.h
@@ -651,3 +649,5 @@ unix {
# use system hunspell
PKGCONFIG += hunspell
}
+#use system qtsingleapplication
@@ -629,4 +627,5 @@ unix {
# use system hunspell
PKGCONFIG += hunspell
}
-
+#use system qtsingleapplication
+CONFIG += qtsingleapplication
--
1.8.2.1
1.8.3.1

View File

@ -1,6 +1,6 @@
Name: texstudio
Version: 2.6.2
Release: 2%{?dist}
Version: 2.6.4
Release: 1%{?dist}
Summary: A feature-rich editor for LaTeX documents
Group: Applications/Publishing
@ -124,6 +124,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
%doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
%changelog
* Sat Nov 02 2013 Johannes Lips <hannes@fedoraproject.org> 2.6.4-1
- Update to latest upstream version 2.6.4
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild