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