1 |
commit: d86e2c0c6ee8b07019ccb674de6ef7b1e32d2b80 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 18 08:01:01 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 18 08:01:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d86e2c0c |
7 |
|
8 |
net-im/swift: drop old version |
9 |
|
10 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
...generated-files-handle-unicode-characters.patch | 38 ---- |
14 |
net-im/swift/swift-4.0.2-r2.ebuild | 212 --------------------- |
15 |
2 files changed, 250 deletions(-) |
16 |
|
17 |
diff --git a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch |
18 |
deleted file mode 100644 |
19 |
index 7fd2e386d9d..00000000000 |
20 |
--- a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch |
21 |
+++ /dev/null |
22 |
@@ -1,38 +0,0 @@ |
23 |
-From 39ff091cddf8fd5e01047d80c7ed60c150537705 Mon Sep 17 00:00:00 2001 |
24 |
-From: Thanos Doukoudakis <thanos.doukoudakis@×××××.com> |
25 |
-Date: Fri, 11 May 2018 11:26:39 +0100 |
26 |
-Subject: Make generated files handle Unicode characters |
27 |
- |
28 |
-This patch handles a case where some of the files used to generate COPYING, |
29 |
-were containing unicode strings, which could lead to a failure when building |
30 |
-sid package. The code now will check the type of the string before writing to |
31 |
-the file, and if needed it will transform it to the appropriate format. |
32 |
- |
33 |
-Test-Information: |
34 |
-Generated the sid package with package_all_platforms script with no problems. |
35 |
-Created a debian sid box and tested the installation of the generated |
36 |
-packages. Validated the output generated in Windows 10 and Ubuntu 16.04 builds |
37 |
-through the "About" dialog in Swift. |
38 |
- |
39 |
-Change-Id: I05e518b758f316d9fbf23c1079be5a462e75106c |
40 |
- |
41 |
-diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py |
42 |
-index 89f8963..9b424f2 100644 |
43 |
---- a/BuildTools/SCons/Tools/textfile.py |
44 |
-+++ b/BuildTools/SCons/Tools/textfile.py |
45 |
-@@ -113,7 +113,11 @@ def _action(target, source, env): |
46 |
- lsep = None |
47 |
- for s in source: |
48 |
- if lsep: fd.write(lsep) |
49 |
-- fd.write(_do_subst(s, subs)) |
50 |
-+ stringtowrite = _do_subst(s, subs) |
51 |
-+ if isinstance(stringtowrite, str): |
52 |
-+ fd.write(stringtowrite) |
53 |
-+ elif isinstance(stringtowrite, unicode): |
54 |
-+ fd.write(stringtowrite.encode('utf-8')) |
55 |
- lsep = linesep |
56 |
- fd.close() |
57 |
- |
58 |
--- |
59 |
-cgit v0.10.2-6-g49f6 |
60 |
- |
61 |
|
62 |
diff --git a/net-im/swift/swift-4.0.2-r2.ebuild b/net-im/swift/swift-4.0.2-r2.ebuild |
63 |
deleted file mode 100644 |
64 |
index 7075d51f6f8..00000000000 |
65 |
--- a/net-im/swift/swift-4.0.2-r2.ebuild |
66 |
+++ /dev/null |
67 |
@@ -1,212 +0,0 @@ |
68 |
-# Copyright 1999-2020 Gentoo Authors |
69 |
-# Distributed under the terms of the GNU General Public License v2 |
70 |
- |
71 |
-EAPI=6 |
72 |
- |
73 |
-inherit gnome2-utils scons-utils toolchain-funcs |
74 |
- |
75 |
-DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client" |
76 |
-HOMEPAGE="https://www.swift.im/" |
77 |
-SRC_URI="https://swift.im/downloads/releases/${P}/${P}.tar.gz" |
78 |
- |
79 |
-LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" |
80 |
-SLOT="4/0" |
81 |
-KEYWORDS="amd64" |
82 |
-IUSE="client expat gconf +icu +idn lua spell test zeroconf" |
83 |
-REQUIRED_USE=" |
84 |
- || ( icu idn ) |
85 |
- gconf? ( client ) |
86 |
- spell? ( client ) |
87 |
-" |
88 |
- |
89 |
-RDEPEND=" |
90 |
- dev-db/sqlite:3 |
91 |
- dev-libs/boost:= |
92 |
- dev-libs/openssl:0= |
93 |
- net-libs/libnatpmp |
94 |
- net-libs/miniupnpc:= |
95 |
- sys-libs/zlib:= |
96 |
- client? ( |
97 |
- dev-qt/qtcore:5 |
98 |
- dev-qt/qtdbus:5 |
99 |
- dev-qt/qtgui:5 |
100 |
- dev-qt/qtmultimedia:5 |
101 |
- dev-qt/qtnetwork:5 |
102 |
- dev-qt/qtsvg:5 |
103 |
- dev-qt/qtwidgets:5 |
104 |
- dev-qt/qtwebkit:5 |
105 |
- dev-qt/qtx11extras:5 |
106 |
- net-dns/avahi |
107 |
- ) |
108 |
- expat? ( dev-libs/expat ) |
109 |
- !expat? ( dev-libs/libxml2:2 ) |
110 |
- gconf? ( gnome-base/gconf:2 ) |
111 |
- icu? ( dev-libs/icu:= ) |
112 |
- idn? ( net-dns/libidn:= ) |
113 |
- lua? ( dev-lang/lua:= ) |
114 |
- spell? ( app-text/hunspell:= ) |
115 |
-" |
116 |
- |
117 |
-DEPEND=" |
118 |
- ${RDEPEND} |
119 |
- >=dev-util/scons-3.0.1-r3 |
120 |
- client? ( dev-qt/linguist-tools:5 ) |
121 |
- test? ( net-dns/avahi ) |
122 |
-" |
123 |
- |
124 |
-# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6". |
125 |
-RESTRICT="test" |
126 |
- |
127 |
-DOCS=( |
128 |
- "DEVELOPMENT.md" |
129 |
- "README.md" |
130 |
- "Swiften/ChangeLog.md" |
131 |
-) |
132 |
- |
133 |
-PATCHES=( |
134 |
- "${FILESDIR}"/${P}-boost-1.69-compatibility.patch |
135 |
- "${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch |
136 |
- "${FILESDIR}"/${P}-qt-5.11-compatibility.patch |
137 |
- "${FILESDIR}"/${P}-qt-5.15-compatibility.patch |
138 |
-) |
139 |
- |
140 |
-src_prepare() { |
141 |
- default |
142 |
- |
143 |
- # Don't include '/usr/lib*' in the link command line for `swiften-config` |
144 |
- sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die |
145 |
- |
146 |
- # Hack for finding Qt system libs |
147 |
- mkdir "${T}"/qt || die |
148 |
- ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die |
149 |
- ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die |
150 |
- ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die |
151 |
- |
152 |
- # Remove parts of Swift, which a user don't want to compile |
153 |
- if ! use client; then rm -fr Swift Slimber || die; fi |
154 |
- if ! use lua; then rm -fr Sluift || die; fi |
155 |
- if ! use zeroconf; then |
156 |
- rm -fr Limber || die |
157 |
- if use client; then rm -fr Slimber || die; fi |
158 |
- fi |
159 |
- |
160 |
- # Remove '3rdParty', as the system libs should be used |
161 |
- # `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests |
162 |
- local my3rdparty=( |
163 |
- Boost |
164 |
- Breakpad |
165 |
- DocBook |
166 |
- Expat |
167 |
- LCov |
168 |
- Ldns |
169 |
- LibIDN |
170 |
- LibMiniUPnPc |
171 |
- LibNATPMP |
172 |
- Lua |
173 |
- OpenSSL |
174 |
- SCons |
175 |
- SQLite |
176 |
- Unbound |
177 |
- ZLib |
178 |
- ) |
179 |
- |
180 |
- if use test; then |
181 |
- cd 3rdParty && rm -fr "${my3rdparty[@]}" || die |
182 |
- else |
183 |
- rm -fr 3rdParty || die |
184 |
- fi |
185 |
-} |
186 |
- |
187 |
-src_configure() { |
188 |
- MYSCONS=( |
189 |
- ar="$(tc-getAR)" |
190 |
- allow_warnings="yes" |
191 |
- assertions="no" |
192 |
- build_examples="yes" |
193 |
- boost_bundled_enable="false" |
194 |
- boost_force_bundled="false" |
195 |
- cc="$(tc-getCC)" |
196 |
- ccache="no" |
197 |
- ccflags="${CFLAGS}" |
198 |
- coverage="no" |
199 |
- cxx="$(tc-getCXX)" |
200 |
- cxxflags="${CXXFLAGS}" |
201 |
- debug="no" |
202 |
- distcc="no" |
203 |
- experimental="no" |
204 |
- experimental_ft="yes" |
205 |
- hunspell_enable="$(usex spell)" |
206 |
- icu="$(usex icu)" |
207 |
- install_git_hooks="no" |
208 |
- libidn_bundled_enable="false" |
209 |
- libminiupnpc_force_bundled="false" |
210 |
- libnatpmp_force_bundled="false" |
211 |
- link="$(tc-getCXX)" |
212 |
- linkflags="${LDFLAGS}" |
213 |
- max_jobs="no" |
214 |
- optimize="no" |
215 |
- qt="${T}/qt" |
216 |
- qt5="$(usex client)" |
217 |
- swiften_dll="true" |
218 |
- swift_mobile="no" |
219 |
- target="native" |
220 |
- test="none" |
221 |
- try_avahi="$(usex client)" |
222 |
- try_expat="$(usex expat)" |
223 |
- try_gconf="$(usex gconf)" |
224 |
- try_libidn="$(usex idn)" |
225 |
- try_libxml="$(usex !expat)" |
226 |
- tls_backend="openssl" |
227 |
- unbound="no" |
228 |
- V="1" |
229 |
- valgrind="no" |
230 |
- zlib_bundled_enable="false" |
231 |
- ) |
232 |
-} |
233 |
- |
234 |
-src_compile() { |
235 |
- local myesconsinstall=( |
236 |
- Swiften |
237 |
- $(usex client Swift '') |
238 |
- $(usex lua Sluift '') |
239 |
- $(usex zeroconf Limber '') |
240 |
- $(usex zeroconf "$(usex client Slimber '')" '') |
241 |
- ) |
242 |
- |
243 |
- escons "${MYSCONS[@]}" "${myesconsinstall[@]}" |
244 |
-} |
245 |
- |
246 |
-src_test() { |
247 |
- MYSCONS=( |
248 |
- V="1" |
249 |
- ) |
250 |
- |
251 |
- escons "${MYSCONS[@]}" test=unit QA |
252 |
-} |
253 |
- |
254 |
-src_install() { |
255 |
- local myesconsinstall=( |
256 |
- SWIFTEN_INSTALLDIR="${ED%/}/usr" |
257 |
- SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)" |
258 |
- $(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '') |
259 |
- $(usex lua "SLUIFT_DIR=${ED%/}/usr" '') |
260 |
- $(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '') |
261 |
- "${ED}" |
262 |
- ) |
263 |
- |
264 |
- escons "${MYSCONS[@]}" "${myesconsinstall[@]}" |
265 |
- |
266 |
- use zeroconf && dobin Limber/limber |
267 |
- use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli |
268 |
- use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt |
269 |
- |
270 |
- einstalldocs |
271 |
-} |
272 |
- |
273 |
-pkg_postinst() { |
274 |
- use client && gnome2_icon_cache_update |
275 |
-} |
276 |
- |
277 |
-pkg_postrm() { |
278 |
- use client && gnome2_icon_cache_update |
279 |
-} |