summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-11-26 10:38:45 +0100
committerJustin Lecher <jlec@gentoo.org>2015-11-26 11:26:01 +0100
commite872d907849f1b24f8148dbdcebacd744cb8537c (patch)
treed766080c8d94864474dbd6b90622d3fa7945c554 /app-office/texmaker
parentdev-python/pyflakes: Keyword under ALLARCHES policy (diff)
downloadgentoo-e872d907849f1b24f8148dbdcebacd744cb8537c.tar.gz
gentoo-e872d907849f1b24f8148dbdcebacd744cb8537c.tar.bz2
gentoo-e872d907849f1b24f8148dbdcebacd744cb8537c.zip
app-office/texmaker: Drop old
Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'app-office/texmaker')
-rw-r--r--app-office/texmaker/Manifest1
-rw-r--r--app-office/texmaker/files/texmaker-3.1-hunspell.patch167
-rw-r--r--app-office/texmaker/files/texmaker-3.3.3-qt48.patch15
-rw-r--r--app-office/texmaker/files/texmaker-3.3.4-hunspell.patch167
-rw-r--r--app-office/texmaker/files/texmaker-3.5-hunspell.patch148
-rw-r--r--app-office/texmaker/files/texmaker-3.5.1-hunspell.patch148
-rw-r--r--app-office/texmaker/files/texmaker-3.5.2-clang.patch16
-rw-r--r--app-office/texmaker/files/texmaker-3.5.2-hunspell.patch181
-rw-r--r--app-office/texmaker/files/texmaker-4.0.1-hunspell.patch180
-rw-r--r--app-office/texmaker/files/texmaker-4.0.3-hunspell.patch165
-rw-r--r--app-office/texmaker/files/texmaker-4.0.4-unbundle.patch105
-rw-r--r--app-office/texmaker/texmaker-4.3.ebuild87
-rw-r--r--app-office/texmaker/texmaker-4.4.1.ebuild96
13 files changed, 0 insertions, 1476 deletions
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 8882f5a45b93..f9de17820083 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,2 +1 @@
-DIST texmaker-4.3.tar.bz2 11334013 SHA256 670eef7c51630342c87f1c2a77da0b36798fdb971c7893841e13c9342b18da51 SHA512 9bb94a104c6324d2c712b522c60513189575d01d8ea24a6eeef4201ff17c719ab816775eae5239637f5ef2084d7beb8c1d76addc10d5000a1ae53ab33c1adc3d WHIRLPOOL 5942f0262b02746a4fa6ec77c2944b1165fadaf060b8a7248bc4a32b5c74334745c21b221c234e0ddc66d0bb7250a6cdc1a3eb12043de4f19471cf0ce4bb7844
DIST texmaker-4.4.1.tar.bz2 11274997 SHA256 80939493ffb6c92f47c47109dff6de4c91259244247e90ddfb1bb6153559b4b4 SHA512 a165b7757f2170d42f3d48d644cb351efd4d308b1a0601105952c3253084ae4a3d0bbfb7915207ff60d0ba7036283c6c8305a901d7ac8aab4e79c1bb78f68ddd WHIRLPOOL 3b00a894a194659d64ea8058ca1f0d04a68904f4eb638121f935ab83583b83c57bae3d1abb8d1e0541bed4bbaa44336e9733e8de3d346098dafae319437909f2
diff --git a/app-office/texmaker/files/texmaker-3.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.1-hunspell.patch
deleted file mode 100644
index 3b8935d0c237..000000000000
--- a/app-office/texmaker/files/texmaker-3.1-hunspell.patch
+++ /dev/null
@@ -1,167 +0,0 @@
- configdialog.cpp | 4 ++--
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.h | 2 +-
- texmaker.pro | 42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 136072d..550db58 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -122,9 +122,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
-
-diff --git a/latexeditor.h b/latexeditor.h
-index b9b8d75..a9ec1ef 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
-
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index c6cb362..2ecf876 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 83ca79c..a1e437a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
-diff --git a/texmaker.h b/texmaker.h
-index fa56129..4b1367e 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -46,7 +46,7 @@
- #include "symbollistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 5c90e44..4513937 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET = texmaker
- QT += network \
- xml \
- webkit
--CONFIG += qt warn_off release
-+CONFIG += qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -62,25 +63,6 @@ HEADERS += texmaker.h \
- usercompletiondialog.h \
- synctex_parser.h \
- synctex_parser_utils.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/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -162,18 +144,6 @@ SOURCES += main.cpp \
- usercompletiondialog.cpp \
- synctex_parser.c \
- synctex_parser_utils.c \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -262,13 +232,13 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS += -lpoppler-qt4
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
- INSTALLS = target
- HEADERS += x11fontdialog.h
diff --git a/app-office/texmaker/files/texmaker-3.3.3-qt48.patch b/app-office/texmaker/files/texmaker-3.3.3-qt48.patch
deleted file mode 100644
index 139502f12aae..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.3-qt48.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- main.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/main.cpp b/main.cpp
-index e979c1b..da2831a 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -14,6 +14,7 @@
-
- #include "texmakerapp.h"
- #include <QStringList>
-+#include <GL/glu.h>
-
-
- int main( int argc, char ** argv )
diff --git a/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch b/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch
deleted file mode 100644
index cb41050faf49..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch
+++ /dev/null
@@ -1,167 +0,0 @@
- configdialog.cpp | 4 ++--
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.h | 2 +-
- texmaker.pro | 42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 3b91fd0..338b166 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
-
-diff --git a/latexeditor.h b/latexeditor.h
-index e053390..0e82f08 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index fb8d7d4..716b466 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
-diff --git a/texmaker.h b/texmaker.h
-index 584be7f..b0069a4 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 17d0a24..28ad193 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET = texmaker
- QT += network \
- xml \
- webkit
--CONFIG += qt warn_off release
-+CONFIG += qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.3.4
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@ HEADERS += texmaker.h \
- synctex_parser_utils.h \
- usertagslistwidget.h \
- addtagdialog.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/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@ SOURCES += main.cpp \
- synctex_parser_utils.c \
- usertagslistwidget.cpp \
- addtagdialog.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS += -lpoppler-qt4
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
diff --git a/app-office/texmaker/files/texmaker-3.5-hunspell.patch b/app-office/texmaker/files/texmaker-3.5-hunspell.patch
deleted file mode 100644
index 1b747e390517..000000000000
--- a/app-office/texmaker/files/texmaker-3.5-hunspell.patch
+++ /dev/null
@@ -1,148 +0,0 @@
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.h | 2 +-
- texmaker.pro | 40 ++++------------------------------------
- 6 files changed, 9 insertions(+), 41 deletions(-)
-
-diff --git a/latexeditor.h b/latexeditor.h
-index 1ad4195..8f43b61 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 5951656..796eb28 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
-diff --git a/texmaker.h b/texmaker.h
-index 83093d7..7f44645 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 3c0986a..a26295a 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET = texmaker
- QT += network \
- xml \
- webkit
--CONFIG += qt warn_off release
-+CONFIG += qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell poppler-qt4
- TEXMAKERVERSION=3.5
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@ HEADERS += texmaker.h \
- synctex_parser_utils.h \
- usertagslistwidget.h \
- addtagdialog.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/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@ SOURCES += main.cpp \
- synctex_parser_utils.c \
- usertagslistwidget.cpp \
- addtagdialog.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -277,13 +247,11 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
diff --git a/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch
deleted file mode 100644
index f5bdda522922..000000000000
--- a/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch
+++ /dev/null
@@ -1,148 +0,0 @@
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.h | 2 +-
- texmaker.pro | 40 ++++------------------------------------
- 6 files changed, 9 insertions(+), 41 deletions(-)
-
-diff --git a/latexeditor.h b/latexeditor.h
-index 1ad4195..8f43b61 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 5951656..796eb28 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
-diff --git a/texmaker.h b/texmaker.h
-index 83093d7..7f44645 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 3c0986a..a26295a 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET = texmaker
- QT += network \
- xml \
- webkit
--CONFIG += qt warn_off release
-+CONFIG += qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell poppler-qt4
- TEXMAKERVERSION=3.5.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@ HEADERS += texmaker.h \
- synctex_parser_utils.h \
- usertagslistwidget.h \
- addtagdialog.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/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@ SOURCES += main.cpp \
- synctex_parser_utils.c \
- usertagslistwidget.cpp \
- addtagdialog.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -277,13 +247,11 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
diff --git a/app-office/texmaker/files/texmaker-3.5.2-clang.patch b/app-office/texmaker/files/texmaker-3.5.2-clang.patch
deleted file mode 100644
index 8a232a99eb17..000000000000
--- a/app-office/texmaker/files/texmaker-3.5.2-clang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- texmaker.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/texmaker.h b/texmaker.h
-index 3b7135e..acd49d8 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -121,7 +121,7 @@ UserTagsListWidget *usertagsListWidget;
- XmlTagsListWidget *MpListWidget, *PsListWidget, *leftrightWidget, *tikzWidget, *asyWidget;
- SymbolListWidget *RelationListWidget, *ArrowListWidget, *MiscellaneousListWidget, *DelimitersListWidget, *GreekListWidget, *MostUsedListWidget, *FavoriteListWidget;
- QTreeWidget *StructureTreeWidget;
--QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis,;
-+QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis;
- QHBoxLayout *OutputLayoutH, *LeftPanelLayout, *CentralLayout;
- QTableWidget *OutputTableWidget;
- //menu-toolbar
diff --git a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
deleted file mode 100644
index 295f7e342bc2..000000000000
--- a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
+++ /dev/null
@@ -1,181 +0,0 @@
- configdialog.cpp | 2 +-
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.cpp | 4 ++--
- texmaker.h | 2 +-
- texmaker.pro | 40 +++++-----------------------------------
- 8 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index c2354d3..dea2bc1 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -211,7 +211,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index 1ad4195..8f43b61 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 5951656..796eb28 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
-diff --git a/texmaker.cpp b/texmaker.cpp
-index 6e8f41b..c94d76a 100644
---- a/texmaker.cpp
-+++ b/texmaker.cpp
-@@ -4302,7 +4302,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
- #ifdef DEBIAN_SPELLDIR
--QString dicDir=PREFIX"/share/myspell/dicts/";
-+QString dicDir=PREFIX"/share/myspell/";
- #else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-@@ -10747,4 +10747,4 @@ if (singlemode && currentEditorView())
- UpdateBibliography();
- }
- }
--}
-\ No newline at end of file
-+}
-diff --git a/texmaker.h b/texmaker.h
-index 3b7135e..5713b5a 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 9b9083a..9feef01 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -68,25 +68,6 @@ HEADERS += texmaker.h \
- synctex_parser_utils.h \
- usertagslistwidget.h \
- addtagdialog.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/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -173,18 +154,6 @@ SOURCES += main.cpp \
- synctex_parser_utils.c \
- usertagslistwidget.cpp \
- addtagdialog.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -280,13 +249,11 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
-@@ -717,3 +684,6 @@ INSTALLS += utilities
- ICON = texmaker.icns
- QMAKE_INFO_PLIST =Info.plist
- }
-+
-+CONFIG += link_pkgconfig
-+PKGCONFIG = hunspell poppler-qt4
-\ No newline at end of file
diff --git a/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch b/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch
deleted file mode 100644
index b271ea82d2e9..000000000000
--- a/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch
+++ /dev/null
@@ -1,180 +0,0 @@
- configdialog.cpp | 2 +-
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.cpp | 4 ++--
- texmaker.h | 2 +-
- texmaker.pro | 40 +++++-----------------------------------
- 8 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 8a73c4d..6b94401 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -216,7 +216,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index 1ad4195..8f43b61 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 603d82e..844386c 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -23,7 +23,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
-diff --git a/texmaker.cpp b/texmaker.cpp
-index a364143..c4f7d50 100644
---- a/texmaker.cpp
-+++ b/texmaker.cpp
-@@ -4328,7 +4328,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
- #ifdef DEBIAN_SPELLDIR
--QString dicDir=PREFIX"/share/myspell/dicts/";
-+QString dicDir=PREFIX"/share/myspell/";
- #else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-@@ -10786,4 +10786,4 @@ if (singlemode && currentEditorView())
- UpdateBibliography();
- }
- }
--}
-\ No newline at end of file
-+}
-diff --git a/texmaker.h b/texmaker.h
-index 9680c8f..c8f1f24 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 32c3463..e5db444 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -70,25 +70,6 @@ HEADERS += texmaker.h \
- synctex_parser_utils.h \
- usertagslistwidget.h \
- addtagdialog.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/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -175,18 +156,6 @@ SOURCES += main.cpp \
- synctex_parser_utils.c \
- usertagslistwidget.cpp \
- addtagdialog.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -283,13 +252,11 @@ isEmpty( ICONDIR ) {
- }
- ## QT5
- #INCLUDEPATH +=$${QTDIR}/include/
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
-@@ -720,3 +687,6 @@ INSTALLS += utilities
- ICON = texmaker.icns
- QMAKE_INFO_PLIST =Info.plist
- }
-+
-+CONFIG += link_pkgconfig
-+PKGCONFIG = hunspell poppler-qt4
diff --git a/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch b/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
deleted file mode 100644
index 9cabfb2e6f51..000000000000
--- a/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
+++ /dev/null
@@ -1,165 +0,0 @@
- configdialog.cpp | 2 +-
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.cpp | 4 ++--
- texmaker.h | 2 +-
- texmaker.pro | 37 +++----------------------------------
- 8 files changed, 11 insertions(+), 42 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index e596a2c..3660429 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index 29b01f8..1db88ad 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 9809d86..adca0b2 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -23,7 +23,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
-
- #include <QTextCursor>
-
-diff --git a/texmaker.cpp b/texmaker.cpp
-index 51d2082..607f66e 100644
---- a/texmaker.cpp
-+++ b/texmaker.cpp
-@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
- #ifdef DEBIAN_SPELLDIR
--QString dicDir=PREFIX"/share/myspell/dicts/";
-+QString dicDir=PREFIX"/share/myspell/";
- #else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
- UpdateBibliography();
- }
- }
--}
-\ No newline at end of file
-+}
-diff --git a/texmaker.h b/texmaker.h
-index f7e278c..e80d9e5 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index d2312d1..0009663 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -87,25 +87,6 @@ HEADERS += texmaker.h \
- versiondialog.h \
- unicodedialog.h \
- unicodeview.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/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -196,18 +174,6 @@ SOURCES += main.cpp \
- versiondialog.cpp \
- unicodedialog.cpp \
- unicodeview.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -454,3 +420,6 @@ INSTALLS += desktop
- icon.files = utilities/texmaker.png
- INSTALLS += icon
- }
-+
-+CONFIG += link_pkgconfig
-+PKGCONFIG += hunspell
-\ No newline at end of file
diff --git a/app-office/texmaker/files/texmaker-4.0.4-unbundle.patch b/app-office/texmaker/files/texmaker-4.0.4-unbundle.patch
deleted file mode 100644
index f3590c9653f8..000000000000
--- a/app-office/texmaker/files/texmaker-4.0.4-unbundle.patch
+++ /dev/null
@@ -1,105 +0,0 @@
- configdialog.cpp | 2 +-
- texmaker.cpp | 4 ++--
- texmaker.pro | 42 +-----------------------------------------
- 3 files changed, 4 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index e596a2c..3660429 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/texmaker.cpp b/texmaker.cpp
-index 51d2082..607f66e 100644
---- a/texmaker.cpp
-+++ b/texmaker.cpp
-@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
- #ifdef DEBIAN_SPELLDIR
--QString dicDir=PREFIX"/share/myspell/dicts/";
-+QString dicDir=PREFIX"/share/myspell/";
- #else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
- UpdateBibliography();
- }
- }
--}
-\ No newline at end of file
-+}
-diff --git a/texmaker.pro b/texmaker.pro
-index bce8dd4..2f205bb 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -95,29 +95,6 @@ HEADERS += texmaker.h \
- versiondialog.h \
- unicodedialog.h \
- unicodeview.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/replist.hxx \
-- hunspell/w_char.hxx \
-- singleapp/qtlocalpeer.h \
-- singleapp/qtlockedfile.h \
-- singleapp/qtsingleapplication.h \
-- singleapp/qtsinglecoreapplication.h \
- encodingprober/CharDistribution.h \
- encodingprober/ChineseGroupProber.h \
- encodingprober/ctype_test_p.h \
-@@ -204,22 +181,6 @@ SOURCES += main.cpp \
- versiondialog.cpp \
- unicodedialog.cpp \
- unicodeview.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
-- singleapp/qtlocalpeer.cpp \
-- singleapp/qtlockedfile.cpp \
-- singleapp/qtsingleapplication.cpp \
-- singleapp/qtsinglecoreapplication.cpp \
- encodingprober/CharDistribution.cpp \
- encodingprober/ChineseGroupProber.cpp \
- encodingprober/JapaneseGroupProber.cpp \
-@@ -328,8 +289,7 @@ icon.path = $${ICONDIR}
-
- INSTALLS = target
- HEADERS += x11fontdialog.h
--SOURCES += x11fontdialog.cpp \
-- singleapp/qtlockedfile_unix.cpp
-+SOURCES += x11fontdialog.cpp
- FORMS += x11fontdialog.ui
-
- utilities.files = doc/doc1.png \
diff --git a/app-office/texmaker/texmaker-4.3.ebuild b/app-office/texmaker/texmaker-4.3.ebuild
deleted file mode 100644
index 9fd6d305ed1c..000000000000
--- a/app-office/texmaker/texmaker-4.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
- MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
- MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
- app-text/hunspell
- app-text/poppler:=[qt4]
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- dev-qt/qtgui:4
- dev-qt/qtcore:4
- dev-qt/qtscript:4
- dev-qt/qtsingleapplication[X,qt4(+)]
- dev-qt/qtwebkit:4
-"
-RDEPEND="${COMMON_DEPEND}
- virtual/latex-base
- app-i18n/ibus-qt
- app-text/psutils
- app-text/ghostscript-gpl
- media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.1-unbundle.patch )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- find singleapp hunspell -delete || die
-
- qt4-r2_src_prepare
-
- cat >> ${PN}.pro <<- EOF
- exists(texmakerx_my.pri):include(texmakerx_my.pri)
- EOF
-
- cp "${FILESDIR}"/texmakerx_my.pri . || die
-
- sed \
- -e '/^#include/s:hunspell/::g' \
- -e '/^#include/s:singleapp/::g' \
- -i *.cpp *.h || die
-}
-
-src_configure() {
- eqmake4 \
- ${PN}.pro \
- PREFIX="${EPREFIX}/usr" \
- DESKTOPDIR="${EPREFIX}/usr/share/applications" \
- ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-pkg_postinst() {
- elog "A user manual with many screenshots is available at:"
- elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-4.4.1.ebuild b/app-office/texmaker/texmaker-4.4.1.ebuild
deleted file mode 100644
index a8b3c5e67a50..000000000000
--- a/app-office/texmaker/texmaker-4.4.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qmake-utils readme.gentoo
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-COMMON_DEPEND="
- app-text/hunspell
- app-text/poppler:=[qt4?,qt5?]
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- dev-qt/qtsingleapplication[X,qt4?,qt5?]
- qt4? (
- dev-qt/qtgui:4
- dev-qt/qtcore:4
- dev-qt/qtscript:4
- dev-qt/qtwebkit:4
- )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtgui:5
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtwebkit:5[printsupport]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
-"
-RDEPEND="${COMMON_DEPEND}
- virtual/latex-base
- app-text/psutils
- app-text/ghostscript-gpl
- media-libs/netpbm
- qt4? ( app-i18n/ibus-qt )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.1-unbundle.patch )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- find singleapp hunspell -delete || die
-
- epatch "${PATCHES[@]}"
-
- cat >> ${PN}.pro <<- EOF
- exists(texmakerx_my.pri):include(texmakerx_my.pri)
- EOF
-
- cp "${FILESDIR}"/texmakerx_my.pri . || die
-
- sed \
- -e '/^#include/s:hunspell/::g' \
- -e '/^#include/s:singleapp/::g' \
- -i *.cpp *.h || die
-
- DOC_CONTENTS="A user manual with many screenshots is available at:
- ${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
-
-src_configure() {
- local myeqmakeargs=(
- ${PN}.pro
- PREFIX="${EPREFIX}/usr"
- DESKTOPDIR="${EPREFIX}/usr/share/applications"
- ICONDIR="${EPREFIX}/usr/share/pixmaps"
- )
- if use qt4; then
- eqmake4 ${myeqmakeargs[@]}
- else
- eqmake5 ${myeqmakeargs[@]}
- fi
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
- readme.gentoo_create_doc
-}