1 |
jlec 12/01/12 10:49:59 |
2 |
|
3 |
Added: texmaker-3.2.2-hunspell.patch |
4 |
Log: |
5 |
Version Bump |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-office/texmaker/files/texmaker-3.2.2-hunspell.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: texmaker-3.2.2-hunspell.patch |
16 |
=================================================================== |
17 |
From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001 |
18 |
Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@g.o> |
19 |
From: Justin Lecher <jlec@g.o> |
20 |
Date: Thu, 22 Dec 2011 12:09:32 +0100 |
21 |
Subject: [PATCH] 3.1-hunspell.patch |
22 |
|
23 |
Conflicts: |
24 |
|
25 |
latexeditor.h |
26 |
texmaker.pro |
27 |
--- |
28 |
configdialog.cpp | 4 ++-- |
29 |
latexeditor.h | 2 +- |
30 |
latexeditorview.h | 2 +- |
31 |
latexhighlighter.h | 2 +- |
32 |
spellerdialog.h | 2 +- |
33 |
texmaker.h | 2 +- |
34 |
texmaker.pro | 44 +++++++------------------------------------- |
35 |
7 files changed, 14 insertions(+), 44 deletions(-) |
36 |
|
37 |
diff --git a/configdialog.cpp b/configdialog.cpp |
38 |
index 144bddc..89e4059 100644 |
39 |
--- a/configdialog.cpp |
40 |
+++ b/configdialog.cpp |
41 |
@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell() |
42 |
QDir spelldir(QCoreApplication::applicationDirPath()); |
43 |
#else |
44 |
#ifdef DEBIAN_SPELLDIR |
45 |
-QDir spelldir(PREFIX"/share/myspell/dicts"); |
46 |
+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell"); |
47 |
#else |
48 |
-QDir spelldir(PREFIX"/share/texmaker"); |
49 |
+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker"); |
50 |
#endif |
51 |
#endif |
52 |
|
53 |
diff --git a/latexeditor.h b/latexeditor.h |
54 |
index 40cc2f6..d46150f 100644 |
55 |
--- a/latexeditor.h |
56 |
+++ b/latexeditor.h |
57 |
@@ -28,7 +28,7 @@ |
58 |
|
59 |
#include "latexhighlighter.h" |
60 |
#include "textblockselection.h" |
61 |
-#include "hunspell/hunspell.hxx" |
62 |
+#include <hunspell.hxx> |
63 |
|
64 |
typedef int UserBookmarkList[3]; |
65 |
|
66 |
diff --git a/latexeditorview.h b/latexeditorview.h |
67 |
index 283fd8a..1ba39cc 100644 |
68 |
--- a/latexeditorview.h |
69 |
+++ b/latexeditorview.h |
70 |
@@ -22,7 +22,7 @@ |
71 |
#include "gotolinewidget.h" |
72 |
#include "replacewidget.h" |
73 |
#include "minisplitter.h" |
74 |
-#include "hunspell/hunspell.hxx" |
75 |
+#include <hunspell.hxx> |
76 |
|
77 |
class LatexEditorView : public QWidget { |
78 |
Q_OBJECT |
79 |
diff --git a/latexhighlighter.h b/latexhighlighter.h |
80 |
index 029c7ad..9fbb532 100644 |
81 |
--- a/latexhighlighter.h |
82 |
+++ b/latexhighlighter.h |
83 |
@@ -20,7 +20,7 @@ |
84 |
#include <QColor> |
85 |
#include <QTextBlockUserData> |
86 |
//#include "latexeditor.h" |
87 |
-#include "hunspell/hunspell.hxx" |
88 |
+#include <hunspell.hxx> |
89 |
|
90 |
class QTextDocument; |
91 |
class LatexEditor; |
92 |
diff --git a/spellerdialog.h b/spellerdialog.h |
93 |
index 83248ae..cd16dad 100644 |
94 |
--- a/spellerdialog.h |
95 |
+++ b/spellerdialog.h |
96 |
@@ -13,7 +13,7 @@ |
97 |
|
98 |
#include "ui_spellerdialog.h" |
99 |
#include "latexeditor.h" |
100 |
-#include "hunspell/hunspell.hxx" |
101 |
+#include <hunspell.hxx> |
102 |
|
103 |
#include <QTextCursor> |
104 |
|
105 |
diff --git a/texmaker.h b/texmaker.h |
106 |
index b1a2c65..0806731 100644 |
107 |
--- a/texmaker.h |
108 |
+++ b/texmaker.h |
109 |
@@ -47,7 +47,7 @@ |
110 |
#include "symbollistwidget.h" |
111 |
#include "xmltagslistwidget.h" |
112 |
#include "logeditor.h" |
113 |
-#include "hunspell/hunspell.hxx" |
114 |
+#include <hunspell.hxx> |
115 |
#include "browser.h" |
116 |
#include "pdfviewerwidget.h" |
117 |
#include "pdfviewer.h" |
118 |
diff --git a/texmaker.pro b/texmaker.pro |
119 |
index 5d017ad..87fac99 100644 |
120 |
--- a/texmaker.pro |
121 |
+++ b/texmaker.pro |
122 |
@@ -4,7 +4,8 @@ TARGET = texmaker |
123 |
QT += network \ |
124 |
xml \ |
125 |
webkit |
126 |
-CONFIG += qt warn_off release |
127 |
+CONFIG += qt warn_off release link_pkgconfig |
128 |
+PKGCONFIG = hunspell |
129 |
TEXMAKERVERSION=3.2.2 |
130 |
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\" |
131 |
DEFINES += HAVE_SPLASH |
132 |
@@ -65,25 +66,6 @@ HEADERS += texmaker.h \ |
133 |
scandialog.h \ |
134 |
synctex_parser.h \ |
135 |
synctex_parser_utils.h \ |
136 |
- hunspell/affentry.hxx \ |
137 |
- hunspell/affixmgr.hxx \ |
138 |
- hunspell/atypes.hxx \ |
139 |
- hunspell/baseaffix.hxx \ |
140 |
- hunspell/csutil.hxx \ |
141 |
- hunspell/dictmgr.hxx \ |
142 |
- hunspell/hashmgr.hxx \ |
143 |
- hunspell/htypes.hxx \ |
144 |
- hunspell/hunspell.hxx \ |
145 |
- hunspell/hunspell.h \ |
146 |
- hunspell/langnum.hxx \ |
147 |
- hunspell/license.hunspell \ |
148 |
- hunspell/phonet.hxx \ |
149 |
- hunspell/suggestmgr.hxx \ |
150 |
- hunspell/license.myspell \ |
151 |
- hunspell/filemgr.hxx \ |
152 |
- hunspell/hunzip.hxx \ |
153 |
- hunspell/replist.hxx \ |
154 |
- hunspell/w_char.hxx \ |
155 |
singleapp/qtlocalpeer.h \ |
156 |
singleapp/qtlockedfile.h \ |
157 |
singleapp/qtsingleapplication.h \ |
158 |
@@ -110,7 +92,7 @@ HEADERS += texmaker.h \ |
159 |
encodingprober/nsSJISProber.h \ |
160 |
encodingprober/nsUniversalDetector.h \ |
161 |
encodingprober/qencodingprober.h \ |
162 |
- encodingprober/UnicodeGroupProber.h |
163 |
+ encodingprober/UnicodeGroupProber.h |
164 |
SOURCES += main.cpp \ |
165 |
texmakerapp.cpp \ |
166 |
texmaker.cpp \ |
167 |
@@ -167,18 +149,6 @@ SOURCES += main.cpp \ |
168 |
scandialog.cpp \ |
169 |
synctex_parser.c \ |
170 |
synctex_parser_utils.c \ |
171 |
- hunspell/affentry.cxx \ |
172 |
- hunspell/affixmgr.cxx \ |
173 |
- hunspell/csutil.cxx \ |
174 |
- hunspell/dictmgr.cxx \ |
175 |
- hunspell/hashmgr.cxx \ |
176 |
- hunspell/hunspell.cxx \ |
177 |
- hunspell/phonet.cxx \ |
178 |
- hunspell/suggestmgr.cxx \ |
179 |
- hunspell/utf_info.cxx \ |
180 |
- hunspell/filemgr.cxx \ |
181 |
- hunspell/replist.cxx \ |
182 |
- hunspell/hunzip.cxx \ |
183 |
singleapp/qtlocalpeer.cpp \ |
184 |
singleapp/qtlockedfile.cpp \ |
185 |
singleapp/qtsingleapplication.cpp \ |
186 |
@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) { |
187 |
ICONDIR=/usr/share/pixmaps |
188 |
} |
189 |
|
190 |
-INCLUDEPATH += /usr/include/poppler/qt4 |
191 |
-LIBS += -L/usr/lib -lpoppler-qt4 |
192 |
-LIBS += -L/usr/lib -lz |
193 |
+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4 |
194 |
+LIBS += -lpoppler-qt4 |
195 |
+LIBS += -lz |
196 |
DEFINES += PREFIX=\\\"$${PREFIX}\\\" |
197 |
target.path = $${PREFIX}/bin |
198 |
|
199 |
-#DEFINES += DEBIAN_SPELLDIR |
200 |
+DEFINES += DEBIAN_SPELLDIR |
201 |
|
202 |
|
203 |
INSTALLS = target |
204 |
-- |
205 |
1.7.8.1 |