1 |
commit: bd2bf56ec969421c7e8b112c1c8342e1efc295a5 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 21 10:18:36 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 21 10:19:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2bf56e |
7 |
|
8 |
media-sound/clementine: qt5-lconvert.patch upstreamed |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
media-sound/clementine/clementine-9999.ebuild | 5 +--- |
13 |
.../clementine/files/clementine-qt5-lconvert.patch | 28 ---------------------- |
14 |
2 files changed, 1 insertion(+), 32 deletions(-) |
15 |
|
16 |
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild |
17 |
index 50ae57df046..b0f63f84244 100644 |
18 |
--- a/media-sound/clementine/clementine-9999.ebuild |
19 |
+++ b/media-sound/clementine/clementine-9999.ebuild |
20 |
@@ -106,10 +106,7 @@ MY_P="${P/_}" |
21 |
[[ ${PV} == *9999* ]] || \ |
22 |
S="${WORKDIR}/${MY_P^}" |
23 |
|
24 |
-PATCHES=( |
25 |
- "${FILESDIR}"/${PN}-fts3-tokenizer.patch |
26 |
- "${FILESDIR}"/${PN}-qt5-lconvert.patch |
27 |
-) |
28 |
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch ) |
29 |
|
30 |
src_prepare() { |
31 |
l10n_find_plocales_changes "src/translations" "" ".po" |
32 |
|
33 |
diff --git a/media-sound/clementine/files/clementine-qt5-lconvert.patch b/media-sound/clementine/files/clementine-qt5-lconvert.patch |
34 |
deleted file mode 100644 |
35 |
index 8565f30cee0..00000000000 |
36 |
--- a/media-sound/clementine/files/clementine-qt5-lconvert.patch |
37 |
+++ /dev/null |
38 |
@@ -1,28 +0,0 @@ |
39 |
-From 5f75801a08a606073c700bd829ea694950de0729 Mon Sep 17 00:00:00 2001 |
40 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
41 |
-Date: Sun, 19 Nov 2017 16:00:55 +0100 |
42 |
-Subject: [PATCH] Properly find Qt5LinguistTools |
43 |
- |
44 |
---- |
45 |
- CMakeLists.txt | 5 ++--- |
46 |
- 1 file changed, 2 insertions(+), 3 deletions(-) |
47 |
- |
48 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
49 |
-index 4022c383b..5bdb2a00e 100644 |
50 |
---- a/CMakeLists.txt |
51 |
-+++ b/CMakeLists.txt |
52 |
-@@ -45,9 +45,8 @@ if(NOT APPLE) |
53 |
- find_package(Qt5 COMPONENTS WebKitWidgets) |
54 |
- endif(NOT APPLE) |
55 |
- |
56 |
--# Find Qt's lconvert binary. Try qt's binary dir first, fall back to looking in PATH |
57 |
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) |
58 |
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5) |
59 |
-+find_package(Qt5LinguistTools CONFIG REQUIRED) |
60 |
-+set(QT_LCONVERT_EXECUTABLE Qt5::lconvert) |
61 |
- |
62 |
- if(APPLE) |
63 |
- if(NOT QT_MAC_USE_COCOA) |
64 |
--- |
65 |
-2.15.0 |
66 |
- |