commit:     675e8341e5eec26784e2f3e6e2c5e02d37f0e68c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 09:10:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <andreas.sturmlech...@gmail.com>
+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 <andreas.sturmlech...@gmail.com>
+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 <QDebug>
+ #include <QDir>
++#include <QItemSelectionModel>
+ 
+ #include "tags/tagdataroles.hpp"
+ #include "parserwidget.hpp"
+-- 
+2.17.0
+

Reply via email to