[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
commit: 32131c5d32facc40c0dd131dfa1d5850265ad430 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 12 12:37:41 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 12 12:38:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32131c5d app-office/texmaker: drop 5.0.4 Closes: https://bugs.gentoo.org/915780 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/texmaker/Manifest | 1 - .../texmaker-5.0-unbundle-hunspell-singleapp.patch | 67 - app-office/texmaker/texmaker-5.0.4.ebuild | 86 -- 3 files changed, 154 deletions(-) diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index 05f8260b8f1c..981e765a5485 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -1,2 +1 @@ -DIST texmaker-5.0.4.tar.bz2 15812468 BLAKE2B ad252827c7db90ad20de5ca59958124714b7abe660998ef21b983a731aaa12fedc018a764ad8898780b18ca97b44145afe548817a867f74b407f0a2c9399 SHA512 34ff5773358c2fffbc9e7e61028cd74eef231152e3483531b66cb0d907dd8f70a4e8b6d6ea09b0b11387b592f6d1676ba8a1e737b26c86a45b16882e53edff1f DIST texmaker-5.1.4.tar.bz2 15277027 BLAKE2B c121569a599181ec480823fbe2429977aedad4cbd4a3a09647b7ebcaace873d56e27362148a729b1802454d8e38703d507f4f616886d4bbba4075fe91aed5a5f SHA512 6ae4be7ae9be98e494480d4574e783a5568f0dcc9c631ccbc9bf00cca9f69dc672ba72060c064748a4446d20302af89e3bc6f14e8977d1f1ddbd20458fcf6d4e diff --git a/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch b/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch deleted file mode 100644 index d7073b8547db.. --- a/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/texmaker.pro b/texmaker.pro -index 0a9205d..62bc46d 100644 a/texmaker.pro -+++ b/texmaker.pro -@@ -117,29 +117,6 @@ HEADERS += texmaker.h \ - unicodeview.h \ - svnhelper.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 \ -@@ -502,22 +479,6 @@ SOURCES += main.cpp \ - unicodeview.cpp \ - quickbeamerdialog.cpp \ - svnhelper.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 \ -@@ -1088,8 +1049,7 @@ metainfo.path = texmaker_linux64 - - INSTALLS = target - HEADERS += x11fontdialog.h --SOURCES += x11fontdialog.cpp \ --singleapp/qtlockedfile_unix.cpp -+SOURCES += x11fontdialog.cpp - FORMS += x11fontdialog.ui - - utilities.files = doc/doc10.png \ diff --git a/app-office/texmaker/texmaker-5.0.4.ebuild b/app-office/texmaker/texmaker-5.0.4.ebuild deleted file mode 100644 index d9bad6e2567c.. --- a/app-office/texmaker/texmaker-5.0.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils readme.gentoo-r1 xdg - -DESCRIPTION="A nice LaTeX-IDE" -HOMEPAGE="https://xm1math.net/texmaker/; -SRC_URI="https://xm1math.net/texmaker/${P}.tar.bz2; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - app-text/hunspell:= - app-text/poppler[qt5] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtlockedfile - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 -
[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
commit: ba4c5a38588e9202314c548a7b4ff86a51f010c5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 19:38:43 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 26 03:29:33 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4c5a38 app-office/texmaker: Drop old Bug: https://bugs.gentoo.org/653982 Package-Manager: Portage-2.3.31, Repoman-2.3.9 app-office/texmaker/Manifest | 1 - .../files/texmaker-4.5-modern-styles.patch | 16 .../texmaker/files/texmaker-4.5-unbundle.patch | 93 -- app-office/texmaker/texmaker-4.5-r2.ebuild | 84 --- app-office/texmaker/texmaker-4.5-r3.ebuild | 84 --- 5 files changed, 278 deletions(-) diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index df727efaa2f..864c6fbfc32 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -1,2 +1 @@ -DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890a1b8f3493e89f85c187bca56791dbdfb4805853dff6335cfeb2fc3ba7a00039927d3476c2c90aaa6d6213ba32b3 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636 diff --git a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch deleted file mode 100644 index 73c3b92f761..000 --- a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch +++ /dev/null @@ -1,16 +0,0 @@ a/texmaker.cpp 2014-11-26 09:06:56.0 -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 - // { diff --git a/app-office/texmaker/files/texmaker-4.5-unbundle.patch b/app-office/texmaker/files/texmaker-4.5-unbundle.patch deleted file mode 100644 index 607b2c8b7e4..000 --- a/app-office/texmaker/files/texmaker-4.5-unbundle.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/configdialog.cpp b/configdialog.cpp -index dddb11e..9a1aee7 100644 a/configdialog.cpp -+++ b/configdialog.cpp -@@ -222,7 +222,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 b8a2143..a8bcd46 100644 a/texmaker.cpp -+++ b/texmaker.cpp -@@ -2787,7 +2787,7 @@ if (hasDecodingError) - 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 7e9b706..909eb62 100644 a/texmaker.pro -+++ b/texmaker.pro -@@ -98,29 +98,6 @@ HEADERS += texmaker.h \ - unicodeview.h \ - quickbeamerdialog.h \ - svnhelper.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 \ -@@ -210,22 +187,6 @@ SOURCES += main.cpp \ - unicodeview.cpp \ -
[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
commit: e4d38e2fca1719e3e3e32009ceb6d6d3ea819e64 Author: Kristian Fiskerstrand gentoo org> AuthorDate: Thu Jul 20 10:54:30 2017 + Commit: Kristian Fiskerstrand gentoo org> CommitDate: Thu Jul 20 10:56:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d38e2f app-office/texmaker: New upstream version 5.0 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-office/texmaker/Manifest | 1 + .../texmaker-5.0-unbundle-hunspell-singleapp.patch | 67 + app-office/texmaker/texmaker-5.0.ebuild| 84 ++ 3 files changed, 152 insertions(+) diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index eeb351dc15c..a7e7bb3036a 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -1 +1,2 @@ DIST texmaker-4.5.tar.bz2 11287724 SHA256 2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 WHIRLPOOL 0fb00957cb6fe2f3181ac6a6ad917fd60d90ca05bcbaa14da62045ac6c5d78126d9abeb1429bd1fe48a25416d95a1a52c53f83cad91cb0540fcd043a9ea63045 +DIST texmaker-5.0.tar.bz2 15728938 SHA256 2a0b329c0ff5c408f72bcefbef16361d26da74e3ca1f39d6b8c78d84c37245a9 SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636 WHIRLPOOL 5989c926d6f4b770cfc0d0cf346d47c7244540b2873d2c7f54d52590debca85271acba10307f24f77e1446db01e7404d4b0b6fc4125360843a4bd32957467c15 diff --git a/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch b/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch new file mode 100644 index 000..d7073b8547d --- /dev/null +++ b/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch @@ -0,0 +1,67 @@ +diff --git a/texmaker.pro b/texmaker.pro +index 0a9205d..62bc46d 100644 +--- a/texmaker.pro b/texmaker.pro +@@ -117,29 +117,6 @@ HEADERS += texmaker.h \ + unicodeview.h \ + svnhelper.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 \ +@@ -502,22 +479,6 @@ SOURCES += main.cpp \ + unicodeview.cpp \ + quickbeamerdialog.cpp \ + svnhelper.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 \ +@@ -1088,8 +1049,7 @@ metainfo.path = texmaker_linux64 + + INSTALLS = target + HEADERS += x11fontdialog.h +-SOURCES += x11fontdialog.cpp \ +-singleapp/qtlockedfile_unix.cpp ++SOURCES += x11fontdialog.cpp + FORMS += x11fontdialog.ui + + utilities.files = doc/doc10.png \ diff --git a/app-office/texmaker/texmaker-5.0.ebuild b/app-office/texmaker/texmaker-5.0.ebuild new file mode 100644 index 000..6e6dacfa835 --- /dev/null +++ b/app-office/texmaker/texmaker-5.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils qmake-utils readme.gentoo-r1 + +DESCRIPTION="A nice LaTeX-IDE" +HOMEPAGE="http://www.xm1math.net/texmaker/; +SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +COMMON_DEPEND=" + app-text/hunspell + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXext + app-text/poppler:=[qt5] + dev-qt/qtconcurrent:5 +
[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
commit: e872d907849f1b24f8148dbdcebacd744cb8537c Author: Justin Lecher gentoo org> AuthorDate: Thu Nov 26 09:38:45 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 26 10:26:01 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e872d907 app-office/texmaker: Drop old Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> app-office/texmaker/Manifest | 1 - .../texmaker/files/texmaker-3.1-hunspell.patch | 167 --- .../texmaker/files/texmaker-3.3.3-qt48.patch | 15 -- .../texmaker/files/texmaker-3.3.4-hunspell.patch | 167 --- .../texmaker/files/texmaker-3.5-hunspell.patch | 148 - .../texmaker/files/texmaker-3.5.1-hunspell.patch | 148 - .../texmaker/files/texmaker-3.5.2-clang.patch | 16 -- .../texmaker/files/texmaker-3.5.2-hunspell.patch | 181 - .../texmaker/files/texmaker-4.0.1-hunspell.patch | 180 .../texmaker/files/texmaker-4.0.3-hunspell.patch | 165 --- .../texmaker/files/texmaker-4.0.4-unbundle.patch | 105 app-office/texmaker/texmaker-4.3.ebuild| 87 -- app-office/texmaker/texmaker-4.4.1.ebuild | 96 --- 13 files changed, 1476 deletions(-) diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index 8882f5a..f9de178 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -1,2 +1 @@ -DIST texmaker-4.3.tar.bz2 11334013 SHA256 670eef7c51630342c87f1c2a77da0b36798fdb971c7893841e13c9342b18da51 SHA512 9bb94a104c6324d2c712b522c60513189575d01d8ea24a6eeef4201ff17c719ab816775eae5239637f5ef2084d7beb8c1d76addc10d5000a1ae53ab33c1adc3d WHIRLPOOL 5942f0262b02746a4fa6ec77c2944b1165fadaf060b8a7248bc4a32b5c74334745c21b221c234e0ddc66d0bb7250a6cdc1a3eb12043de4f19471cf0ce4bb7844 DIST texmaker-4.4.1.tar.bz2 11274997 SHA256 80939493ffb6c92f47c47109dff6de4c91259244247e90ddfb1bb6153559b4b4 SHA512 a165b7757f2170d42f3d48d644cb351efd4d308b1a0601105952c3253084ae4a3d0bbfb7915207ff60d0ba7036283c6c8305a901d7ac8aab4e79c1bb78f68ddd WHIRLPOOL 3b00a894a194659d64ea8058ca1f0d04a68904f4eb638121f935ab83583b83c57bae3d1abb8d1e0541bed4bbaa44336e9733e8de3d346098dafae319437909f2 diff --git a/app-office/texmaker/files/texmaker-3.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.1-hunspell.patch deleted file mode 100644 index 3b8935d..000 --- a/app-office/texmaker/files/texmaker-3.1-hunspell.patch +++ /dev/null @@ -1,167 +0,0 @@ - configdialog.cpp |4 ++-- - latexeditor.h |2 +- - latexeditorview.h |2 +- - latexhighlighter.h |2 +- - spellerdialog.h|2 +- - texmaker.h |2 +- - texmaker.pro | 42 ++ - 7 files changed, 13 insertions(+), 43 deletions(-) - -diff --git a/configdialog.cpp b/configdialog.cpp -index 136072d..550db58 100644 a/configdialog.cpp -+++ b/configdialog.cpp -@@ -122,9 +122,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 b9b8d75..a9ec1ef 100644 a/latexeditor.h -+++ b/latexeditor.h -@@ -26,7 +26,7 @@ - #include - - #include "latexhighlighter.h" --#include "hunspell/hunspell.hxx" -+#include - - typedef int UserBookmarkList[3]; - -diff --git a/latexeditorview.h b/latexeditorview.h -index c6cb362..2ecf876 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 - - class LatexEditorView : public QWidget { -Q_OBJECT -diff --git a/latexhighlighter.h b/latexhighlighter.h -index 83ca79c..a1e437a 100644 a/latexhighlighter.h -+++ b/latexhighlighter.h -@@ -20,7 +20,7 @@ - #include - #include - //#include "latexeditor.h" --#include "hunspell/hunspell.hxx" -+#include - - 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 - - #include - -diff --git a/texmaker.h b/texmaker.h -index fa56129..4b1367e 100644 a/texmaker.h -+++ b/texmaker.h -@@ -46,7 +46,7 @@ - #include "symbollistwidget.h" - #include "xmltagslistwidget.h" - #include "logeditor.h" --#include "hunspell/hunspell.hxx" -+#include - #include "browser.h" - #include "pdfviewerwidget.h" - #include "pdfviewer.h" -diff --git a/texmaker.pro
[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
commit: 428abb3121094fd558a371b66eb8d68ae7cd38b0 Author: Stephen Bosch gmail com> AuthorDate: Thu Nov 26 11:26:00 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 26 11:26:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428abb31 app-office/texmaker: version bump to 4.5 #566790 app-office/texmaker/Manifest | 1 + .../files/texmaker-4.5-modern-styles.patch | 16 .../texmaker/files/texmaker-4.5-unbundle.patch | 93 app-office/texmaker/texmaker-4.5.ebuild| 99 ++ 4 files changed, 209 insertions(+) diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index f9de178..9d351b7 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -1 +1,2 @@ DIST texmaker-4.4.1.tar.bz2 11274997 SHA256 80939493ffb6c92f47c47109dff6de4c91259244247e90ddfb1bb6153559b4b4 SHA512 a165b7757f2170d42f3d48d644cb351efd4d308b1a0601105952c3253084ae4a3d0bbfb7915207ff60d0ba7036283c6c8305a901d7ac8aab4e79c1bb78f68ddd WHIRLPOOL 3b00a894a194659d64ea8058ca1f0d04a68904f4eb638121f935ab83583b83c57bae3d1abb8d1e0541bed4bbaa44336e9733e8de3d346098dafae319437909f2 +DIST texmaker-4.5.tar.bz2 11287724 SHA256 2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 WHIRLPOOL 0fb00957cb6fe2f3181ac6a6ad917fd60d90ca05bcbaa14da62045ac6c5d78126d9abeb1429bd1fe48a25416d95a1a52c53f83cad91cb0540fcd043a9ea63045 diff --git a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch new file mode 100644 index 000..73c3b92 --- /dev/null +++ b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch @@ -0,0 +1,16 @@ +--- a/texmaker.cpp 2014-11-26 09:06:56.0 -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 + // { diff --git a/app-office/texmaker/files/texmaker-4.5-unbundle.patch b/app-office/texmaker/files/texmaker-4.5-unbundle.patch new file mode 100644 index 000..607b2c8 --- /dev/null +++ b/app-office/texmaker/files/texmaker-4.5-unbundle.patch @@ -0,0 +1,93 @@ +diff --git a/configdialog.cpp b/configdialog.cpp +index dddb11e..9a1aee7 100644 +--- a/configdialog.cpp b/configdialog.cpp +@@ -222,7 +222,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 b8a2143..a8bcd46 100644 +--- a/texmaker.cpp b/texmaker.cpp +@@ -2787,7 +2787,7 @@ if (hasDecodingError) + 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 7e9b706..909eb62 100644 +--- a/texmaker.pro b/texmaker.pro +@@ -98,29 +98,6 @@ HEADERS += texmaker.h \ + unicodeview.h \ + quickbeamerdialog.h \ + svnhelper.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 \ +@@ -210,22 +187,6 @@ SOURCES += main.cpp \ + unicodeview.cpp \ + quickbeamerdialog.cpp \ +