1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
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
|
GitWeb