Gentoo Archives: gentoo-commits

From: Kristian Fiskerstrand <k_f@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
Date: Thu, 20 Jul 2017 10:57:13
Message-Id: 1500548168.e4d38e2fca1719e3e3e32009ceb6d6d3ea819e64.k_f@gentoo
1 commit: e4d38e2fca1719e3e3e32009ceb6d6d3ea819e64
2 Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 20 10:54:30 2017 +0000
4 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 20 10:56:08 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d38e2f
7
8 app-office/texmaker: New upstream version 5.0
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-office/texmaker/Manifest | 1 +
13 .../texmaker-5.0-unbundle-hunspell-singleapp.patch | 67 +++++++++++++++++
14 app-office/texmaker/texmaker-5.0.ebuild | 84 ++++++++++++++++++++++
15 3 files changed, 152 insertions(+)
16
17 diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
18 index eeb351dc15c..a7e7bb3036a 100644
19 --- a/app-office/texmaker/Manifest
20 +++ b/app-office/texmaker/Manifest
21 @@ -1 +1,2 @@
22 DIST texmaker-4.5.tar.bz2 11287724 SHA256 2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 WHIRLPOOL 0fb00957cb6fe2f3181ac6a6ad917fd60d90ca05bcbaa14da62045ac6c5d78126d9abeb1429bd1fe48a25416d95a1a52c53f83cad91cb0540fcd043a9ea63045
23 +DIST texmaker-5.0.tar.bz2 15728938 SHA256 2a0b329c0ff5c408f72bcefbef16361d26da74e3ca1f39d6b8c78d84c37245a9 SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636 WHIRLPOOL 5989c926d6f4b770cfc0d0cf346d47c7244540b2873d2c7f54d52590debca85271acba10307f24f77e1446db01e7404d4b0b6fc4125360843a4bd32957467c15
24
25 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
26 new file mode 100644
27 index 00000000000..d7073b8547d
28 --- /dev/null
29 +++ b/app-office/texmaker/files/texmaker-5.0-unbundle-hunspell-singleapp.patch
30 @@ -0,0 +1,67 @@
31 +diff --git a/texmaker.pro b/texmaker.pro
32 +index 0a9205d..62bc46d 100644
33 +--- a/texmaker.pro
34 ++++ b/texmaker.pro
35 +@@ -117,29 +117,6 @@ HEADERS += texmaker.h \
36 + unicodeview.h \
37 + svnhelper.h \
38 + quickbeamerdialog.h \
39 +- hunspell/affentry.hxx \
40 +- hunspell/affixmgr.hxx \
41 +- hunspell/atypes.hxx \
42 +- hunspell/baseaffix.hxx \
43 +- hunspell/csutil.hxx \
44 +- hunspell/dictmgr.hxx \
45 +- hunspell/hashmgr.hxx \
46 +- hunspell/htypes.hxx \
47 +- hunspell/hunspell.hxx \
48 +- hunspell/hunspell.h \
49 +- hunspell/langnum.hxx \
50 +- hunspell/license.hunspell \
51 +- hunspell/phonet.hxx \
52 +- hunspell/suggestmgr.hxx \
53 +- hunspell/license.myspell \
54 +- hunspell/filemgr.hxx \
55 +- hunspell/hunzip.hxx \
56 +- hunspell/replist.hxx \
57 +- hunspell/w_char.hxx \
58 +- singleapp/qtlocalpeer.h \
59 +- singleapp/qtlockedfile.h \
60 +- singleapp/qtsingleapplication.h \
61 +- singleapp/qtsinglecoreapplication.h \
62 + encodingprober/CharDistribution.h \
63 + encodingprober/ChineseGroupProber.h \
64 + encodingprober/ctype_test_p.h \
65 +@@ -502,22 +479,6 @@ SOURCES += main.cpp \
66 + unicodeview.cpp \
67 + quickbeamerdialog.cpp \
68 + svnhelper.cpp \
69 +- hunspell/affentry.cxx \
70 +- hunspell/affixmgr.cxx \
71 +- hunspell/csutil.cxx \
72 +- hunspell/dictmgr.cxx \
73 +- hunspell/hashmgr.cxx \
74 +- hunspell/hunspell.cxx \
75 +- hunspell/phonet.cxx \
76 +- hunspell/suggestmgr.cxx \
77 +- hunspell/utf_info.cxx \
78 +- hunspell/filemgr.cxx \
79 +- hunspell/replist.cxx \
80 +- hunspell/hunzip.cxx \
81 +- singleapp/qtlocalpeer.cpp \
82 +- singleapp/qtlockedfile.cpp \
83 +- singleapp/qtsingleapplication.cpp \
84 +- singleapp/qtsinglecoreapplication.cpp \
85 + encodingprober/CharDistribution.cpp \
86 + encodingprober/ChineseGroupProber.cpp \
87 + encodingprober/JapaneseGroupProber.cpp \
88 +@@ -1088,8 +1049,7 @@ metainfo.path = texmaker_linux64
89 +
90 + INSTALLS = target
91 + HEADERS += x11fontdialog.h
92 +-SOURCES += x11fontdialog.cpp \
93 +- singleapp/qtlockedfile_unix.cpp
94 ++SOURCES += x11fontdialog.cpp
95 + FORMS += x11fontdialog.ui
96 +
97 + utilities.files = doc/doc10.png \
98
99 diff --git a/app-office/texmaker/texmaker-5.0.ebuild b/app-office/texmaker/texmaker-5.0.ebuild
100 new file mode 100644
101 index 00000000000..6e6dacfa835
102 --- /dev/null
103 +++ b/app-office/texmaker/texmaker-5.0.ebuild
104 @@ -0,0 +1,84 @@
105 +# Copyright 1999-2017 Gentoo Foundation
106 +# Distributed under the terms of the GNU General Public License v2
107 +
108 +EAPI=6
109 +
110 +inherit eutils qmake-utils readme.gentoo-r1
111 +
112 +DESCRIPTION="A nice LaTeX-IDE"
113 +HOMEPAGE="http://www.xm1math.net/texmaker/"
114 +SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
115 +
116 +LICENSE="GPL-2"
117 +SLOT="0"
118 +KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
119 +IUSE=""
120 +
121 +COMMON_DEPEND="
122 + app-text/hunspell
123 + sys-libs/zlib
124 + x11-libs/libX11
125 + x11-libs/libXext
126 + app-text/poppler:=[qt5]
127 + dev-qt/qtconcurrent:5
128 + dev-qt/qtcore:5
129 + dev-qt/qtgui:5
130 + dev-qt/qtlockedfile
131 + dev-qt/qtnetwork:5
132 + dev-qt/qtscript:5
133 + dev-qt/qtsingleapplication[X,qt5]
134 + dev-qt/qtwebkit:5[printsupport]
135 + dev-qt/qtwidgets:5
136 + dev-qt/qtxml:5
137 +"
138 +RDEPEND="${COMMON_DEPEND}
139 + app-text/ghostscript-gpl
140 + app-text/psutils
141 + media-libs/netpbm
142 + virtual/latex-base"
143 +
144 +DEPEND="${COMMON_DEPEND}
145 + virtual/pkgconfig"
146 +
147 +PATCHES=(
148 + "${FILESDIR}/${P}-unbundle-hunspell-singleapp.patch"
149 +)
150 +
151 +DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
152 +HTML_DOCS=( doc/. )
153 +
154 +src_prepare() {
155 + default
156 +
157 + find singleapp hunspell -delete || die
158 +
159 + cat >> ${PN}.pro <<- EOF
160 + exists(texmakerx_my.pri):include(texmakerx_my.pri)
161 + EOF
162 +
163 + cp "${FILESDIR}"/texmakerx_my.pri . || die
164 +
165 + sed \
166 + -e '/^#include/s:hunspell/::g' \
167 + -e '/^#include/s:singleapp/::g' \
168 + -i *.cpp *.h || die
169 +
170 + DOC_CONTENTS="A user manual with many screenshots is available at:
171 + ${EPREFIX}/usr/share/${PN}/usermanual_en.html"
172 +}
173 +
174 +src_configure() {
175 + local myeqmakeargs=(
176 + ${PN}.pro
177 + PREFIX="${EPREFIX}/usr"
178 + DESKTOPDIR="${EPREFIX}/usr/share/applications"
179 + ICONDIR="${EPREFIX}/usr/share/pixmaps"
180 + )
181 + eqmake5 ${myeqmakeargs[@]}
182 +}
183 +
184 +src_install() {
185 + emake INSTALL_ROOT="${D}" install
186 + einstalldocs
187 + readme.gentoo_create_doc
188 +}