From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBC7A138332 for ; Tue, 10 Apr 2018 09:23:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 243BDE094F; Tue, 10 Apr 2018 09:23:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3120E094F for ; Tue, 10 Apr 2018 09:23:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BA9B335C77 for ; Tue, 10 Apr 2018 09:23:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EAB8283 for ; Tue, 10 Apr 2018 09:22:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1523352162.675e8341e5eec26784e2f3e6e2c5e02d37f0e68c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/coquillo/, media-sound/coquillo/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/coquillo/Manifest media-sound/coquillo/coquillo-2.0_pre20180303.ebuild media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch X-VCS-Directories: media-sound/coquillo/files/ media-sound/coquillo/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 675e8341e5eec26784e2f3e6e2c5e02d37f0e68c X-VCS-Branch: master Date: Tue, 10 Apr 2018 09:22:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 57315f1d-3d2f-48d0-b2fd-2c772435fa50 X-Archives-Hash: 2aa7755d3a1ad938be60c52dffecbb1e commit: 675e8341e5eec26784e2f3e6e2c5e02d37f0e68c Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 10 09:10:38 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 10 09:22:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675e8341 media-sound/coquillo: Add 2.0_pre20180303 Qt5-based snapshot Bug: https://bugs.gentoo.org/398487 Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-sound/coquillo/Manifest | 1 + .../coquillo/coquillo-2.0_pre20180303.ebuild | 45 ++++++++++++++++++++++ .../files/coquillo-2.0_pre20180303-linking.patch | 31 +++++++++++++++ .../files/coquillo-2.0_pre20180303-qt-5.11.patch | 24 ++++++++++++ 4 files changed, 101 insertions(+) diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest index 86df30240f4..dccc6835565 100644 --- a/media-sound/coquillo/Manifest +++ b/media-sound/coquillo/Manifest @@ -1 +1,2 @@ DIST coquillo-1.12-src.tar.gz 570833 BLAKE2B 9f580d3c71528e9343690aaeba94fe2cb1567582b6e26f973b607b80a4d5811a32dd5bb2f001fce5799ea4154eb05e8146af7a542a2440aeefb718a672714e19 SHA512 4d0b7dad811019aa488baa27f0d655dc2ee126fa81c5944aa7de9093306c170863bd323de6f0233efef38e96b21b10f4a04239c0e277d42993667213e2bd2817 +DIST coquillo-2.0_pre20180303.tar.gz 79757 BLAKE2B 3c1ed5898fae6df940d020a812a8cf63b1dd1301c93264e3318adcff60d975f337623672e862f7c064e7354d47d8f0b6e6760060ae259b2736a775db08152f4d SHA512 8d6a1fed843fa59bc80c3fbdf77301ed9092d641e40511b5f6d89bc75d623cbe8df701e372b77f5aa1d944dd202b2489352655eec36d0fe53a593e4a3ea25ab6 diff --git a/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild b/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild new file mode 100644 index 00000000000..4ffd1266f3e --- /dev/null +++ b/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT=dc8f1c6751242d6c0416472fd91d972d110be67a +inherit desktop qmake-utils + +DESCRIPTION="GUI audio tagger based on Qt and taglib" +HOMEPAGE="https://www.linux-apps.com/content/show.php/Coquillo?content=141896" +SRC_URI="https://github.com/sjuvonen/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + media-libs/musicbrainz:5= + media-libs/taglib +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-${COMMIT}" + +PATCHES=( + "${FILESDIR}/${P}-linking.patch" + "${FILESDIR}/${P}-qt-5.11.patch" +) + +src_configure() { + eqmake5 +} + +src_install() { + dobin ${PN} + make_desktop_entry ${PN} Coquillo + einstalldocs +} diff --git a/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch b/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch new file mode 100644 index 00000000000..e781535a430 --- /dev/null +++ b/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch @@ -0,0 +1,31 @@ +From 16bdcf9f0ab24b7d57b7e065534b87810beff63d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 10 Apr 2018 10:21:29 +0200 +Subject: [PATCH] Fix musicbrainz linking + +--- + coquillo.pro | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/coquillo.pro b/coquillo.pro +index 63b1cd1..5bbe6a2 100644 +--- a/coquillo.pro ++++ b/coquillo.pro +@@ -16,13 +16,7 @@ RCC_DIR = build + unix { + LIBS += -ltag + +- exists(/etc/arch-release) { +- LIBS += -lmusicbrainz5 +- } +- +- exists(/etc/debian_version) { +- LIBS += -lmusicbrainz5cc +- } ++ LIBS += -lmusicbrainz5 + } + + +-- +2.17.0 + diff --git a/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch b/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch new file mode 100644 index 00000000000..ba2c02a7821 --- /dev/null +++ b/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch @@ -0,0 +1,24 @@ +From 03a1b15c2c364368d801da4ebe89ae1083d68b4d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 10 Apr 2018 10:15:33 +0200 +Subject: [PATCH] Fix build with Qt 5.11 + +--- + src/processor/parserwidget.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/processor/parserwidget.cpp b/src/processor/parserwidget.cpp +index 10320e2..94d60c3 100644 +--- a/src/processor/parserwidget.cpp ++++ b/src/processor/parserwidget.cpp +@@ -1,6 +1,7 @@ + + #include + #include ++#include + + #include "tags/tagdataroles.hpp" + #include "parserwidget.hpp" +-- +2.17.0 +