[gentoo-commits] gentoo-x86 commit in app-office/texmaker/files: texmakerx_my.pri texmaker-4.0.4-unbundle.patch

[Justin Lecher (jlec)]

jlec        13/10/26 09:47:18

  Added:                texmakerx_my.pri texmaker-4.0.4-unbundle.patch
  Log:
  app-office/texmaker: Use system dev-qt/qtsingleapplication, #489154
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.1                  app-office/texmaker/files/texmakerx_my.pri

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

Index: texmakerx_my.pri
===================================================================
CONFIG   += link_pkgconfig

# System hunspell
PKGCONFIG += hunspell

# System qtsingleapplication
CONFIG += qtsingleapplication



1.1                  app-office/texmaker/files/texmaker-4.0.4-unbundle.patch

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

Index: texmaker-4.0.4-unbundle.patch
===================================================================
 configdialog.cpp |  2 +-
 texmaker.cpp     |  4 ++--
 texmaker.pro     | 42 +-----------------------------------------
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/configdialog.cpp b/configdialog.cpp
index e596a2c..3660429 100644
--- a/configdialog.cpp
+++ b/configdialog.cpp
@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
 QDir spelldir(QCoreApplication::applicationDirPath());
 #else
 #ifdef DEBIAN_SPELLDIR
-QDir spelldir(PREFIX"/share/myspell/dicts");
+QDir spelldir(PREFIX"/share/myspell");
 #else
 QDir spelldir(PREFIX"/share/texmaker");
 #endif
diff --git a/texmaker.cpp b/texmaker.cpp
index 51d2082..607f66e 100644
--- a/texmaker.cpp
+++ b/texmaker.cpp
@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
 QString dicDir=QCoreApplication::applicationDirPath() + "/";
 #else
 #ifdef DEBIAN_SPELLDIR
-QString dicDir=PREFIX"/share/myspell/dicts/";
+QString dicDir=PREFIX"/share/myspell/";
 #else
 QString dicDir=PREFIX"/share/texmaker/";
 #endif
@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
 	    UpdateBibliography();
 	    }
 	}
-}
\ No newline at end of file
+}
diff --git a/texmaker.pro b/texmaker.pro
index bce8dd4..2f205bb 100644
--- a/texmaker.pro
+++ b/texmaker.pro
@@ -95,29 +95,6 @@ HEADERS	+= texmaker.h \
 	versiondialog.h \
 	unicodedialog.h \
 	unicodeview.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 \
-	singleapp/qtsinglecoreapplication.h \
 	encodingprober/CharDistribution.h \
 	encodingprober/ChineseGroupProber.h \
 	encodingprober/ctype_test_p.h \
@@ -204,22 +181,6 @@ SOURCES	+= main.cpp \
 	versiondialog.cpp \
 	unicodedialog.cpp \
 	unicodeview.cpp \
-	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 \
-	singleapp/qtsinglecoreapplication.cpp \
 	encodingprober/CharDistribution.cpp \
 	encodingprober/ChineseGroupProber.cpp \
 	encodingprober/JapaneseGroupProber.cpp \
@@ -328,8 +289,7 @@ icon.path = $${ICONDIR}
 
 INSTALLS = target
 HEADERS	+= x11fontdialog.h 
-SOURCES	+= x11fontdialog.cpp \
-	  singleapp/qtlockedfile_unix.cpp
+SOURCES	+= x11fontdialog.cpp
 FORMS += x11fontdialog.ui
 
 utilities.files = doc/doc1.png \