Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
Date: Wed, 14 Feb 2018 21:00:15
Message-Id: 1518641959.be23a9b584a5ac3bd1b6ea046b0f7d90e930a534.ulm@gentoo
1 commit: be23a9b584a5ac3bd1b6ea046b0f7d90e930a534
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 14 20:59:19 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 20:59:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be23a9b5
7
8 dev-db/qt5-sqlcipher: Fix build with Qt 5.9.4.
9
10 Cached files for Qt versions 5.9.3 and 5.9.4 are identical, so simpy
11 copy them.
12
13 Bug: https://bugs.gentoo.org/647624
14 Package-Manager: Portage-2.3.24, Repoman-2.3.6
15
16 dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild | 4 +++-
17 1 file changed, 3 insertions(+), 1 deletion(-)
18
19 diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
20 index 75caf3f0bb1..74d3f8006b7 100644
21 --- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
22 +++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -24,6 +24,8 @@ DOCS=(README.md)
30 src_prepare() {
31 eapply "${FILESDIR}"/${PN}-install-path.patch
32 sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
33 + # workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
34 + cp -R qt-file-cache/5.9.{3,4} || die
35 cmake-utils_src_prepare
36 }