| 1 |
jlec 11/12/04 10:10:03 |
| 2 |
|
| 3 |
Modified: texmaker-3.1-hunspell.patch |
| 4 |
Log: |
| 5 |
Respect EPREFIX in all places, fixes poppler-qt4.h: No such file or directory |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-office/texmaker/files/texmaker-3.1-hunspell.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.1-hunspell.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.1-hunspell.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.1-hunspell.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: texmaker-3.1-hunspell.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/files/texmaker-3.1-hunspell.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- texmaker-3.1-hunspell.patch 14 Aug 2011 16:31:43 -0000 1.1 |
| 23 |
+++ texmaker-3.1-hunspell.patch 4 Dec 2011 10:10:03 -0000 1.2 |
| 24 |
@@ -1,25 +1,28 @@ |
| 25 |
- configdialog.cpp | 2 +- |
| 26 |
+ configdialog.cpp | 4 ++-- |
| 27 |
latexeditor.h | 2 +- |
| 28 |
latexeditorview.h | 2 +- |
| 29 |
latexhighlighter.h | 2 +- |
| 30 |
spellerdialog.h | 2 +- |
| 31 |
texmaker.h | 2 +- |
| 32 |
- texmaker.pro | 36 +++--------------------------------- |
| 33 |
- 7 files changed, 9 insertions(+), 39 deletions(-) |
| 34 |
+ texmaker.pro | 42 ++++++------------------------------------ |
| 35 |
+ 7 files changed, 13 insertions(+), 43 deletions(-) |
| 36 |
|
| 37 |
diff --git a/configdialog.cpp b/configdialog.cpp |
| 38 |
-index 136072d..1ead573 100644 |
| 39 |
+index 136072d..550db58 100644 |
| 40 |
--- a/configdialog.cpp |
| 41 |
+++ b/configdialog.cpp |
| 42 |
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell() |
| 43 |
+@@ -122,9 +122,9 @@ void ConfigDialog::browseAspell() |
| 44 |
QDir spelldir(QCoreApplication::applicationDirPath()); |
| 45 |
#else |
| 46 |
#ifdef DEBIAN_SPELLDIR |
| 47 |
-QDir spelldir(PREFIX"/share/myspell/dicts"); |
| 48 |
-+QDir spelldir(PREFIX"/share/myspell"); |
| 49 |
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell"); |
| 50 |
#else |
| 51 |
- QDir spelldir(PREFIX"/share/texmaker"); |
| 52 |
+-QDir spelldir(PREFIX"/share/texmaker"); |
| 53 |
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker"); |
| 54 |
#endif |
| 55 |
+ #endif |
| 56 |
+ |
| 57 |
diff --git a/latexeditor.h b/latexeditor.h |
| 58 |
index b9b8d75..a9ec1ef 100644 |
| 59 |
--- a/latexeditor.h |
| 60 |
@@ -86,7 +89,7 @@ |
| 61 |
#include "pdfviewerwidget.h" |
| 62 |
#include "pdfviewer.h" |
| 63 |
diff --git a/texmaker.pro b/texmaker.pro |
| 64 |
-index 5c90e44..9ed3123 100644 |
| 65 |
+index 5c90e44..4513937 100644 |
| 66 |
--- a/texmaker.pro |
| 67 |
+++ b/texmaker.pro |
| 68 |
@@ -4,7 +4,8 @@ TARGET = texmaker |
| 69 |
@@ -144,7 +147,16 @@ |
| 70 |
singleapp/qtlocalpeer.cpp \ |
| 71 |
singleapp/qtlockedfile.cpp \ |
| 72 |
singleapp/qtsingleapplication.cpp \ |
| 73 |
-@@ -268,7 +238,7 @@ LIBS += -L/usr/lib -lz |
| 74 |
+@@ -262,13 +232,13 @@ isEmpty( ICONDIR ) { |
| 75 |
+ ICONDIR=/usr/share/pixmaps |
| 76 |
+ } |
| 77 |
+ |
| 78 |
+-INCLUDEPATH += /usr/include/poppler/qt4 |
| 79 |
+-LIBS += -L/usr/lib -lpoppler-qt4 |
| 80 |
+-LIBS += -L/usr/lib -lz |
| 81 |
++INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4 |
| 82 |
++LIBS += -lpoppler-qt4 |
| 83 |
++LIBS += -lz |
| 84 |
DEFINES += PREFIX=\\\"$${PREFIX}\\\" |
| 85 |
target.path = $${PREFIX}/bin |
Archives