[gentoo-commits] gentoo-x86 commit in app-office/texmaker/files: texmaker-3.2-hunspell.patch

[Justin Lecher (jlec)]

jlec        11/12/22 11:22:26

  Added:                texmaker-3.2-hunspell.patch
  Log:
  Version Bump
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-office/texmaker/files/texmaker-3.2-hunspell.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.2-hunspell.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/files/texmaker-3.2-hunspell.patch?rev=1.1&content-type=text/plain

Index: texmaker-3.2-hunspell.patch
===================================================================
From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@g.o>
From: Justin Lecher <jlec@g.o>
Date: Thu, 22 Dec 2011 12:09:32 +0100
Subject: [PATCH] 3.1-hunspell.patch

Conflicts:

	latexeditor.h
	texmaker.pro
---
 configdialog.cpp   |    4 ++--
 latexeditor.h      |    2 +-
 latexeditorview.h  |    2 +-
 latexhighlighter.h |    2 +-
 spellerdialog.h    |    2 +-
 texmaker.h         |    2 +-
 texmaker.pro       |   44 +++++++-------------------------------------
 7 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/configdialog.cpp b/configdialog.cpp
index 144bddc..89e4059 100644
--- a/configdialog.cpp
+++ b/configdialog.cpp
@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
 QDir spelldir(QCoreApplication::applicationDirPath());
 #else
 #ifdef DEBIAN_SPELLDIR
-QDir spelldir(PREFIX"/share/myspell/dicts");
+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
 #else
-QDir spelldir(PREFIX"/share/texmaker");
+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
 #endif
 #endif
 
diff --git a/latexeditor.h b/latexeditor.h
index 40cc2f6..d46150f 100644
--- a/latexeditor.h
+++ b/latexeditor.h
@@ -28,7 +28,7 @@
 
 #include "latexhighlighter.h"
 #include "textblockselection.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
 
 typedef  int UserBookmarkList[3];
 
diff --git a/latexeditorview.h b/latexeditorview.h
index 283fd8a..1ba39cc 100644
--- a/latexeditorview.h
+++ b/latexeditorview.h
@@ -22,7 +22,7 @@
 #include "gotolinewidget.h"
 #include "replacewidget.h"
 #include "minisplitter.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
 
 class LatexEditorView : public QWidget  {
    Q_OBJECT
diff --git a/latexhighlighter.h b/latexhighlighter.h
index 029c7ad..9fbb532 100644
--- a/latexhighlighter.h
+++ b/latexhighlighter.h
@@ -20,7 +20,7 @@
 #include <QColor>
 #include <QTextBlockUserData>
 //#include "latexeditor.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
 
 class QTextDocument;
 class LatexEditor;
diff --git a/spellerdialog.h b/spellerdialog.h
index 83248ae..cd16dad 100644
--- a/spellerdialog.h
+++ b/spellerdialog.h
@@ -13,7 +13,7 @@
 
 #include "ui_spellerdialog.h"
 #include "latexeditor.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
 
 #include <QTextCursor>
 
diff --git a/texmaker.h b/texmaker.h
index b1a2c65..0806731 100644
--- a/texmaker.h
+++ b/texmaker.h
@@ -47,7 +47,7 @@
 #include "symbollistwidget.h"
 #include "xmltagslistwidget.h"
 #include "logeditor.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
 #include "browser.h"
 #include "pdfviewerwidget.h"
 #include "pdfviewer.h"
diff --git a/texmaker.pro b/texmaker.pro
index 5d017ad..87fac99 100644
--- a/texmaker.pro
+++ b/texmaker.pro
@@ -4,7 +4,8 @@ TARGET	 = texmaker
 QT += network \
       xml \
       webkit
-CONFIG	+= qt warn_off release
+CONFIG	+= qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell
 TEXMAKERVERSION=3.2
 DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
 DEFINES += HAVE_SPLASH
@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
 	scandialog.h \
 	synctex_parser.h \
 	synctex_parser_utils.h \
-	hunspell/affentry.hxx \
-	hunspell/affixmgr.hxx \
-	hunspell/atypes.hxx \
-	hunspell/baseaffix.hxx \
-	hunspell/csutil.hxx \
-	hunspell/dictmgr.hxx \
-	hunspell/hashmgr.hxx \
-	hunspell/htypes.hxx \
-	hunspell/hunspell.hxx \
-	hunspell/hunspell.h \
-	hunspell/langnum.hxx \
-	hunspell/license.hunspell \
-	hunspell/phonet.hxx \
-	hunspell/suggestmgr.hxx \
-	hunspell/license.myspell \
-	hunspell/filemgr.hxx \
-	hunspell/hunzip.hxx \
-	hunspell/replist.hxx \
-	hunspell/w_char.hxx \
 	singleapp/qtlocalpeer.h \
 	singleapp/qtlockedfile.h \
 	singleapp/qtsingleapplication.h \
@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
 	encodingprober/nsSJISProber.h \
 	encodingprober/nsUniversalDetector.h \
 	encodingprober/qencodingprober.h \
-	encodingprober/UnicodeGroupProber.h
+	encodingprober/UnicodeGroupProber.h 
 SOURCES	+= main.cpp \
 	texmakerapp.cpp \
 	texmaker.cpp \
@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
 	scandialog.cpp \
 	synctex_parser.c \
 	synctex_parser_utils.c \
-	hunspell/affentry.cxx \
-	hunspell/affixmgr.cxx \
-	hunspell/csutil.cxx \
-	hunspell/dictmgr.cxx \
-	hunspell/hashmgr.cxx \
-	hunspell/hunspell.cxx \
-	hunspell/phonet.cxx \
-	hunspell/suggestmgr.cxx \
-	hunspell/utf_info.cxx \
-	hunspell/filemgr.cxx \
-	hunspell/replist.cxx \
-	hunspell/hunzip.cxx \
 	singleapp/qtlocalpeer.cpp \
 	singleapp/qtlockedfile.cpp \
 	singleapp/qtsingleapplication.cpp \
@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
     ICONDIR=/usr/share/pixmaps
 }
 
-INCLUDEPATH  += /usr/include/poppler/qt4
-LIBS         += -L/usr/lib -lpoppler-qt4
-LIBS         += -L/usr/lib -lz
+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
+LIBS         += -lpoppler-qt4
+LIBS         += -lz
 DEFINES += PREFIX=\\\"$${PREFIX}\\\"
 target.path = $${PREFIX}/bin
 
-#DEFINES += DEBIAN_SPELLDIR
+DEFINES += DEBIAN_SPELLDIR
 
 
 INSTALLS = target
-- 
1.7.8.1