From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EFD71396D0 for ; Tue, 22 Aug 2017 07:04:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D34C1FC019; Tue, 22 Aug 2017 07:04:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AE1F1FC019 for ; Tue, 22 Aug 2017 07:04:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7877D341BF2 for ; Tue, 22 Aug 2017 07:04:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3DB377E5E for ; Tue, 22 Aug 2017 07:04:40 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1503385462.bf5cc140497b3c400cbb82fd9013f481d17b11a4.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/texmaker/files/texmaker-4.1-unbundle.patch app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch X-VCS-Directories: app-office/texmaker/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: bf5cc140497b3c400cbb82fd9013f481d17b11a4 X-VCS-Branch: master Date: Tue, 22 Aug 2017 07:04:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c351b753-509c-47a3-b441-752b82c85096 X-Archives-Hash: f1b59f8b07343608d9e611d2e8e6514f commit: bf5cc140497b3c400cbb82fd9013f481d17b11a4 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Wed Aug 16 18:48:12 2017 +0000 Commit: Alexis Ballier gentoo 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 - // {