1 |
jlec 11/04/04 06:56:52 |
2 |
|
3 |
Added: texmaker-3.00-hunspell.patch |
4 |
Log: |
5 |
Version Bump |
6 |
|
7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-office/texmaker/files/texmaker-3.00-hunspell.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.00-hunspell.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.00-hunspell.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: texmaker-3.00-hunspell.patch |
16 |
=================================================================== |
17 |
configdialog.cpp | 2 +- |
18 |
latexeditor.h | 2 +- |
19 |
latexeditorview.h | 2 +- |
20 |
latexhighlighter.h | 2 +- |
21 |
spellerdialog.h | 2 +- |
22 |
texmaker.h | 2 +- |
23 |
texmaker.pro | 36 +++--------------------------------- |
24 |
7 files changed, 9 insertions(+), 39 deletions(-) |
25 |
|
26 |
diff --git a/configdialog.cpp b/configdialog.cpp |
27 |
index ef30bd4..1acc9d1 100644 |
28 |
--- a/configdialog.cpp |
29 |
+++ b/configdialog.cpp |
30 |
@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell() |
31 |
QDir spelldir(QCoreApplication::applicationDirPath()); |
32 |
#else |
33 |
#ifdef DEBIAN_SPELLDIR |
34 |
-QDir spelldir(PREFIX"/share/myspell/dicts"); |
35 |
+QDir spelldir(PREFIX"/share/myspell"); |
36 |
#else |
37 |
QDir spelldir(PREFIX"/share/texmaker"); |
38 |
#endif |
39 |
diff --git a/latexeditor.h b/latexeditor.h |
40 |
index b79df23..b482a9a 100644 |
41 |
--- a/latexeditor.h |
42 |
+++ b/latexeditor.h |
43 |
@@ -26,7 +26,7 @@ |
44 |
#include <QTimer> |
45 |
|
46 |
#include "latexhighlighter.h" |
47 |
-#include "hunspell/hunspell.hxx" |
48 |
+#include <hunspell.hxx> |
49 |
|
50 |
typedef int UserBookmarkList[3]; |
51 |
|
52 |
diff --git a/latexeditorview.h b/latexeditorview.h |
53 |
index 0471d6f..f663fdf 100644 |
54 |
--- a/latexeditorview.h |
55 |
+++ b/latexeditorview.h |
56 |
@@ -19,7 +19,7 @@ |
57 |
#include "linenumberwidget.h" |
58 |
#include "findwidget.h" |
59 |
#include "minisplitter.h" |
60 |
-#include "hunspell/hunspell.hxx" |
61 |
+#include <hunspell.hxx> |
62 |
|
63 |
class LatexEditorView : public QWidget { |
64 |
Q_OBJECT |
65 |
diff --git a/latexhighlighter.h b/latexhighlighter.h |
66 |
index 83ca79c..a1e437a 100644 |
67 |
--- a/latexhighlighter.h |
68 |
+++ b/latexhighlighter.h |
69 |
@@ -20,7 +20,7 @@ |
70 |
#include <QColor> |
71 |
#include <QTextBlockUserData> |
72 |
//#include "latexeditor.h" |
73 |
-#include "hunspell/hunspell.hxx" |
74 |
+#include <hunspell.hxx> |
75 |
|
76 |
class QTextDocument; |
77 |
class LatexEditor; |
78 |
diff --git a/spellerdialog.h b/spellerdialog.h |
79 |
index 83248ae..cd16dad 100644 |
80 |
--- a/spellerdialog.h |
81 |
+++ b/spellerdialog.h |
82 |
@@ -13,7 +13,7 @@ |
83 |
|
84 |
#include "ui_spellerdialog.h" |
85 |
#include "latexeditor.h" |
86 |
-#include "hunspell/hunspell.hxx" |
87 |
+#include <hunspell.hxx> |
88 |
|
89 |
#include <QTextCursor> |
90 |
|
91 |
diff --git a/texmaker.h b/texmaker.h |
92 |
index 66d7967..f8e4b57 100644 |
93 |
--- a/texmaker.h |
94 |
+++ b/texmaker.h |
95 |
@@ -47,7 +47,7 @@ |
96 |
#include "logeditor.h" |
97 |
#include "gotolinedialog.h" |
98 |
#include "replacedialog.h" |
99 |
-#include "hunspell/hunspell.hxx" |
100 |
+#include <hunspell.hxx> |
101 |
#include "browser.h" |
102 |
#include "pdfviewerwidget.h" |
103 |
#include "pdfviewer.h" |
104 |
diff --git a/texmaker.pro b/texmaker.pro |
105 |
index 9078988..fb42191 100644 |
106 |
--- a/texmaker.pro |
107 |
+++ b/texmaker.pro |
108 |
@@ -4,7 +4,8 @@ TARGET = texmaker |
109 |
QT += network \ |
110 |
xml \ |
111 |
webkit |
112 |
-CONFIG += qt warn_off release |
113 |
+CONFIG += qt warn_off release link_pkgconfig |
114 |
+PKGCONFIG = hunspell |
115 |
TEXMAKERVERSION=3.0 |
116 |
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\" |
117 |
DEFINES += HAVE_SPLASH |
118 |
@@ -56,25 +57,6 @@ HEADERS += texmaker.h \ |
119 |
usercompletiondialog.h \ |
120 |
synctex_parser.h \ |
121 |
synctex_parser_utils.h \ |
122 |
- hunspell/affentry.hxx \ |
123 |
- hunspell/affixmgr.hxx \ |
124 |
- hunspell/atypes.hxx \ |
125 |
- hunspell/baseaffix.hxx \ |
126 |
- hunspell/csutil.hxx \ |
127 |
- hunspell/dictmgr.hxx \ |
128 |
- hunspell/hashmgr.hxx \ |
129 |
- hunspell/htypes.hxx \ |
130 |
- hunspell/hunspell.hxx \ |
131 |
- hunspell/hunspell.h \ |
132 |
- hunspell/langnum.hxx \ |
133 |
- hunspell/license.hunspell \ |
134 |
- hunspell/phonet.hxx \ |
135 |
- hunspell/suggestmgr.hxx \ |
136 |
- hunspell/license.myspell \ |
137 |
- hunspell/filemgr.hxx \ |
138 |
- hunspell/hunzip.hxx \ |
139 |
- hunspell/replist.hxx \ |
140 |
- hunspell/w_char.hxx \ |
141 |
singleapp/qtlocalpeer.h \ |
142 |
singleapp/qtlockedfile.h \ |
143 |
singleapp/qtsingleapplication.h \ |
144 |
@@ -150,18 +132,6 @@ SOURCES += main.cpp \ |
145 |
usercompletiondialog.cpp \ |
146 |
synctex_parser.c \ |
147 |
synctex_parser_utils.c \ |
148 |
- hunspell/affentry.cxx \ |
149 |
- hunspell/affixmgr.cxx \ |
150 |
- hunspell/csutil.cxx \ |
151 |
- hunspell/dictmgr.cxx \ |
152 |
- hunspell/hashmgr.cxx \ |
153 |
- hunspell/hunspell.cxx \ |
154 |
- hunspell/phonet.cxx \ |
155 |
- hunspell/suggestmgr.cxx \ |
156 |
- hunspell/utf_info.cxx \ |
157 |
- hunspell/filemgr.cxx \ |
158 |
- hunspell/replist.cxx \ |
159 |
- hunspell/hunzip.cxx \ |
160 |
singleapp/qtlocalpeer.cpp \ |
161 |
singleapp/qtlockedfile.cpp \ |
162 |
singleapp/qtsingleapplication.cpp \ |
163 |
@@ -253,7 +223,7 @@ LIBS += -L/usr/lib -lz |
164 |
DEFINES += PREFIX=\\\"$${PREFIX}\\\" |
165 |
target.path = $${PREFIX}/bin |
166 |
|
167 |
-#DEFINES += DEBIAN_SPELLDIR |
168 |
+DEFINES += DEBIAN_SPELLDIR |
169 |
|
170 |
INSTALLS = target |
171 |
HEADERS += x11fontdialog.h |