[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/

[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/

[Alexis Ballier]

commit:     bf5cc140497b3c400cbb82fd9013f481d17b11a4
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 16 18:48:12 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 07:04:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5cc140

app-office/texmaker: remove unused patches

 .../texmaker/files/texmaker-4.1-unbundle.patch     | 98 ----------------------
 .../files/texmaker-4.4.1-modern-styles.patch       | 16 ----
 2 files changed, 114 deletions(-)

diff --git a/app-office/texmaker/files/texmaker-4.1-unbundle.patch b/app-office/texmaker/files/texmaker-4.1-unbundle.patch
deleted file mode 100644
index 3983733deec..00000000000
--- a/app-office/texmaker/files/texmaker-4.1-unbundle.patch
+++ /dev/null
@@ -1,98 +0,0 @@
- 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
-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 \
- 	unicodedialog.h \
- 	unicodeview.h \
- 	quickbeamerdialog.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 \
- 	unicodedialog.cpp \
- 	unicodeview.cpp \
- 	quickbeamerdialog.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 \

diff --git a/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch b/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch
deleted file mode 100644
index 73c3b92f761..00000000000
--- a/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/texmaker.cpp	2014-11-26 09:06:56.000000000 -0300
-+++ b/texmaker.cpp	2015-06-19 20:49:58.801377000 -0300
-@@ -4451,7 +4451,12 @@
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- if (modern_style)
-     {
--qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+		if(desktop_env == 1){
-+			if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle")));
-+			else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows")));
-+			else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+		}
-+		else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-     }
- // else
- // {