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

Gentoo Archives: gentoo-commits

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