[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     bd2bf56ec969421c7e8b112c1c8342e1efc295a5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 10:18:36 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 10:19:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2bf56e

media-sound/clementine: qt5-lconvert.patch upstreamed

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/clementine/clementine-9999.ebuild      |  5 +---
 .../clementine/files/clementine-qt5-lconvert.patch | 28 ----------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 50ae57df046..b0f63f84244 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -106,10 +106,7 @@ MY_P="${P/_}"
 [[ ${PV} == *9999* ]] || \
 S="${WORKDIR}/${MY_P^}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fts3-tokenizer.patch
-	"${FILESDIR}"/${PN}-qt5-lconvert.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
 
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"

diff --git a/media-sound/clementine/files/clementine-qt5-lconvert.patch b/media-sound/clementine/files/clementine-qt5-lconvert.patch
deleted file mode 100644
index 8565f30cee0..00000000000
--- a/media-sound/clementine/files/clementine-qt5-lconvert.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5f75801a08a606073c700bd829ea694950de0729 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 19 Nov 2017 16:00:55 +0100
-Subject: [PATCH] Properly find Qt5LinguistTools
-
----
- CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4022c383b..5bdb2a00e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,9 +45,8 @@ if(NOT APPLE)
-   find_package(Qt5 COMPONENTS WebKitWidgets)
- endif(NOT APPLE)
- 
--# Find Qt's lconvert binary.  Try qt's binary dir first, fall back to looking in PATH
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH)
--find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5)
-+find_package(Qt5LinguistTools CONFIG REQUIRED)
-+set(QT_LCONVERT_EXECUTABLE Qt5::lconvert)
- 
- if(APPLE)
-   if(NOT QT_MAC_USE_COCOA)
--- 
-2.15.0
-