| 1 |
commit: 428abb3121094fd558a371b66eb8d68ae7cd38b0 |
| 2 |
Author: Stephen Bosch <stephen.bosch <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Nov 26 11:26:00 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 26 11:26:00 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428abb31 |
| 7 |
|
| 8 |
app-office/texmaker: version bump to 4.5 #566790 |
| 9 |
|
| 10 |
app-office/texmaker/Manifest | 1 + |
| 11 |
.../files/texmaker-4.5-modern-styles.patch | 16 ++++ |
| 12 |
.../texmaker/files/texmaker-4.5-unbundle.patch | 93 ++++++++++++++++++++ |
| 13 |
app-office/texmaker/texmaker-4.5.ebuild | 99 ++++++++++++++++++++++ |
| 14 |
4 files changed, 209 insertions(+) |
| 15 |
|
| 16 |
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest |
| 17 |
index f9de178..9d351b7 100644 |
| 18 |
--- a/app-office/texmaker/Manifest |
| 19 |
+++ b/app-office/texmaker/Manifest |
| 20 |
@@ -1 +1,2 @@ |
| 21 |
DIST texmaker-4.4.1.tar.bz2 11274997 SHA256 80939493ffb6c92f47c47109dff6de4c91259244247e90ddfb1bb6153559b4b4 SHA512 a165b7757f2170d42f3d48d644cb351efd4d308b1a0601105952c3253084ae4a3d0bbfb7915207ff60d0ba7036283c6c8305a901d7ac8aab4e79c1bb78f68ddd WHIRLPOOL 3b00a894a194659d64ea8058ca1f0d04a68904f4eb638121f935ab83583b83c57bae3d1abb8d1e0541bed4bbaa44336e9733e8de3d346098dafae319437909f2 |
| 22 |
+DIST texmaker-4.5.tar.bz2 11287724 SHA256 2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 WHIRLPOOL 0fb00957cb6fe2f3181ac6a6ad917fd60d90ca05bcbaa14da62045ac6c5d78126d9abeb1429bd1fe48a25416d95a1a52c53f83cad91cb0540fcd043a9ea63045 |
| 23 |
|
| 24 |
diff --git a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch |
| 25 |
new file mode 100644 |
| 26 |
index 0000000..73c3b92 |
| 27 |
--- /dev/null |
| 28 |
+++ b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch |
| 29 |
@@ -0,0 +1,16 @@ |
| 30 |
+--- a/texmaker.cpp 2014-11-26 09:06:56.000000000 -0300 |
| 31 |
++++ b/texmaker.cpp 2015-06-19 20:49:58.801377000 -0300 |
| 32 |
+@@ -4451,7 +4451,12 @@ |
| 33 |
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) |
| 34 |
+ if (modern_style) |
| 35 |
+ { |
| 36 |
+-qApp->setStyle(new ManhattanStyle(QLatin1String("fusion"))); |
| 37 |
++ if(desktop_env == 1){ |
| 38 |
++ if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle"))); |
| 39 |
++ else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows"))); |
| 40 |
++ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion"))); |
| 41 |
++ } |
| 42 |
++ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion"))); |
| 43 |
+ } |
| 44 |
+ // else |
| 45 |
+ // { |
| 46 |
|
| 47 |
diff --git a/app-office/texmaker/files/texmaker-4.5-unbundle.patch b/app-office/texmaker/files/texmaker-4.5-unbundle.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000..607b2c8 |
| 50 |
--- /dev/null |
| 51 |
+++ b/app-office/texmaker/files/texmaker-4.5-unbundle.patch |
| 52 |
@@ -0,0 +1,93 @@ |
| 53 |
+diff --git a/configdialog.cpp b/configdialog.cpp |
| 54 |
+index dddb11e..9a1aee7 100644 |
| 55 |
+--- a/configdialog.cpp |
| 56 |
++++ b/configdialog.cpp |
| 57 |
+@@ -222,7 +222,7 @@ void ConfigDialog::browseAspell() |
| 58 |
+ QDir spelldir(QCoreApplication::applicationDirPath()); |
| 59 |
+ #else |
| 60 |
+ #ifdef DEBIAN_SPELLDIR |
| 61 |
+-QDir spelldir(PREFIX"/share/myspell/dicts"); |
| 62 |
++QDir spelldir(PREFIX"/share/myspell"); |
| 63 |
+ #else |
| 64 |
+ QDir spelldir(PREFIX"/share/texmaker"); |
| 65 |
+ #endif |
| 66 |
+diff --git a/texmaker.cpp b/texmaker.cpp |
| 67 |
+index b8a2143..a8bcd46 100644 |
| 68 |
+--- a/texmaker.cpp |
| 69 |
++++ b/texmaker.cpp |
| 70 |
+@@ -2787,7 +2787,7 @@ if (hasDecodingError) |
| 71 |
+ QString dicDir=QCoreApplication::applicationDirPath() + "/"; |
| 72 |
+ #else |
| 73 |
+ #ifdef DEBIAN_SPELLDIR |
| 74 |
+-QString dicDir=PREFIX"/share/myspell/dicts/"; |
| 75 |
++QString dicDir=PREFIX"/share/myspell/"; |
| 76 |
+ #else |
| 77 |
+ QString dicDir=PREFIX"/share/texmaker/"; |
| 78 |
+ #endif |
| 79 |
+diff --git a/texmaker.pro b/texmaker.pro |
| 80 |
+index 7e9b706..909eb62 100644 |
| 81 |
+--- a/texmaker.pro |
| 82 |
++++ b/texmaker.pro |
| 83 |
+@@ -98,29 +98,6 @@ HEADERS += texmaker.h \ |
| 84 |
+ unicodeview.h \ |
| 85 |
+ quickbeamerdialog.h \ |
| 86 |
+ svnhelper.h \ |
| 87 |
+- hunspell/affentry.hxx \ |
| 88 |
+- hunspell/affixmgr.hxx \ |
| 89 |
+- hunspell/atypes.hxx \ |
| 90 |
+- hunspell/baseaffix.hxx \ |
| 91 |
+- hunspell/csutil.hxx \ |
| 92 |
+- hunspell/dictmgr.hxx \ |
| 93 |
+- hunspell/hashmgr.hxx \ |
| 94 |
+- hunspell/htypes.hxx \ |
| 95 |
+- hunspell/hunspell.hxx \ |
| 96 |
+- hunspell/hunspell.h \ |
| 97 |
+- hunspell/langnum.hxx \ |
| 98 |
+- hunspell/license.hunspell \ |
| 99 |
+- hunspell/phonet.hxx \ |
| 100 |
+- hunspell/suggestmgr.hxx \ |
| 101 |
+- hunspell/license.myspell \ |
| 102 |
+- hunspell/filemgr.hxx \ |
| 103 |
+- hunspell/hunzip.hxx \ |
| 104 |
+- hunspell/replist.hxx \ |
| 105 |
+- hunspell/w_char.hxx \ |
| 106 |
+- singleapp/qtlocalpeer.h \ |
| 107 |
+- singleapp/qtlockedfile.h \ |
| 108 |
+- singleapp/qtsingleapplication.h \ |
| 109 |
+- singleapp/qtsinglecoreapplication.h \ |
| 110 |
+ encodingprober/CharDistribution.h \ |
| 111 |
+ encodingprober/ChineseGroupProber.h \ |
| 112 |
+ encodingprober/ctype_test_p.h \ |
| 113 |
+@@ -210,22 +187,6 @@ SOURCES += main.cpp \ |
| 114 |
+ unicodeview.cpp \ |
| 115 |
+ quickbeamerdialog.cpp \ |
| 116 |
+ svnhelper.cpp \ |
| 117 |
+- hunspell/affentry.cxx \ |
| 118 |
+- hunspell/affixmgr.cxx \ |
| 119 |
+- hunspell/csutil.cxx \ |
| 120 |
+- hunspell/dictmgr.cxx \ |
| 121 |
+- hunspell/hashmgr.cxx \ |
| 122 |
+- hunspell/hunspell.cxx \ |
| 123 |
+- hunspell/phonet.cxx \ |
| 124 |
+- hunspell/suggestmgr.cxx \ |
| 125 |
+- hunspell/utf_info.cxx \ |
| 126 |
+- hunspell/filemgr.cxx \ |
| 127 |
+- hunspell/replist.cxx \ |
| 128 |
+- hunspell/hunzip.cxx \ |
| 129 |
+- singleapp/qtlocalpeer.cpp \ |
| 130 |
+- singleapp/qtlockedfile.cpp \ |
| 131 |
+- singleapp/qtsingleapplication.cpp \ |
| 132 |
+- singleapp/qtsinglecoreapplication.cpp \ |
| 133 |
+ encodingprober/CharDistribution.cpp \ |
| 134 |
+ encodingprober/ChineseGroupProber.cpp \ |
| 135 |
+ encodingprober/JapaneseGroupProber.cpp \ |
| 136 |
+@@ -336,8 +297,7 @@ icon.path = $${ICONDIR} |
| 137 |
+ |
| 138 |
+ INSTALLS = target |
| 139 |
+ HEADERS += x11fontdialog.h |
| 140 |
+-SOURCES += x11fontdialog.cpp \ |
| 141 |
+- singleapp/qtlockedfile_unix.cpp |
| 142 |
++SOURCES += x11fontdialog.cpp |
| 143 |
+ FORMS += x11fontdialog.ui |
| 144 |
+ |
| 145 |
+ utilities.files = doc/doc1.png \ |
| 146 |
|
| 147 |
diff --git a/app-office/texmaker/texmaker-4.5.ebuild b/app-office/texmaker/texmaker-4.5.ebuild |
| 148 |
new file mode 100644 |
| 149 |
index 0000000..63debce |
| 150 |
--- /dev/null |
| 151 |
+++ b/app-office/texmaker/texmaker-4.5.ebuild |
| 152 |
@@ -0,0 +1,99 @@ |
| 153 |
+# Copyright 1999-2015 Gentoo Foundation |
| 154 |
+# Distributed under the terms of the GNU General Public License v2 |
| 155 |
+# $Id$ |
| 156 |
+ |
| 157 |
+EAPI=5 |
| 158 |
+ |
| 159 |
+inherit eutils qmake-utils readme.gentoo |
| 160 |
+ |
| 161 |
+DESCRIPTION="A nice LaTeX-IDE" |
| 162 |
+HOMEPAGE="http://www.xm1math.net/texmaker/" |
| 163 |
+SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2" |
| 164 |
+ |
| 165 |
+LICENSE="GPL-2" |
| 166 |
+SLOT="0" |
| 167 |
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 168 |
+IUSE="+qt4 qt5" |
| 169 |
+ |
| 170 |
+REQUIRED_USE="^^ ( qt4 qt5 )" |
| 171 |
+ |
| 172 |
+COMMON_DEPEND=" |
| 173 |
+ app-text/hunspell |
| 174 |
+ app-text/poppler:=[qt4?,qt5?] |
| 175 |
+ sys-libs/zlib |
| 176 |
+ x11-libs/libX11 |
| 177 |
+ x11-libs/libXext |
| 178 |
+ dev-qt/qtsingleapplication[X,qt4?,qt5?] |
| 179 |
+ qt4? ( |
| 180 |
+ dev-qt/qtgui:4 |
| 181 |
+ dev-qt/qtcore:4 |
| 182 |
+ dev-qt/qtscript:4 |
| 183 |
+ dev-qt/qtwebkit:4 |
| 184 |
+ ) |
| 185 |
+ qt5? ( |
| 186 |
+ dev-qt/qtconcurrent:5 |
| 187 |
+ dev-qt/qtgui:5 |
| 188 |
+ dev-qt/qtcore:5 |
| 189 |
+ dev-qt/qtnetwork:5 |
| 190 |
+ dev-qt/qtscript:5 |
| 191 |
+ dev-qt/qtwebkit:5[printsupport] |
| 192 |
+ dev-qt/qtwidgets:5 |
| 193 |
+ dev-qt/qtxml:5 |
| 194 |
+ ) |
| 195 |
+" |
| 196 |
+RDEPEND="${COMMON_DEPEND} |
| 197 |
+ virtual/latex-base |
| 198 |
+ app-text/psutils |
| 199 |
+ app-text/ghostscript-gpl |
| 200 |
+ media-libs/netpbm |
| 201 |
+ qt4? ( app-i18n/ibus-qt )" |
| 202 |
+DEPEND="${COMMON_DEPEND} |
| 203 |
+ virtual/pkgconfig" |
| 204 |
+ |
| 205 |
+PATCHES=( |
| 206 |
+ "${FILESDIR}"/${P}-unbundle.patch |
| 207 |
+ "${FILESDIR}"/${P}-modern-styles.patch |
| 208 |
+ ) |
| 209 |
+ |
| 210 |
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt ) |
| 211 |
+HTML_DOCS=( doc/. ) |
| 212 |
+ |
| 213 |
+src_prepare() { |
| 214 |
+ find singleapp hunspell -delete || die |
| 215 |
+ |
| 216 |
+ epatch "${PATCHES[@]}" |
| 217 |
+ |
| 218 |
+ cat >> ${PN}.pro <<- EOF |
| 219 |
+ exists(texmakerx_my.pri):include(texmakerx_my.pri) |
| 220 |
+ EOF |
| 221 |
+ |
| 222 |
+ cp "${FILESDIR}"/texmakerx_my.pri . || die |
| 223 |
+ |
| 224 |
+ sed \ |
| 225 |
+ -e '/^#include/s:hunspell/::g' \ |
| 226 |
+ -e '/^#include/s:singleapp/::g' \ |
| 227 |
+ -i *.cpp *.h || die |
| 228 |
+ |
| 229 |
+ DOC_CONTENTS="A user manual with many screenshots is available at: |
| 230 |
+ ${EPREFIX}/usr/share/${PN}/usermanual_en.html" |
| 231 |
+} |
| 232 |
+ |
| 233 |
+src_configure() { |
| 234 |
+ local myeqmakeargs=( |
| 235 |
+ ${PN}.pro |
| 236 |
+ PREFIX="${EPREFIX}/usr" |
| 237 |
+ DESKTOPDIR="${EPREFIX}/usr/share/applications" |
| 238 |
+ ICONDIR="${EPREFIX}/usr/share/pixmaps" |
| 239 |
+ ) |
| 240 |
+ if use qt4; then |
| 241 |
+ eqmake4 ${myeqmakeargs[@]} |
| 242 |
+ else |
| 243 |
+ eqmake5 ${myeqmakeargs[@]} |
| 244 |
+ fi |
| 245 |
+} |
| 246 |
+ |
| 247 |
+src_install() { |
| 248 |
+ emake INSTALL_ROOT="${D}" install |
| 249 |
+ einstalldocs |
| 250 |
+ readme.gentoo_create_doc |
| 251 |
+} |
Archives