[gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/

[Patrice Clement]

commit:     3fecf7db505b68c6a25517193e29e4c3328d3591
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 17:33:44 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 17:34:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fecf7db

app-office/texstudio: remove unused patches.

Courtesy of Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>.

Closes: https://github.com/gentoo/gentoo/pull/1916
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../texstudio/files/texstudio-2.6.0-desktop.patch  | 22 -----
 .../files/texstudio-2.6.0-hunspell-quazip.patch    | 93 ----------------------
 2 files changed, 115 deletions(-)

diff --git a/app-office/texstudio/files/texstudio-2.6.0-desktop.patch b/app-office/texstudio/files/texstudio-2.6.0-desktop.patch
deleted file mode 100644
index 6d23788..00000000
--- a/app-office/texstudio/files/texstudio-2.6.0-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- utilities/texstudio.desktop | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/utilities/texstudio.desktop b/utilities/texstudio.desktop
-index 199255f..9c95afd 100644
---- a/utilities/texstudio.desktop
-+++ b/utilities/texstudio.desktop
-@@ -1,13 +1,12 @@
- [Desktop Entry]
- Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
--Encoding=UTF-8
- Exec=texstudio %F
- GenericName=LaTeX Editor
- GenericName[fr]=Editeur LaTeX
- Comment=LaTeX development environment
- Comment[fr]=Environnement de développement LaTeX
- Icon=/usr/share/texstudio/texstudio.svg
--MimeType=text/x-tex;
-+MimeType=text/X-tex;
- Name=TeXstudio
- StartupNotify=false
- Terminal=false

diff --git a/app-office/texstudio/files/texstudio-2.6.0-hunspell-quazip.patch b/app-office/texstudio/files/texstudio-2.6.0-hunspell-quazip.patch
deleted file mode 100644
index 2cf2ec0..00000000
--- a/app-office/texstudio/files/texstudio-2.6.0-hunspell-quazip.patch
+++ /dev/null
@@ -1,93 +0,0 @@
- spellerutility.h |  2 +-
- texstudio.pro    | 45 ++++++++++++---------------------------------
- 2 files changed, 13 insertions(+), 34 deletions(-)
-
-diff --git a/spellerutility.h b/spellerutility.h
-index 7e1b980..b0bc8b8 100644
---- a/spellerutility.h
-+++ b/spellerutility.h
-@@ -13,7 +13,7 @@
- 
- #include "mostQtHeaders.h"
- 
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- class SpellerUtility: public QObject {
- 	Q_OBJECT
- public:
-diff --git a/texstudio.pro b/texstudio.pro
-index b073255..3d4ee64 100644
---- a/texstudio.pro
-+++ b/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 \
-@@ -537,10 +506,14 @@ SOURCES += qcodeedit/lib/qnfa/qnfa.cpp \
- # ###############################
- 
- # ##########QUAZIP###############
--DEFINES += QUAZIP_STATIC
-+#DEFINES += QUAZIP_STATIC
- 
- # Input
--include(quazip/quazip/quazip.pri)
-+#include(quazip/quazip/quazip.pri)
-+unix {
-+  INCLUDEPATH += $${PREFIX}/include/quazip
-+  LIBS += -lquazip
-+}
- 
- # ###############################
- 
-@@ -677,3 +650,9 @@ else {
-   QMAKE_LFLAGS_RELEASE -= -Wl,-s
- }
- 
-+unix {
-+  CONFIG   += link_pkgconfig
-+  # use system quazip
-+  # use system hunspell
-+  PKGCONFIG += hunspell
-+}