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