Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
Date: Thu, 26 Nov 2015 10:26:13
Message-Id: 1448533561.e872d907849f1b24f8148dbdcebacd744cb8537c.jlec@gentoo
1 commit: e872d907849f1b24f8148dbdcebacd744cb8537c
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 26 09:38:45 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 26 10:26:01 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e872d907
7
8 app-office/texmaker: Drop old
9
10 Package-Manager: portage-2.2.25
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 app-office/texmaker/Manifest | 1 -
14 .../texmaker/files/texmaker-3.1-hunspell.patch | 167 -------------------
15 .../texmaker/files/texmaker-3.3.3-qt48.patch | 15 --
16 .../texmaker/files/texmaker-3.3.4-hunspell.patch | 167 -------------------
17 .../texmaker/files/texmaker-3.5-hunspell.patch | 148 -----------------
18 .../texmaker/files/texmaker-3.5.1-hunspell.patch | 148 -----------------
19 .../texmaker/files/texmaker-3.5.2-clang.patch | 16 --
20 .../texmaker/files/texmaker-3.5.2-hunspell.patch | 181 ---------------------
21 .../texmaker/files/texmaker-4.0.1-hunspell.patch | 180 --------------------
22 .../texmaker/files/texmaker-4.0.3-hunspell.patch | 165 -------------------
23 .../texmaker/files/texmaker-4.0.4-unbundle.patch | 105 ------------
24 app-office/texmaker/texmaker-4.3.ebuild | 87 ----------
25 app-office/texmaker/texmaker-4.4.1.ebuild | 96 -----------
26 13 files changed, 1476 deletions(-)
27
28 diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
29 index 8882f5a..f9de178 100644
30 --- a/app-office/texmaker/Manifest
31 +++ b/app-office/texmaker/Manifest
32 @@ -1,2 +1 @@
33 -DIST texmaker-4.3.tar.bz2 11334013 SHA256 670eef7c51630342c87f1c2a77da0b36798fdb971c7893841e13c9342b18da51 SHA512 9bb94a104c6324d2c712b522c60513189575d01d8ea24a6eeef4201ff17c719ab816775eae5239637f5ef2084d7beb8c1d76addc10d5000a1ae53ab33c1adc3d WHIRLPOOL 5942f0262b02746a4fa6ec77c2944b1165fadaf060b8a7248bc4a32b5c74334745c21b221c234e0ddc66d0bb7250a6cdc1a3eb12043de4f19471cf0ce4bb7844
34 DIST texmaker-4.4.1.tar.bz2 11274997 SHA256 80939493ffb6c92f47c47109dff6de4c91259244247e90ddfb1bb6153559b4b4 SHA512 a165b7757f2170d42f3d48d644cb351efd4d308b1a0601105952c3253084ae4a3d0bbfb7915207ff60d0ba7036283c6c8305a901d7ac8aab4e79c1bb78f68ddd WHIRLPOOL 3b00a894a194659d64ea8058ca1f0d04a68904f4eb638121f935ab83583b83c57bae3d1abb8d1e0541bed4bbaa44336e9733e8de3d346098dafae319437909f2
35
36 diff --git a/app-office/texmaker/files/texmaker-3.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.1-hunspell.patch
37 deleted file mode 100644
38 index 3b8935d..0000000
39 --- a/app-office/texmaker/files/texmaker-3.1-hunspell.patch
40 +++ /dev/null
41 @@ -1,167 +0,0 @@
42 - configdialog.cpp | 4 ++--
43 - latexeditor.h | 2 +-
44 - latexeditorview.h | 2 +-
45 - latexhighlighter.h | 2 +-
46 - spellerdialog.h | 2 +-
47 - texmaker.h | 2 +-
48 - texmaker.pro | 42 ++++++------------------------------------
49 - 7 files changed, 13 insertions(+), 43 deletions(-)
50 -
51 -diff --git a/configdialog.cpp b/configdialog.cpp
52 -index 136072d..550db58 100644
53 ---- a/configdialog.cpp
54 -+++ b/configdialog.cpp
55 -@@ -122,9 +122,9 @@ void ConfigDialog::browseAspell()
56 - QDir spelldir(QCoreApplication::applicationDirPath());
57 - #else
58 - #ifdef DEBIAN_SPELLDIR
59 --QDir spelldir(PREFIX"/share/myspell/dicts");
60 -+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
61 - #else
62 --QDir spelldir(PREFIX"/share/texmaker");
63 -+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
64 - #endif
65 - #endif
66 -
67 -diff --git a/latexeditor.h b/latexeditor.h
68 -index b9b8d75..a9ec1ef 100644
69 ---- a/latexeditor.h
70 -+++ b/latexeditor.h
71 -@@ -26,7 +26,7 @@
72 - #include <QTimer>
73 -
74 - #include "latexhighlighter.h"
75 --#include "hunspell/hunspell.hxx"
76 -+#include <hunspell.hxx>
77 -
78 - typedef int UserBookmarkList[3];
79 -
80 -diff --git a/latexeditorview.h b/latexeditorview.h
81 -index c6cb362..2ecf876 100644
82 ---- a/latexeditorview.h
83 -+++ b/latexeditorview.h
84 -@@ -22,7 +22,7 @@
85 - #include "gotolinewidget.h"
86 - #include "replacewidget.h"
87 - #include "minisplitter.h"
88 --#include "hunspell/hunspell.hxx"
89 -+#include <hunspell.hxx>
90 -
91 - class LatexEditorView : public QWidget {
92 - Q_OBJECT
93 -diff --git a/latexhighlighter.h b/latexhighlighter.h
94 -index 83ca79c..a1e437a 100644
95 ---- a/latexhighlighter.h
96 -+++ b/latexhighlighter.h
97 -@@ -20,7 +20,7 @@
98 - #include <QColor>
99 - #include <QTextBlockUserData>
100 - //#include "latexeditor.h"
101 --#include "hunspell/hunspell.hxx"
102 -+#include <hunspell.hxx>
103 -
104 - class QTextDocument;
105 - class LatexEditor;
106 -diff --git a/spellerdialog.h b/spellerdialog.h
107 -index 83248ae..cd16dad 100644
108 ---- a/spellerdialog.h
109 -+++ b/spellerdialog.h
110 -@@ -13,7 +13,7 @@
111 -
112 - #include "ui_spellerdialog.h"
113 - #include "latexeditor.h"
114 --#include "hunspell/hunspell.hxx"
115 -+#include <hunspell.hxx>
116 -
117 - #include <QTextCursor>
118 -
119 -diff --git a/texmaker.h b/texmaker.h
120 -index fa56129..4b1367e 100644
121 ---- a/texmaker.h
122 -+++ b/texmaker.h
123 -@@ -46,7 +46,7 @@
124 - #include "symbollistwidget.h"
125 - #include "xmltagslistwidget.h"
126 - #include "logeditor.h"
127 --#include "hunspell/hunspell.hxx"
128 -+#include <hunspell.hxx>
129 - #include "browser.h"
130 - #include "pdfviewerwidget.h"
131 - #include "pdfviewer.h"
132 -diff --git a/texmaker.pro b/texmaker.pro
133 -index 5c90e44..4513937 100644
134 ---- a/texmaker.pro
135 -+++ b/texmaker.pro
136 -@@ -4,7 +4,8 @@ TARGET = texmaker
137 - QT += network \
138 - xml \
139 - webkit
140 --CONFIG += qt warn_off release
141 -+CONFIG += qt warn_off release link_pkgconfig
142 -+PKGCONFIG = hunspell
143 - TEXMAKERVERSION=3.1
144 - DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
145 - DEFINES += HAVE_SPLASH
146 -@@ -62,25 +63,6 @@ HEADERS += texmaker.h \
147 - usercompletiondialog.h \
148 - synctex_parser.h \
149 - synctex_parser_utils.h \
150 -- hunspell/affentry.hxx \
151 -- hunspell/affixmgr.hxx \
152 -- hunspell/atypes.hxx \
153 -- hunspell/baseaffix.hxx \
154 -- hunspell/csutil.hxx \
155 -- hunspell/dictmgr.hxx \
156 -- hunspell/hashmgr.hxx \
157 -- hunspell/htypes.hxx \
158 -- hunspell/hunspell.hxx \
159 -- hunspell/hunspell.h \
160 -- hunspell/langnum.hxx \
161 -- hunspell/license.hunspell \
162 -- hunspell/phonet.hxx \
163 -- hunspell/suggestmgr.hxx \
164 -- hunspell/license.myspell \
165 -- hunspell/filemgr.hxx \
166 -- hunspell/hunzip.hxx \
167 -- hunspell/replist.hxx \
168 -- hunspell/w_char.hxx \
169 - singleapp/qtlocalpeer.h \
170 - singleapp/qtlockedfile.h \
171 - singleapp/qtsingleapplication.h \
172 -@@ -162,18 +144,6 @@ SOURCES += main.cpp \
173 - usercompletiondialog.cpp \
174 - synctex_parser.c \
175 - synctex_parser_utils.c \
176 -- hunspell/affentry.cxx \
177 -- hunspell/affixmgr.cxx \
178 -- hunspell/csutil.cxx \
179 -- hunspell/dictmgr.cxx \
180 -- hunspell/hashmgr.cxx \
181 -- hunspell/hunspell.cxx \
182 -- hunspell/phonet.cxx \
183 -- hunspell/suggestmgr.cxx \
184 -- hunspell/utf_info.cxx \
185 -- hunspell/filemgr.cxx \
186 -- hunspell/replist.cxx \
187 -- hunspell/hunzip.cxx \
188 - singleapp/qtlocalpeer.cpp \
189 - singleapp/qtlockedfile.cpp \
190 - singleapp/qtsingleapplication.cpp \
191 -@@ -262,13 +232,13 @@ isEmpty( ICONDIR ) {
192 - ICONDIR=/usr/share/pixmaps
193 - }
194 -
195 --INCLUDEPATH += /usr/include/poppler/qt4
196 --LIBS += -L/usr/lib -lpoppler-qt4
197 --LIBS += -L/usr/lib -lz
198 -+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
199 -+LIBS += -lpoppler-qt4
200 -+LIBS += -lz
201 - DEFINES += PREFIX=\\\"$${PREFIX}\\\"
202 - target.path = $${PREFIX}/bin
203 -
204 --#DEFINES += DEBIAN_SPELLDIR
205 -+DEFINES += DEBIAN_SPELLDIR
206 -
207 - INSTALLS = target
208 - HEADERS += x11fontdialog.h
209
210 diff --git a/app-office/texmaker/files/texmaker-3.3.3-qt48.patch b/app-office/texmaker/files/texmaker-3.3.3-qt48.patch
211 deleted file mode 100644
212 index 139502f..0000000
213 --- a/app-office/texmaker/files/texmaker-3.3.3-qt48.patch
214 +++ /dev/null
215 @@ -1,15 +0,0 @@
216 - main.cpp | 1 +
217 - 1 files changed, 1 insertions(+), 0 deletions(-)
218 -
219 -diff --git a/main.cpp b/main.cpp
220 -index e979c1b..da2831a 100644
221 ---- a/main.cpp
222 -+++ b/main.cpp
223 -@@ -14,6 +14,7 @@
224 -
225 - #include "texmakerapp.h"
226 - #include <QStringList>
227 -+#include <GL/glu.h>
228 -
229 -
230 - int main( int argc, char ** argv )
231
232 diff --git a/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch b/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch
233 deleted file mode 100644
234 index cb41050..0000000
235 --- a/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch
236 +++ /dev/null
237 @@ -1,167 +0,0 @@
238 - configdialog.cpp | 4 ++--
239 - latexeditor.h | 2 +-
240 - latexeditorview.h | 2 +-
241 - latexhighlighter.h | 2 +-
242 - spellerdialog.h | 2 +-
243 - texmaker.h | 2 +-
244 - texmaker.pro | 42 ++++++------------------------------------
245 - 7 files changed, 13 insertions(+), 43 deletions(-)
246 -
247 -diff --git a/configdialog.cpp b/configdialog.cpp
248 -index 3b91fd0..338b166 100644
249 ---- a/configdialog.cpp
250 -+++ b/configdialog.cpp
251 -@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
252 - QDir spelldir(QCoreApplication::applicationDirPath());
253 - #else
254 - #ifdef DEBIAN_SPELLDIR
255 --QDir spelldir(PREFIX"/share/myspell/dicts");
256 -+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
257 - #else
258 --QDir spelldir(PREFIX"/share/texmaker");
259 -+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
260 - #endif
261 - #endif
262 -
263 -diff --git a/latexeditor.h b/latexeditor.h
264 -index e053390..0e82f08 100644
265 ---- a/latexeditor.h
266 -+++ b/latexeditor.h
267 -@@ -33,7 +33,7 @@
268 -
269 - #include "latexhighlighter.h"
270 - #include "textblockselection.h"
271 --#include "hunspell/hunspell.hxx"
272 -+#include <hunspell.hxx>
273 -
274 - typedef int UserBookmarkList[3];
275 -
276 -diff --git a/latexeditorview.h b/latexeditorview.h
277 -index fb8d7d4..716b466 100644
278 ---- a/latexeditorview.h
279 -+++ b/latexeditorview.h
280 -@@ -22,7 +22,7 @@
281 - #include "gotolinewidget.h"
282 - #include "replacewidget.h"
283 - #include "minisplitter.h"
284 --#include "hunspell/hunspell.hxx"
285 -+#include <hunspell.hxx>
286 -
287 - class LatexEditorView : public QWidget {
288 - Q_OBJECT
289 -diff --git a/latexhighlighter.h b/latexhighlighter.h
290 -index e0b91b1..74ec42a 100644
291 ---- a/latexhighlighter.h
292 -+++ b/latexhighlighter.h
293 -@@ -20,7 +20,7 @@
294 - #include <QColor>
295 - #include <QTextBlockUserData>
296 - //#include "latexeditor.h"
297 --#include "hunspell/hunspell.hxx"
298 -+#include <hunspell.hxx>
299 -
300 - class QTextDocument;
301 - class LatexEditor;
302 -diff --git a/spellerdialog.h b/spellerdialog.h
303 -index 83248ae..cd16dad 100644
304 ---- a/spellerdialog.h
305 -+++ b/spellerdialog.h
306 -@@ -13,7 +13,7 @@
307 -
308 - #include "ui_spellerdialog.h"
309 - #include "latexeditor.h"
310 --#include "hunspell/hunspell.hxx"
311 -+#include <hunspell.hxx>
312 -
313 - #include <QTextCursor>
314 -
315 -diff --git a/texmaker.h b/texmaker.h
316 -index 584be7f..b0069a4 100644
317 ---- a/texmaker.h
318 -+++ b/texmaker.h
319 -@@ -48,7 +48,7 @@
320 - #include "usertagslistwidget.h"
321 - #include "xmltagslistwidget.h"
322 - #include "logeditor.h"
323 --#include "hunspell/hunspell.hxx"
324 -+#include <hunspell.hxx>
325 - #include "browser.h"
326 - #include "pdfviewerwidget.h"
327 - #include "pdfviewer.h"
328 -diff --git a/texmaker.pro b/texmaker.pro
329 -index 17d0a24..28ad193 100644
330 ---- a/texmaker.pro
331 -+++ b/texmaker.pro
332 -@@ -4,7 +4,8 @@ TARGET = texmaker
333 - QT += network \
334 - xml \
335 - webkit
336 --CONFIG += qt warn_off release
337 -+CONFIG += qt warn_off release link_pkgconfig
338 -+PKGCONFIG = hunspell
339 - TEXMAKERVERSION=3.3.4
340 - DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
341 - DEFINES += HAVE_SPLASH
342 -@@ -67,25 +68,6 @@ HEADERS += texmaker.h \
343 - synctex_parser_utils.h \
344 - usertagslistwidget.h \
345 - addtagdialog.h \
346 -- hunspell/affentry.hxx \
347 -- hunspell/affixmgr.hxx \
348 -- hunspell/atypes.hxx \
349 -- hunspell/baseaffix.hxx \
350 -- hunspell/csutil.hxx \
351 -- hunspell/dictmgr.hxx \
352 -- hunspell/hashmgr.hxx \
353 -- hunspell/htypes.hxx \
354 -- hunspell/hunspell.hxx \
355 -- hunspell/hunspell.h \
356 -- hunspell/langnum.hxx \
357 -- hunspell/license.hunspell \
358 -- hunspell/phonet.hxx \
359 -- hunspell/suggestmgr.hxx \
360 -- hunspell/license.myspell \
361 -- hunspell/filemgr.hxx \
362 -- hunspell/hunzip.hxx \
363 -- hunspell/replist.hxx \
364 -- hunspell/w_char.hxx \
365 - singleapp/qtlocalpeer.h \
366 - singleapp/qtlockedfile.h \
367 - singleapp/qtsingleapplication.h \
368 -@@ -171,18 +153,6 @@ SOURCES += main.cpp \
369 - synctex_parser_utils.c \
370 - usertagslistwidget.cpp \
371 - addtagdialog.cpp \
372 -- hunspell/affentry.cxx \
373 -- hunspell/affixmgr.cxx \
374 -- hunspell/csutil.cxx \
375 -- hunspell/dictmgr.cxx \
376 -- hunspell/hashmgr.cxx \
377 -- hunspell/hunspell.cxx \
378 -- hunspell/phonet.cxx \
379 -- hunspell/suggestmgr.cxx \
380 -- hunspell/utf_info.cxx \
381 -- hunspell/filemgr.cxx \
382 -- hunspell/replist.cxx \
383 -- hunspell/hunzip.cxx \
384 - singleapp/qtlocalpeer.cpp \
385 - singleapp/qtlockedfile.cpp \
386 - singleapp/qtsingleapplication.cpp \
387 -@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
388 - ICONDIR=/usr/share/pixmaps
389 - }
390 -
391 --INCLUDEPATH += /usr/include/poppler/qt4
392 --LIBS += -L/usr/lib -lpoppler-qt4
393 --LIBS += -L/usr/lib -lz
394 -+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
395 -+LIBS += -lpoppler-qt4
396 -+LIBS += -lz
397 - DEFINES += PREFIX=\\\"$${PREFIX}\\\"
398 - target.path = $${PREFIX}/bin
399 -
400 --#DEFINES += DEBIAN_SPELLDIR
401 -+DEFINES += DEBIAN_SPELLDIR
402 -
403 -
404 - INSTALLS = target
405
406 diff --git a/app-office/texmaker/files/texmaker-3.5-hunspell.patch b/app-office/texmaker/files/texmaker-3.5-hunspell.patch
407 deleted file mode 100644
408 index 1b747e3..0000000
409 --- a/app-office/texmaker/files/texmaker-3.5-hunspell.patch
410 +++ /dev/null
411 @@ -1,148 +0,0 @@
412 - latexeditor.h | 2 +-
413 - latexeditorview.h | 2 +-
414 - latexhighlighter.h | 2 +-
415 - spellerdialog.h | 2 +-
416 - texmaker.h | 2 +-
417 - texmaker.pro | 40 ++++------------------------------------
418 - 6 files changed, 9 insertions(+), 41 deletions(-)
419 -
420 -diff --git a/latexeditor.h b/latexeditor.h
421 -index 1ad4195..8f43b61 100644
422 ---- a/latexeditor.h
423 -+++ b/latexeditor.h
424 -@@ -33,7 +33,7 @@
425 -
426 - #include "latexhighlighter.h"
427 - #include "textblockselection.h"
428 --#include "hunspell/hunspell.hxx"
429 -+#include <hunspell.hxx>
430 -
431 - typedef int UserBookmarkList[3];
432 -
433 -diff --git a/latexeditorview.h b/latexeditorview.h
434 -index 5951656..796eb28 100644
435 ---- a/latexeditorview.h
436 -+++ b/latexeditorview.h
437 -@@ -22,7 +22,7 @@
438 - #include "gotolinewidget.h"
439 - #include "replacewidget.h"
440 - #include "minisplitter.h"
441 --#include "hunspell/hunspell.hxx"
442 -+#include <hunspell.hxx>
443 -
444 - class LatexEditorView : public QWidget {
445 - Q_OBJECT
446 -diff --git a/latexhighlighter.h b/latexhighlighter.h
447 -index e0b91b1..74ec42a 100644
448 ---- a/latexhighlighter.h
449 -+++ b/latexhighlighter.h
450 -@@ -20,7 +20,7 @@
451 - #include <QColor>
452 - #include <QTextBlockUserData>
453 - //#include "latexeditor.h"
454 --#include "hunspell/hunspell.hxx"
455 -+#include <hunspell.hxx>
456 -
457 - class QTextDocument;
458 - class LatexEditor;
459 -diff --git a/spellerdialog.h b/spellerdialog.h
460 -index 83248ae..cd16dad 100644
461 ---- a/spellerdialog.h
462 -+++ b/spellerdialog.h
463 -@@ -13,7 +13,7 @@
464 -
465 - #include "ui_spellerdialog.h"
466 - #include "latexeditor.h"
467 --#include "hunspell/hunspell.hxx"
468 -+#include <hunspell.hxx>
469 -
470 - #include <QTextCursor>
471 -
472 -diff --git a/texmaker.h b/texmaker.h
473 -index 83093d7..7f44645 100644
474 ---- a/texmaker.h
475 -+++ b/texmaker.h
476 -@@ -48,7 +48,7 @@
477 - #include "usertagslistwidget.h"
478 - #include "xmltagslistwidget.h"
479 - #include "logeditor.h"
480 --#include "hunspell/hunspell.hxx"
481 -+#include <hunspell.hxx>
482 - #include "browser.h"
483 - #include "pdfviewerwidget.h"
484 - #include "pdfviewer.h"
485 -diff --git a/texmaker.pro b/texmaker.pro
486 -index 3c0986a..a26295a 100644
487 ---- a/texmaker.pro
488 -+++ b/texmaker.pro
489 -@@ -4,7 +4,8 @@ TARGET = texmaker
490 - QT += network \
491 - xml \
492 - webkit
493 --CONFIG += qt warn_off release
494 -+CONFIG += qt warn_off release link_pkgconfig
495 -+PKGCONFIG = hunspell poppler-qt4
496 - TEXMAKERVERSION=3.5
497 - DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
498 - DEFINES += HAVE_SPLASH
499 -@@ -67,25 +68,6 @@ HEADERS += texmaker.h \
500 - synctex_parser_utils.h \
501 - usertagslistwidget.h \
502 - addtagdialog.h \
503 -- hunspell/affentry.hxx \
504 -- hunspell/affixmgr.hxx \
505 -- hunspell/atypes.hxx \
506 -- hunspell/baseaffix.hxx \
507 -- hunspell/csutil.hxx \
508 -- hunspell/dictmgr.hxx \
509 -- hunspell/hashmgr.hxx \
510 -- hunspell/htypes.hxx \
511 -- hunspell/hunspell.hxx \
512 -- hunspell/hunspell.h \
513 -- hunspell/langnum.hxx \
514 -- hunspell/license.hunspell \
515 -- hunspell/phonet.hxx \
516 -- hunspell/suggestmgr.hxx \
517 -- hunspell/license.myspell \
518 -- hunspell/filemgr.hxx \
519 -- hunspell/hunzip.hxx \
520 -- hunspell/replist.hxx \
521 -- hunspell/w_char.hxx \
522 - singleapp/qtlocalpeer.h \
523 - singleapp/qtlockedfile.h \
524 - singleapp/qtsingleapplication.h \
525 -@@ -171,18 +153,6 @@ SOURCES += main.cpp \
526 - synctex_parser_utils.c \
527 - usertagslistwidget.cpp \
528 - addtagdialog.cpp \
529 -- hunspell/affentry.cxx \
530 -- hunspell/affixmgr.cxx \
531 -- hunspell/csutil.cxx \
532 -- hunspell/dictmgr.cxx \
533 -- hunspell/hashmgr.cxx \
534 -- hunspell/hunspell.cxx \
535 -- hunspell/phonet.cxx \
536 -- hunspell/suggestmgr.cxx \
537 -- hunspell/utf_info.cxx \
538 -- hunspell/filemgr.cxx \
539 -- hunspell/replist.cxx \
540 -- hunspell/hunzip.cxx \
541 - singleapp/qtlocalpeer.cpp \
542 - singleapp/qtlockedfile.cpp \
543 - singleapp/qtsingleapplication.cpp \
544 -@@ -277,13 +247,11 @@ isEmpty( ICONDIR ) {
545 - ICONDIR=/usr/share/pixmaps
546 - }
547 -
548 --INCLUDEPATH += /usr/include/poppler/qt4
549 --LIBS += -L/usr/lib -lpoppler-qt4
550 --LIBS += -L/usr/lib -lz
551 -+LIBS += -lz
552 - DEFINES += PREFIX=\\\"$${PREFIX}\\\"
553 - target.path = $${PREFIX}/bin
554 -
555 --#DEFINES += DEBIAN_SPELLDIR
556 -+DEFINES += DEBIAN_SPELLDIR
557 -
558 -
559 - INSTALLS = target
560
561 diff --git a/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch
562 deleted file mode 100644
563 index f5bdda5..0000000
564 --- a/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch
565 +++ /dev/null
566 @@ -1,148 +0,0 @@
567 - latexeditor.h | 2 +-
568 - latexeditorview.h | 2 +-
569 - latexhighlighter.h | 2 +-
570 - spellerdialog.h | 2 +-
571 - texmaker.h | 2 +-
572 - texmaker.pro | 40 ++++------------------------------------
573 - 6 files changed, 9 insertions(+), 41 deletions(-)
574 -
575 -diff --git a/latexeditor.h b/latexeditor.h
576 -index 1ad4195..8f43b61 100644
577 ---- a/latexeditor.h
578 -+++ b/latexeditor.h
579 -@@ -33,7 +33,7 @@
580 -
581 - #include "latexhighlighter.h"
582 - #include "textblockselection.h"
583 --#include "hunspell/hunspell.hxx"
584 -+#include <hunspell.hxx>
585 -
586 - typedef int UserBookmarkList[3];
587 -
588 -diff --git a/latexeditorview.h b/latexeditorview.h
589 -index 5951656..796eb28 100644
590 ---- a/latexeditorview.h
591 -+++ b/latexeditorview.h
592 -@@ -22,7 +22,7 @@
593 - #include "gotolinewidget.h"
594 - #include "replacewidget.h"
595 - #include "minisplitter.h"
596 --#include "hunspell/hunspell.hxx"
597 -+#include <hunspell.hxx>
598 -
599 - class LatexEditorView : public QWidget {
600 - Q_OBJECT
601 -diff --git a/latexhighlighter.h b/latexhighlighter.h
602 -index e0b91b1..74ec42a 100644
603 ---- a/latexhighlighter.h
604 -+++ b/latexhighlighter.h
605 -@@ -20,7 +20,7 @@
606 - #include <QColor>
607 - #include <QTextBlockUserData>
608 - //#include "latexeditor.h"
609 --#include "hunspell/hunspell.hxx"
610 -+#include <hunspell.hxx>
611 -
612 - class QTextDocument;
613 - class LatexEditor;
614 -diff --git a/spellerdialog.h b/spellerdialog.h
615 -index 83248ae..cd16dad 100644
616 ---- a/spellerdialog.h
617 -+++ b/spellerdialog.h
618 -@@ -13,7 +13,7 @@
619 -
620 - #include "ui_spellerdialog.h"
621 - #include "latexeditor.h"
622 --#include "hunspell/hunspell.hxx"
623 -+#include <hunspell.hxx>
624 -
625 - #include <QTextCursor>
626 -
627 -diff --git a/texmaker.h b/texmaker.h
628 -index 83093d7..7f44645 100644
629 ---- a/texmaker.h
630 -+++ b/texmaker.h
631 -@@ -48,7 +48,7 @@
632 - #include "usertagslistwidget.h"
633 - #include "xmltagslistwidget.h"
634 - #include "logeditor.h"
635 --#include "hunspell/hunspell.hxx"
636 -+#include <hunspell.hxx>
637 - #include "browser.h"
638 - #include "pdfviewerwidget.h"
639 - #include "pdfviewer.h"
640 -diff --git a/texmaker.pro b/texmaker.pro
641 -index 3c0986a..a26295a 100644
642 ---- a/texmaker.pro
643 -+++ b/texmaker.pro
644 -@@ -4,7 +4,8 @@ TARGET = texmaker
645 - QT += network \
646 - xml \
647 - webkit
648 --CONFIG += qt warn_off release
649 -+CONFIG += qt warn_off release link_pkgconfig
650 -+PKGCONFIG = hunspell poppler-qt4
651 - TEXMAKERVERSION=3.5.1
652 - DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
653 - DEFINES += HAVE_SPLASH
654 -@@ -67,25 +68,6 @@ HEADERS += texmaker.h \
655 - synctex_parser_utils.h \
656 - usertagslistwidget.h \
657 - addtagdialog.h \
658 -- hunspell/affentry.hxx \
659 -- hunspell/affixmgr.hxx \
660 -- hunspell/atypes.hxx \
661 -- hunspell/baseaffix.hxx \
662 -- hunspell/csutil.hxx \
663 -- hunspell/dictmgr.hxx \
664 -- hunspell/hashmgr.hxx \
665 -- hunspell/htypes.hxx \
666 -- hunspell/hunspell.hxx \
667 -- hunspell/hunspell.h \
668 -- hunspell/langnum.hxx \
669 -- hunspell/license.hunspell \
670 -- hunspell/phonet.hxx \
671 -- hunspell/suggestmgr.hxx \
672 -- hunspell/license.myspell \
673 -- hunspell/filemgr.hxx \
674 -- hunspell/hunzip.hxx \
675 -- hunspell/replist.hxx \
676 -- hunspell/w_char.hxx \
677 - singleapp/qtlocalpeer.h \
678 - singleapp/qtlockedfile.h \
679 - singleapp/qtsingleapplication.h \
680 -@@ -171,18 +153,6 @@ SOURCES += main.cpp \
681 - synctex_parser_utils.c \
682 - usertagslistwidget.cpp \
683 - addtagdialog.cpp \
684 -- hunspell/affentry.cxx \
685 -- hunspell/affixmgr.cxx \
686 -- hunspell/csutil.cxx \
687 -- hunspell/dictmgr.cxx \
688 -- hunspell/hashmgr.cxx \
689 -- hunspell/hunspell.cxx \
690 -- hunspell/phonet.cxx \
691 -- hunspell/suggestmgr.cxx \
692 -- hunspell/utf_info.cxx \
693 -- hunspell/filemgr.cxx \
694 -- hunspell/replist.cxx \
695 -- hunspell/hunzip.cxx \
696 - singleapp/qtlocalpeer.cpp \
697 - singleapp/qtlockedfile.cpp \
698 - singleapp/qtsingleapplication.cpp \
699 -@@ -277,13 +247,11 @@ isEmpty( ICONDIR ) {
700 - ICONDIR=/usr/share/pixmaps
701 - }
702 -
703 --INCLUDEPATH += /usr/include/poppler/qt4
704 --LIBS += -L/usr/lib -lpoppler-qt4
705 --LIBS += -L/usr/lib -lz
706 -+LIBS += -lz
707 - DEFINES += PREFIX=\\\"$${PREFIX}\\\"
708 - target.path = $${PREFIX}/bin
709 -
710 --#DEFINES += DEBIAN_SPELLDIR
711 -+DEFINES += DEBIAN_SPELLDIR
712 -
713 -
714 - INSTALLS = target
715
716 diff --git a/app-office/texmaker/files/texmaker-3.5.2-clang.patch b/app-office/texmaker/files/texmaker-3.5.2-clang.patch
717 deleted file mode 100644
718 index 8a232a9..0000000
719 --- a/app-office/texmaker/files/texmaker-3.5.2-clang.patch
720 +++ /dev/null
721 @@ -1,16 +0,0 @@
722 - texmaker.h | 2 +-
723 - 1 file changed, 1 insertion(+), 1 deletion(-)
724 -
725 -diff --git a/texmaker.h b/texmaker.h
726 -index 3b7135e..acd49d8 100644
727 ---- a/texmaker.h
728 -+++ b/texmaker.h
729 -@@ -121,7 +121,7 @@ UserTagsListWidget *usertagsListWidget;
730 - XmlTagsListWidget *MpListWidget, *PsListWidget, *leftrightWidget, *tikzWidget, *asyWidget;
731 - SymbolListWidget *RelationListWidget, *ArrowListWidget, *MiscellaneousListWidget, *DelimitersListWidget, *GreekListWidget, *MostUsedListWidget, *FavoriteListWidget;
732 - QTreeWidget *StructureTreeWidget;
733 --QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis,;
734 -+QVBoxLayout *OutputLayoutV, *CentralLayoutBis,*LeftPanelLayoutBis;
735 - QHBoxLayout *OutputLayoutH, *LeftPanelLayout, *CentralLayout;
736 - QTableWidget *OutputTableWidget;
737 - //menu-toolbar
738
739 diff --git a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
740 deleted file mode 100644
741 index 295f7e3..0000000
742 --- a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
743 +++ /dev/null
744 @@ -1,181 +0,0 @@
745 - configdialog.cpp | 2 +-
746 - latexeditor.h | 2 +-
747 - latexeditorview.h | 2 +-
748 - latexhighlighter.h | 2 +-
749 - spellerdialog.h | 2 +-
750 - texmaker.cpp | 4 ++--
751 - texmaker.h | 2 +-
752 - texmaker.pro | 40 +++++-----------------------------------
753 - 8 files changed, 13 insertions(+), 43 deletions(-)
754 -
755 -diff --git a/configdialog.cpp b/configdialog.cpp
756 -index c2354d3..dea2bc1 100644
757 ---- a/configdialog.cpp
758 -+++ b/configdialog.cpp
759 -@@ -211,7 +211,7 @@ void ConfigDialog::browseAspell()
760 - QDir spelldir(QCoreApplication::applicationDirPath());
761 - #else
762 - #ifdef DEBIAN_SPELLDIR
763 --QDir spelldir(PREFIX"/share/myspell/dicts");
764 -+QDir spelldir(PREFIX"/share/myspell");
765 - #else
766 - QDir spelldir(PREFIX"/share/texmaker");
767 - #endif
768 -diff --git a/latexeditor.h b/latexeditor.h
769 -index 1ad4195..8f43b61 100644
770 ---- a/latexeditor.h
771 -+++ b/latexeditor.h
772 -@@ -33,7 +33,7 @@
773 -
774 - #include "latexhighlighter.h"
775 - #include "textblockselection.h"
776 --#include "hunspell/hunspell.hxx"
777 -+#include <hunspell.hxx>
778 -
779 - typedef int UserBookmarkList[3];
780 -
781 -diff --git a/latexeditorview.h b/latexeditorview.h
782 -index 5951656..796eb28 100644
783 ---- a/latexeditorview.h
784 -+++ b/latexeditorview.h
785 -@@ -22,7 +22,7 @@
786 - #include "gotolinewidget.h"
787 - #include "replacewidget.h"
788 - #include "minisplitter.h"
789 --#include "hunspell/hunspell.hxx"
790 -+#include <hunspell.hxx>
791 -
792 - class LatexEditorView : public QWidget {
793 - Q_OBJECT
794 -diff --git a/latexhighlighter.h b/latexhighlighter.h
795 -index e0b91b1..74ec42a 100644
796 ---- a/latexhighlighter.h
797 -+++ b/latexhighlighter.h
798 -@@ -20,7 +20,7 @@
799 - #include <QColor>
800 - #include <QTextBlockUserData>
801 - //#include "latexeditor.h"
802 --#include "hunspell/hunspell.hxx"
803 -+#include <hunspell.hxx>
804 -
805 - class QTextDocument;
806 - class LatexEditor;
807 -diff --git a/spellerdialog.h b/spellerdialog.h
808 -index 83248ae..cd16dad 100644
809 ---- a/spellerdialog.h
810 -+++ b/spellerdialog.h
811 -@@ -13,7 +13,7 @@
812 -
813 - #include "ui_spellerdialog.h"
814 - #include "latexeditor.h"
815 --#include "hunspell/hunspell.hxx"
816 -+#include <hunspell.hxx>
817 -
818 - #include <QTextCursor>
819 -
820 -diff --git a/texmaker.cpp b/texmaker.cpp
821 -index 6e8f41b..c94d76a 100644
822 ---- a/texmaker.cpp
823 -+++ b/texmaker.cpp
824 -@@ -4302,7 +4302,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
825 - QString dicDir=QCoreApplication::applicationDirPath() + "/";
826 - #else
827 - #ifdef DEBIAN_SPELLDIR
828 --QString dicDir=PREFIX"/share/myspell/dicts/";
829 -+QString dicDir=PREFIX"/share/myspell/";
830 - #else
831 - QString dicDir=PREFIX"/share/texmaker/";
832 - #endif
833 -@@ -10747,4 +10747,4 @@ if (singlemode && currentEditorView())
834 - UpdateBibliography();
835 - }
836 - }
837 --}
838 -\ No newline at end of file
839 -+}
840 -diff --git a/texmaker.h b/texmaker.h
841 -index 3b7135e..5713b5a 100644
842 ---- a/texmaker.h
843 -+++ b/texmaker.h
844 -@@ -48,7 +48,7 @@
845 - #include "usertagslistwidget.h"
846 - #include "xmltagslistwidget.h"
847 - #include "logeditor.h"
848 --#include "hunspell/hunspell.hxx"
849 -+#include <hunspell.hxx>
850 - #include "browser.h"
851 - #include "pdfviewerwidget.h"
852 - #include "pdfviewer.h"
853 -diff --git a/texmaker.pro b/texmaker.pro
854 -index 9b9083a..9feef01 100644
855 ---- a/texmaker.pro
856 -+++ b/texmaker.pro
857 -@@ -68,25 +68,6 @@ HEADERS += texmaker.h \
858 - synctex_parser_utils.h \
859 - usertagslistwidget.h \
860 - addtagdialog.h \
861 -- hunspell/affentry.hxx \
862 -- hunspell/affixmgr.hxx \
863 -- hunspell/atypes.hxx \
864 -- hunspell/baseaffix.hxx \
865 -- hunspell/csutil.hxx \
866 -- hunspell/dictmgr.hxx \
867 -- hunspell/hashmgr.hxx \
868 -- hunspell/htypes.hxx \
869 -- hunspell/hunspell.hxx \
870 -- hunspell/hunspell.h \
871 -- hunspell/langnum.hxx \
872 -- hunspell/license.hunspell \
873 -- hunspell/phonet.hxx \
874 -- hunspell/suggestmgr.hxx \
875 -- hunspell/license.myspell \
876 -- hunspell/filemgr.hxx \
877 -- hunspell/hunzip.hxx \
878 -- hunspell/replist.hxx \
879 -- hunspell/w_char.hxx \
880 - singleapp/qtlocalpeer.h \
881 - singleapp/qtlockedfile.h \
882 - singleapp/qtsingleapplication.h \
883 -@@ -173,18 +154,6 @@ SOURCES += main.cpp \
884 - synctex_parser_utils.c \
885 - usertagslistwidget.cpp \
886 - addtagdialog.cpp \
887 -- hunspell/affentry.cxx \
888 -- hunspell/affixmgr.cxx \
889 -- hunspell/csutil.cxx \
890 -- hunspell/dictmgr.cxx \
891 -- hunspell/hashmgr.cxx \
892 -- hunspell/hunspell.cxx \
893 -- hunspell/phonet.cxx \
894 -- hunspell/suggestmgr.cxx \
895 -- hunspell/utf_info.cxx \
896 -- hunspell/filemgr.cxx \
897 -- hunspell/replist.cxx \
898 -- hunspell/hunzip.cxx \
899 - singleapp/qtlocalpeer.cpp \
900 - singleapp/qtlockedfile.cpp \
901 - singleapp/qtsingleapplication.cpp \
902 -@@ -280,13 +249,11 @@ isEmpty( ICONDIR ) {
903 - ICONDIR=/usr/share/pixmaps
904 - }
905 -
906 --INCLUDEPATH += /usr/include/poppler/qt4
907 --LIBS += -L/usr/lib -lpoppler-qt4
908 --LIBS += -L/usr/lib -lz
909 -+LIBS += -lz
910 - DEFINES += PREFIX=\\\"$${PREFIX}\\\"
911 - target.path = $${PREFIX}/bin
912 -
913 --#DEFINES += DEBIAN_SPELLDIR
914 -+DEFINES += DEBIAN_SPELLDIR
915 -
916 -
917 - INSTALLS = target
918 -@@ -717,3 +684,6 @@ INSTALLS += utilities
919 - ICON = texmaker.icns
920 - QMAKE_INFO_PLIST =Info.plist
921 - }
922 -+
923 -+CONFIG += link_pkgconfig
924 -+PKGCONFIG = hunspell poppler-qt4
925 -\ No newline at end of file
926
927 diff --git a/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch b/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch
928 deleted file mode 100644
929 index b271ea8..0000000
930 --- a/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch
931 +++ /dev/null
932 @@ -1,180 +0,0 @@
933 - configdialog.cpp | 2 +-
934 - latexeditor.h | 2 +-
935 - latexeditorview.h | 2 +-
936 - latexhighlighter.h | 2 +-
937 - spellerdialog.h | 2 +-
938 - texmaker.cpp | 4 ++--
939 - texmaker.h | 2 +-
940 - texmaker.pro | 40 +++++-----------------------------------
941 - 8 files changed, 13 insertions(+), 43 deletions(-)
942 -
943 -diff --git a/configdialog.cpp b/configdialog.cpp
944 -index 8a73c4d..6b94401 100644
945 ---- a/configdialog.cpp
946 -+++ b/configdialog.cpp
947 -@@ -216,7 +216,7 @@ void ConfigDialog::browseAspell()
948 - QDir spelldir(QCoreApplication::applicationDirPath());
949 - #else
950 - #ifdef DEBIAN_SPELLDIR
951 --QDir spelldir(PREFIX"/share/myspell/dicts");
952 -+QDir spelldir(PREFIX"/share/myspell");
953 - #else
954 - QDir spelldir(PREFIX"/share/texmaker");
955 - #endif
956 -diff --git a/latexeditor.h b/latexeditor.h
957 -index 1ad4195..8f43b61 100644
958 ---- a/latexeditor.h
959 -+++ b/latexeditor.h
960 -@@ -33,7 +33,7 @@
961 -
962 - #include "latexhighlighter.h"
963 - #include "textblockselection.h"
964 --#include "hunspell/hunspell.hxx"
965 -+#include <hunspell.hxx>
966 -
967 - typedef int UserBookmarkList[3];
968 -
969 -diff --git a/latexeditorview.h b/latexeditorview.h
970 -index 603d82e..844386c 100644
971 ---- a/latexeditorview.h
972 -+++ b/latexeditorview.h
973 -@@ -23,7 +23,7 @@
974 - #include "gotolinewidget.h"
975 - #include "replacewidget.h"
976 - #include "minisplitter.h"
977 --#include "hunspell/hunspell.hxx"
978 -+#include <hunspell.hxx>
979 -
980 - class LatexEditorView : public QWidget {
981 - Q_OBJECT
982 -diff --git a/latexhighlighter.h b/latexhighlighter.h
983 -index e0b91b1..74ec42a 100644
984 ---- a/latexhighlighter.h
985 -+++ b/latexhighlighter.h
986 -@@ -20,7 +20,7 @@
987 - #include <QColor>
988 - #include <QTextBlockUserData>
989 - //#include "latexeditor.h"
990 --#include "hunspell/hunspell.hxx"
991 -+#include <hunspell.hxx>
992 -
993 - class QTextDocument;
994 - class LatexEditor;
995 -diff --git a/spellerdialog.h b/spellerdialog.h
996 -index 83248ae..cd16dad 100644
997 ---- a/spellerdialog.h
998 -+++ b/spellerdialog.h
999 -@@ -13,7 +13,7 @@
1000 -
1001 - #include "ui_spellerdialog.h"
1002 - #include "latexeditor.h"
1003 --#include "hunspell/hunspell.hxx"
1004 -+#include <hunspell.hxx>
1005 -
1006 - #include <QTextCursor>
1007 -
1008 -diff --git a/texmaker.cpp b/texmaker.cpp
1009 -index a364143..c4f7d50 100644
1010 ---- a/texmaker.cpp
1011 -+++ b/texmaker.cpp
1012 -@@ -4328,7 +4328,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
1013 - QString dicDir=QCoreApplication::applicationDirPath() + "/";
1014 - #else
1015 - #ifdef DEBIAN_SPELLDIR
1016 --QString dicDir=PREFIX"/share/myspell/dicts/";
1017 -+QString dicDir=PREFIX"/share/myspell/";
1018 - #else
1019 - QString dicDir=PREFIX"/share/texmaker/";
1020 - #endif
1021 -@@ -10786,4 +10786,4 @@ if (singlemode && currentEditorView())
1022 - UpdateBibliography();
1023 - }
1024 - }
1025 --}
1026 -\ No newline at end of file
1027 -+}
1028 -diff --git a/texmaker.h b/texmaker.h
1029 -index 9680c8f..c8f1f24 100644
1030 ---- a/texmaker.h
1031 -+++ b/texmaker.h
1032 -@@ -48,7 +48,7 @@
1033 - #include "usertagslistwidget.h"
1034 - #include "xmltagslistwidget.h"
1035 - #include "logeditor.h"
1036 --#include "hunspell/hunspell.hxx"
1037 -+#include <hunspell.hxx>
1038 - #include "browser.h"
1039 - #include "pdfviewerwidget.h"
1040 - #include "pdfviewer.h"
1041 -diff --git a/texmaker.pro b/texmaker.pro
1042 -index 32c3463..e5db444 100644
1043 ---- a/texmaker.pro
1044 -+++ b/texmaker.pro
1045 -@@ -70,25 +70,6 @@ HEADERS += texmaker.h \
1046 - synctex_parser_utils.h \
1047 - usertagslistwidget.h \
1048 - addtagdialog.h \
1049 -- hunspell/affentry.hxx \
1050 -- hunspell/affixmgr.hxx \
1051 -- hunspell/atypes.hxx \
1052 -- hunspell/baseaffix.hxx \
1053 -- hunspell/csutil.hxx \
1054 -- hunspell/dictmgr.hxx \
1055 -- hunspell/hashmgr.hxx \
1056 -- hunspell/htypes.hxx \
1057 -- hunspell/hunspell.hxx \
1058 -- hunspell/hunspell.h \
1059 -- hunspell/langnum.hxx \
1060 -- hunspell/license.hunspell \
1061 -- hunspell/phonet.hxx \
1062 -- hunspell/suggestmgr.hxx \
1063 -- hunspell/license.myspell \
1064 -- hunspell/filemgr.hxx \
1065 -- hunspell/hunzip.hxx \
1066 -- hunspell/replist.hxx \
1067 -- hunspell/w_char.hxx \
1068 - singleapp/qtlocalpeer.h \
1069 - singleapp/qtlockedfile.h \
1070 - singleapp/qtsingleapplication.h \
1071 -@@ -175,18 +156,6 @@ SOURCES += main.cpp \
1072 - synctex_parser_utils.c \
1073 - usertagslistwidget.cpp \
1074 - addtagdialog.cpp \
1075 -- hunspell/affentry.cxx \
1076 -- hunspell/affixmgr.cxx \
1077 -- hunspell/csutil.cxx \
1078 -- hunspell/dictmgr.cxx \
1079 -- hunspell/hashmgr.cxx \
1080 -- hunspell/hunspell.cxx \
1081 -- hunspell/phonet.cxx \
1082 -- hunspell/suggestmgr.cxx \
1083 -- hunspell/utf_info.cxx \
1084 -- hunspell/filemgr.cxx \
1085 -- hunspell/replist.cxx \
1086 -- hunspell/hunzip.cxx \
1087 - singleapp/qtlocalpeer.cpp \
1088 - singleapp/qtlockedfile.cpp \
1089 - singleapp/qtsingleapplication.cpp \
1090 -@@ -283,13 +252,11 @@ isEmpty( ICONDIR ) {
1091 - }
1092 - ## QT5
1093 - #INCLUDEPATH +=$${QTDIR}/include/
1094 --INCLUDEPATH += /usr/include/poppler/qt4
1095 --LIBS += -L/usr/lib -lpoppler-qt4
1096 --LIBS += -L/usr/lib -lz
1097 -+LIBS += -lz
1098 - DEFINES += PREFIX=\\\"$${PREFIX}\\\"
1099 - target.path = $${PREFIX}/bin
1100 -
1101 --#DEFINES += DEBIAN_SPELLDIR
1102 -+DEFINES += DEBIAN_SPELLDIR
1103 -
1104 -
1105 - INSTALLS = target
1106 -@@ -720,3 +687,6 @@ INSTALLS += utilities
1107 - ICON = texmaker.icns
1108 - QMAKE_INFO_PLIST =Info.plist
1109 - }
1110 -+
1111 -+CONFIG += link_pkgconfig
1112 -+PKGCONFIG = hunspell poppler-qt4
1113
1114 diff --git a/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch b/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
1115 deleted file mode 100644
1116 index 9cabfb2..0000000
1117 --- a/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
1118 +++ /dev/null
1119 @@ -1,165 +0,0 @@
1120 - configdialog.cpp | 2 +-
1121 - latexeditor.h | 2 +-
1122 - latexeditorview.h | 2 +-
1123 - latexhighlighter.h | 2 +-
1124 - spellerdialog.h | 2 +-
1125 - texmaker.cpp | 4 ++--
1126 - texmaker.h | 2 +-
1127 - texmaker.pro | 37 +++----------------------------------
1128 - 8 files changed, 11 insertions(+), 42 deletions(-)
1129 -
1130 -diff --git a/configdialog.cpp b/configdialog.cpp
1131 -index e596a2c..3660429 100644
1132 ---- a/configdialog.cpp
1133 -+++ b/configdialog.cpp
1134 -@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
1135 - QDir spelldir(QCoreApplication::applicationDirPath());
1136 - #else
1137 - #ifdef DEBIAN_SPELLDIR
1138 --QDir spelldir(PREFIX"/share/myspell/dicts");
1139 -+QDir spelldir(PREFIX"/share/myspell");
1140 - #else
1141 - QDir spelldir(PREFIX"/share/texmaker");
1142 - #endif
1143 -diff --git a/latexeditor.h b/latexeditor.h
1144 -index 29b01f8..1db88ad 100644
1145 ---- a/latexeditor.h
1146 -+++ b/latexeditor.h
1147 -@@ -33,7 +33,7 @@
1148 -
1149 - #include "latexhighlighter.h"
1150 - #include "textblockselection.h"
1151 --#include "hunspell/hunspell.hxx"
1152 -+#include <hunspell.hxx>
1153 -
1154 - typedef int UserBookmarkList[3];
1155 -
1156 -diff --git a/latexeditorview.h b/latexeditorview.h
1157 -index 9809d86..adca0b2 100644
1158 ---- a/latexeditorview.h
1159 -+++ b/latexeditorview.h
1160 -@@ -23,7 +23,7 @@
1161 - #include "gotolinewidget.h"
1162 - #include "replacewidget.h"
1163 - #include "minisplitter.h"
1164 --#include "hunspell/hunspell.hxx"
1165 -+#include <hunspell.hxx>
1166 -
1167 - class LatexEditorView : public QWidget {
1168 - Q_OBJECT
1169 -diff --git a/latexhighlighter.h b/latexhighlighter.h
1170 -index e0b91b1..74ec42a 100644
1171 ---- a/latexhighlighter.h
1172 -+++ b/latexhighlighter.h
1173 -@@ -20,7 +20,7 @@
1174 - #include <QColor>
1175 - #include <QTextBlockUserData>
1176 - //#include "latexeditor.h"
1177 --#include "hunspell/hunspell.hxx"
1178 -+#include <hunspell.hxx>
1179 -
1180 - class QTextDocument;
1181 - class LatexEditor;
1182 -diff --git a/spellerdialog.h b/spellerdialog.h
1183 -index 83248ae..cd16dad 100644
1184 ---- a/spellerdialog.h
1185 -+++ b/spellerdialog.h
1186 -@@ -13,7 +13,7 @@
1187 -
1188 - #include "ui_spellerdialog.h"
1189 - #include "latexeditor.h"
1190 --#include "hunspell/hunspell.hxx"
1191 -+#include <hunspell.hxx>
1192 -
1193 - #include <QTextCursor>
1194 -
1195 -diff --git a/texmaker.cpp b/texmaker.cpp
1196 -index 51d2082..607f66e 100644
1197 ---- a/texmaker.cpp
1198 -+++ b/texmaker.cpp
1199 -@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
1200 - QString dicDir=QCoreApplication::applicationDirPath() + "/";
1201 - #else
1202 - #ifdef DEBIAN_SPELLDIR
1203 --QString dicDir=PREFIX"/share/myspell/dicts/";
1204 -+QString dicDir=PREFIX"/share/myspell/";
1205 - #else
1206 - QString dicDir=PREFIX"/share/texmaker/";
1207 - #endif
1208 -@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
1209 - UpdateBibliography();
1210 - }
1211 - }
1212 --}
1213 -\ No newline at end of file
1214 -+}
1215 -diff --git a/texmaker.h b/texmaker.h
1216 -index f7e278c..e80d9e5 100644
1217 ---- a/texmaker.h
1218 -+++ b/texmaker.h
1219 -@@ -48,7 +48,7 @@
1220 - #include "usertagslistwidget.h"
1221 - #include "xmltagslistwidget.h"
1222 - #include "logeditor.h"
1223 --#include "hunspell/hunspell.hxx"
1224 -+#include <hunspell.hxx>
1225 - #include "browser.h"
1226 - #include "pdfviewerwidget.h"
1227 - #include "pdfviewer.h"
1228 -diff --git a/texmaker.pro b/texmaker.pro
1229 -index d2312d1..0009663 100644
1230 ---- a/texmaker.pro
1231 -+++ b/texmaker.pro
1232 -@@ -87,25 +87,6 @@ HEADERS += texmaker.h \
1233 - versiondialog.h \
1234 - unicodedialog.h \
1235 - unicodeview.h \
1236 -- hunspell/affentry.hxx \
1237 -- hunspell/affixmgr.hxx \
1238 -- hunspell/atypes.hxx \
1239 -- hunspell/baseaffix.hxx \
1240 -- hunspell/csutil.hxx \
1241 -- hunspell/dictmgr.hxx \
1242 -- hunspell/hashmgr.hxx \
1243 -- hunspell/htypes.hxx \
1244 -- hunspell/hunspell.hxx \
1245 -- hunspell/hunspell.h \
1246 -- hunspell/langnum.hxx \
1247 -- hunspell/license.hunspell \
1248 -- hunspell/phonet.hxx \
1249 -- hunspell/suggestmgr.hxx \
1250 -- hunspell/license.myspell \
1251 -- hunspell/filemgr.hxx \
1252 -- hunspell/hunzip.hxx \
1253 -- hunspell/replist.hxx \
1254 -- hunspell/w_char.hxx \
1255 - singleapp/qtlocalpeer.h \
1256 - singleapp/qtlockedfile.h \
1257 - singleapp/qtsingleapplication.h \
1258 -@@ -196,18 +174,6 @@ SOURCES += main.cpp \
1259 - versiondialog.cpp \
1260 - unicodedialog.cpp \
1261 - unicodeview.cpp \
1262 -- hunspell/affentry.cxx \
1263 -- hunspell/affixmgr.cxx \
1264 -- hunspell/csutil.cxx \
1265 -- hunspell/dictmgr.cxx \
1266 -- hunspell/hashmgr.cxx \
1267 -- hunspell/hunspell.cxx \
1268 -- hunspell/phonet.cxx \
1269 -- hunspell/suggestmgr.cxx \
1270 -- hunspell/utf_info.cxx \
1271 -- hunspell/filemgr.cxx \
1272 -- hunspell/replist.cxx \
1273 -- hunspell/hunzip.cxx \
1274 - singleapp/qtlocalpeer.cpp \
1275 - singleapp/qtlockedfile.cpp \
1276 - singleapp/qtsingleapplication.cpp \
1277 -@@ -454,3 +420,6 @@ INSTALLS += desktop
1278 - icon.files = utilities/texmaker.png
1279 - INSTALLS += icon
1280 - }
1281 -+
1282 -+CONFIG += link_pkgconfig
1283 -+PKGCONFIG += hunspell
1284 -\ No newline at end of file
1285
1286 diff --git a/app-office/texmaker/files/texmaker-4.0.4-unbundle.patch b/app-office/texmaker/files/texmaker-4.0.4-unbundle.patch
1287 deleted file mode 100644
1288 index f3590c9..0000000
1289 --- a/app-office/texmaker/files/texmaker-4.0.4-unbundle.patch
1290 +++ /dev/null
1291 @@ -1,105 +0,0 @@
1292 - configdialog.cpp | 2 +-
1293 - texmaker.cpp | 4 ++--
1294 - texmaker.pro | 42 +-----------------------------------------
1295 - 3 files changed, 4 insertions(+), 44 deletions(-)
1296 -
1297 -diff --git a/configdialog.cpp b/configdialog.cpp
1298 -index e596a2c..3660429 100644
1299 ---- a/configdialog.cpp
1300 -+++ b/configdialog.cpp
1301 -@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
1302 - QDir spelldir(QCoreApplication::applicationDirPath());
1303 - #else
1304 - #ifdef DEBIAN_SPELLDIR
1305 --QDir spelldir(PREFIX"/share/myspell/dicts");
1306 -+QDir spelldir(PREFIX"/share/myspell");
1307 - #else
1308 - QDir spelldir(PREFIX"/share/texmaker");
1309 - #endif
1310 -diff --git a/texmaker.cpp b/texmaker.cpp
1311 -index 51d2082..607f66e 100644
1312 ---- a/texmaker.cpp
1313 -+++ b/texmaker.cpp
1314 -@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
1315 - QString dicDir=QCoreApplication::applicationDirPath() + "/";
1316 - #else
1317 - #ifdef DEBIAN_SPELLDIR
1318 --QString dicDir=PREFIX"/share/myspell/dicts/";
1319 -+QString dicDir=PREFIX"/share/myspell/";
1320 - #else
1321 - QString dicDir=PREFIX"/share/texmaker/";
1322 - #endif
1323 -@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
1324 - UpdateBibliography();
1325 - }
1326 - }
1327 --}
1328 -\ No newline at end of file
1329 -+}
1330 -diff --git a/texmaker.pro b/texmaker.pro
1331 -index bce8dd4..2f205bb 100644
1332 ---- a/texmaker.pro
1333 -+++ b/texmaker.pro
1334 -@@ -95,29 +95,6 @@ HEADERS += texmaker.h \
1335 - versiondialog.h \
1336 - unicodedialog.h \
1337 - unicodeview.h \
1338 -- hunspell/affentry.hxx \
1339 -- hunspell/affixmgr.hxx \
1340 -- hunspell/atypes.hxx \
1341 -- hunspell/baseaffix.hxx \
1342 -- hunspell/csutil.hxx \
1343 -- hunspell/dictmgr.hxx \
1344 -- hunspell/hashmgr.hxx \
1345 -- hunspell/htypes.hxx \
1346 -- hunspell/hunspell.hxx \
1347 -- hunspell/hunspell.h \
1348 -- hunspell/langnum.hxx \
1349 -- hunspell/license.hunspell \
1350 -- hunspell/phonet.hxx \
1351 -- hunspell/suggestmgr.hxx \
1352 -- hunspell/license.myspell \
1353 -- hunspell/filemgr.hxx \
1354 -- hunspell/hunzip.hxx \
1355 -- hunspell/replist.hxx \
1356 -- hunspell/w_char.hxx \
1357 -- singleapp/qtlocalpeer.h \
1358 -- singleapp/qtlockedfile.h \
1359 -- singleapp/qtsingleapplication.h \
1360 -- singleapp/qtsinglecoreapplication.h \
1361 - encodingprober/CharDistribution.h \
1362 - encodingprober/ChineseGroupProber.h \
1363 - encodingprober/ctype_test_p.h \
1364 -@@ -204,22 +181,6 @@ SOURCES += main.cpp \
1365 - versiondialog.cpp \
1366 - unicodedialog.cpp \
1367 - unicodeview.cpp \
1368 -- hunspell/affentry.cxx \
1369 -- hunspell/affixmgr.cxx \
1370 -- hunspell/csutil.cxx \
1371 -- hunspell/dictmgr.cxx \
1372 -- hunspell/hashmgr.cxx \
1373 -- hunspell/hunspell.cxx \
1374 -- hunspell/phonet.cxx \
1375 -- hunspell/suggestmgr.cxx \
1376 -- hunspell/utf_info.cxx \
1377 -- hunspell/filemgr.cxx \
1378 -- hunspell/replist.cxx \
1379 -- hunspell/hunzip.cxx \
1380 -- singleapp/qtlocalpeer.cpp \
1381 -- singleapp/qtlockedfile.cpp \
1382 -- singleapp/qtsingleapplication.cpp \
1383 -- singleapp/qtsinglecoreapplication.cpp \
1384 - encodingprober/CharDistribution.cpp \
1385 - encodingprober/ChineseGroupProber.cpp \
1386 - encodingprober/JapaneseGroupProber.cpp \
1387 -@@ -328,8 +289,7 @@ icon.path = $${ICONDIR}
1388 -
1389 - INSTALLS = target
1390 - HEADERS += x11fontdialog.h
1391 --SOURCES += x11fontdialog.cpp \
1392 -- singleapp/qtlockedfile_unix.cpp
1393 -+SOURCES += x11fontdialog.cpp
1394 - FORMS += x11fontdialog.ui
1395 -
1396 - utilities.files = doc/doc1.png \
1397
1398 diff --git a/app-office/texmaker/texmaker-4.3.ebuild b/app-office/texmaker/texmaker-4.3.ebuild
1399 deleted file mode 100644
1400 index 9fd6d30..0000000
1401 --- a/app-office/texmaker/texmaker-4.3.ebuild
1402 +++ /dev/null
1403 @@ -1,87 +0,0 @@
1404 -# Copyright 1999-2015 Gentoo Foundation
1405 -# Distributed under the terms of the GNU General Public License v2
1406 -# $Id$
1407 -
1408 -EAPI=5
1409 -
1410 -inherit qt4-r2 versionator
1411 -
1412 -# The upstream version numbering is bad, so we have to remove a dot in the
1413 -# minor version number
1414 -MAJOR="$(get_major_version)"
1415 -MINOR_1="$(($(get_version_component_range 2)/10))"
1416 -MINOR_2="$(($(get_version_component_range 2)%10))"
1417 -if [ ${MINOR_2} -eq "0" ] ; then
1418 - MY_P="${PN}-${MAJOR}.${MINOR_1}"
1419 -else
1420 - MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
1421 -fi
1422 -
1423 -MY_P="${P}"
1424 -
1425 -DESCRIPTION="A nice LaTeX-IDE"
1426 -HOMEPAGE="http://www.xm1math.net/texmaker/"
1427 -SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
1428 -
1429 -LICENSE="GPL-2"
1430 -SLOT="0"
1431 -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
1432 -IUSE=""
1433 -
1434 -S="${WORKDIR}/${MY_P}"
1435 -
1436 -COMMON_DEPEND="
1437 - app-text/hunspell
1438 - app-text/poppler:=[qt4]
1439 - sys-libs/zlib
1440 - x11-libs/libX11
1441 - x11-libs/libXext
1442 - dev-qt/qtgui:4
1443 - dev-qt/qtcore:4
1444 - dev-qt/qtscript:4
1445 - dev-qt/qtsingleapplication[X,qt4(+)]
1446 - dev-qt/qtwebkit:4
1447 -"
1448 -RDEPEND="${COMMON_DEPEND}
1449 - virtual/latex-base
1450 - app-i18n/ibus-qt
1451 - app-text/psutils
1452 - app-text/ghostscript-gpl
1453 - media-libs/netpbm"
1454 -DEPEND="${COMMON_DEPEND}
1455 - virtual/pkgconfig"
1456 -
1457 -PATCHES=( "${FILESDIR}"/${PN}-4.1-unbundle.patch )
1458 -
1459 -DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
1460 -HTML_DOCS=( doc/. )
1461 -
1462 -src_prepare() {
1463 - find singleapp hunspell -delete || die
1464 -
1465 - qt4-r2_src_prepare
1466 -
1467 - cat >> ${PN}.pro <<- EOF
1468 - exists(texmakerx_my.pri):include(texmakerx_my.pri)
1469 - EOF
1470 -
1471 - cp "${FILESDIR}"/texmakerx_my.pri . || die
1472 -
1473 - sed \
1474 - -e '/^#include/s:hunspell/::g' \
1475 - -e '/^#include/s:singleapp/::g' \
1476 - -i *.cpp *.h || die
1477 -}
1478 -
1479 -src_configure() {
1480 - eqmake4 \
1481 - ${PN}.pro \
1482 - PREFIX="${EPREFIX}/usr" \
1483 - DESKTOPDIR="${EPREFIX}/usr/share/applications" \
1484 - ICONDIR="${EPREFIX}/usr/share/pixmaps"
1485 -}
1486 -
1487 -pkg_postinst() {
1488 - elog "A user manual with many screenshots is available at:"
1489 - elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
1490 -}
1491
1492 diff --git a/app-office/texmaker/texmaker-4.4.1.ebuild b/app-office/texmaker/texmaker-4.4.1.ebuild
1493 deleted file mode 100644
1494 index a8b3c5e..0000000
1495 --- a/app-office/texmaker/texmaker-4.4.1.ebuild
1496 +++ /dev/null
1497 @@ -1,96 +0,0 @@
1498 -# Copyright 1999-2015 Gentoo Foundation
1499 -# Distributed under the terms of the GNU General Public License v2
1500 -# $Id$
1501 -
1502 -EAPI=5
1503 -
1504 -inherit eutils qmake-utils readme.gentoo
1505 -
1506 -DESCRIPTION="A nice LaTeX-IDE"
1507 -HOMEPAGE="http://www.xm1math.net/texmaker/"
1508 -SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
1509 -
1510 -LICENSE="GPL-2"
1511 -SLOT="0"
1512 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
1513 -IUSE="+qt4 qt5"
1514 -
1515 -REQUIRED_USE="^^ ( qt4 qt5 )"
1516 -
1517 -COMMON_DEPEND="
1518 - app-text/hunspell
1519 - app-text/poppler:=[qt4?,qt5?]
1520 - sys-libs/zlib
1521 - x11-libs/libX11
1522 - x11-libs/libXext
1523 - dev-qt/qtsingleapplication[X,qt4?,qt5?]
1524 - qt4? (
1525 - dev-qt/qtgui:4
1526 - dev-qt/qtcore:4
1527 - dev-qt/qtscript:4
1528 - dev-qt/qtwebkit:4
1529 - )
1530 - qt5? (
1531 - dev-qt/qtconcurrent:5
1532 - dev-qt/qtgui:5
1533 - dev-qt/qtcore:5
1534 - dev-qt/qtnetwork:5
1535 - dev-qt/qtscript:5
1536 - dev-qt/qtwebkit:5[printsupport]
1537 - dev-qt/qtwidgets:5
1538 - dev-qt/qtxml:5
1539 - )
1540 -"
1541 -RDEPEND="${COMMON_DEPEND}
1542 - virtual/latex-base
1543 - app-text/psutils
1544 - app-text/ghostscript-gpl
1545 - media-libs/netpbm
1546 - qt4? ( app-i18n/ibus-qt )"
1547 -DEPEND="${COMMON_DEPEND}
1548 - virtual/pkgconfig"
1549 -
1550 -PATCHES=( "${FILESDIR}"/${PN}-4.1-unbundle.patch )
1551 -
1552 -DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
1553 -HTML_DOCS=( doc/. )
1554 -
1555 -src_prepare() {
1556 - find singleapp hunspell -delete || die
1557 -
1558 - epatch "${PATCHES[@]}"
1559 -
1560 - cat >> ${PN}.pro <<- EOF
1561 - exists(texmakerx_my.pri):include(texmakerx_my.pri)
1562 - EOF
1563 -
1564 - cp "${FILESDIR}"/texmakerx_my.pri . || die
1565 -
1566 - sed \
1567 - -e '/^#include/s:hunspell/::g' \
1568 - -e '/^#include/s:singleapp/::g' \
1569 - -i *.cpp *.h || die
1570 -
1571 - DOC_CONTENTS="A user manual with many screenshots is available at:
1572 - ${EPREFIX}/usr/share/${PN}/usermanual_en.html"
1573 -}
1574 -
1575 -src_configure() {
1576 - local myeqmakeargs=(
1577 - ${PN}.pro
1578 - PREFIX="${EPREFIX}/usr"
1579 - DESKTOPDIR="${EPREFIX}/usr/share/applications"
1580 - ICONDIR="${EPREFIX}/usr/share/pixmaps"
1581 - )
1582 - if use qt4; then
1583 - eqmake4 ${myeqmakeargs[@]}
1584 - else
1585 - eqmake5 ${myeqmakeargs[@]}
1586 - fi
1587 -}
1588 -
1589 -src_install() {
1590 - emake INSTALL_ROOT="${D}" install
1591 - einstalldocs
1592 - readme.gentoo_create_doc
1593 -}
Report Message
Find on MARC Find on Google Groups