1 |
commit: cea612c3ab27af4fa0c42df97e9b3c5aae345e15 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 22 17:55:20 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 22 18:02:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea612c3 |
7 |
|
8 |
media-sound/clementine: Drop old snapshot |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
media-sound/clementine/Manifest | 1 - |
13 |
.../clementine/clementine-1.3.1_p20180314.ebuild | 192 --------------------- |
14 |
.../files/clementine-1.3.1_p20180314-qt-5.11.patch | 51 ------ |
15 |
3 files changed, 244 deletions(-) |
16 |
|
17 |
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest |
18 |
index c0358b6dd38..71bcdbbfc07 100644 |
19 |
--- a/media-sound/clementine/Manifest |
20 |
+++ b/media-sound/clementine/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674 |
23 |
-DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c SHA512 5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a |
24 |
DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0 SHA512 bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9baaaa23e95bb7e6d31a0090ca8e32bd547114e1ec |
25 |
|
26 |
diff --git a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild b/media-sound/clementine/clementine-1.3.1_p20180314.ebuild |
27 |
deleted file mode 100644 |
28 |
index 296ae7151df..00000000000 |
29 |
--- a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,192 +0,0 @@ |
32 |
-# Copyright 1999-2018 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
- |
37 |
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" |
38 |
- |
39 |
-MY_P="${P/_}" |
40 |
-if [[ ${PV} == *9999* ]]; then |
41 |
- EGIT_BRANCH="qt5" |
42 |
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
43 |
- GIT_ECLASS="git-r3" |
44 |
-else |
45 |
- COMMIT=2d7894915dfc9043da9282d216775ef75041c773 |
46 |
- SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
47 |
- KEYWORDS="~amd64 ~x86" |
48 |
-fi |
49 |
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot |
50 |
-unset GIT_ECLASS |
51 |
- |
52 |
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" |
53 |
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" |
54 |
- |
55 |
-LICENSE="GPL-3" |
56 |
-SLOT="0" |
57 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" |
58 |
- |
59 |
-REQUIRED_USE=" |
60 |
- udisks? ( dbus ) |
61 |
- wiimote? ( dbus ) |
62 |
-" |
63 |
- |
64 |
-COMMON_DEPEND=" |
65 |
- app-crypt/qca:2[qt5(+)] |
66 |
- dev-db/sqlite:= |
67 |
- dev-libs/crypto++ |
68 |
- dev-libs/glib:2 |
69 |
- dev-libs/libxml2 |
70 |
- dev-libs/protobuf:= |
71 |
- dev-qt/qtconcurrent:5 |
72 |
- dev-qt/qtcore:5 |
73 |
- dev-qt/qtgui:5 |
74 |
- dev-qt/qtnetwork:5[ssl] |
75 |
- dev-qt/qtsql:5[sqlite] |
76 |
- dev-qt/qtwidgets:5 |
77 |
- dev-qt/qtx11extras:5 |
78 |
- dev-qt/qtxml:5 |
79 |
- media-libs/chromaprint:= |
80 |
- media-libs/gstreamer:1.0 |
81 |
- media-libs/gst-plugins-base:1.0 |
82 |
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)] |
83 |
- media-libs/taglib |
84 |
- sys-libs/zlib |
85 |
- virtual/glu |
86 |
- virtual/opengl |
87 |
- x11-libs/libX11 |
88 |
- cdda? ( dev-libs/libcdio:= ) |
89 |
- dbus? ( dev-qt/qtdbus:5 ) |
90 |
- ipod? ( >=media-libs/libgpod-0.8.0 ) |
91 |
- lastfm? ( >=media-libs/liblastfm-1[qt5(+)] ) |
92 |
- moodbar? ( sci-libs/fftw:3.0 ) |
93 |
- mtp? ( >=media-libs/libmtp-1.0.0 ) |
94 |
- projectm? ( |
95 |
- media-libs/glew:= |
96 |
- >=media-libs/libprojectm-1.2.0 |
97 |
- ) |
98 |
-" |
99 |
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
100 |
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches: |
101 |
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches |
102 |
-# Still possibly essential but not applied yet patches are: |
103 |
-# 06-fix-numeric-locale.patch |
104 |
-# 08-stdlib.h-for-rand.patch |
105 |
-RDEPEND="${COMMON_DEPEND} |
106 |
- media-plugins/gst-plugins-meta:1.0 |
107 |
- media-plugins/gst-plugins-soup:1.0 |
108 |
- media-plugins/gst-plugins-taglib:1.0 |
109 |
- mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
110 |
- mtp? ( gnome-base/gvfs[mtp] ) |
111 |
- udisks? ( sys-fs/udisks:2 ) |
112 |
-" |
113 |
-DEPEND="${COMMON_DEPEND} |
114 |
- >=dev-cpp/gtest-1.8.0 |
115 |
- dev-libs/boost |
116 |
- dev-qt/linguist-tools:5 |
117 |
- dev-qt/qtopengl:5 |
118 |
- sys-devel/gettext |
119 |
- virtual/pkgconfig |
120 |
- box? ( dev-cpp/sparsehash ) |
121 |
- dropbox? ( dev-cpp/sparsehash ) |
122 |
- googledrive? ( dev-cpp/sparsehash ) |
123 |
- pulseaudio? ( media-sound/pulseaudio ) |
124 |
- seafile? ( dev-cpp/sparsehash ) |
125 |
- skydrive? ( dev-cpp/sparsehash ) |
126 |
- test? ( |
127 |
- dev-qt/qttest:5 |
128 |
- gnome-base/gsettings-desktop-schemas |
129 |
- ) |
130 |
-" |
131 |
- |
132 |
-DOCS=( Changelog README.md ) |
133 |
- |
134 |
-PATCHES=( |
135 |
- "${FILESDIR}"/${PN}-fts3-tokenizer.patch |
136 |
- "${FILESDIR}"/${P}-qt-5.11.patch |
137 |
-) |
138 |
- |
139 |
-src_prepare() { |
140 |
- l10n_find_plocales_changes "src/translations" "" ".po" |
141 |
- |
142 |
- cmake-utils_src_prepare |
143 |
- # some tests fail or hang |
144 |
- sed -i \ |
145 |
- -e '/add_test_file(translations_test.cpp/d' \ |
146 |
- tests/CMakeLists.txt || die |
147 |
- |
148 |
- if ! use test; then |
149 |
- sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die |
150 |
- cmake_comment_add_subdirectory tests |
151 |
- fi |
152 |
- |
153 |
- # Fix clementine relying on downstream renaming of lastfm header dir |
154 |
- sed -i -e "/^#include/s/lastfm5/lastfm/" \ |
155 |
- tests/albumcoverfetcher_test.cpp \ |
156 |
- src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \ |
157 |
- src/core/song.cpp || die "Failed to sed lastfm header suffix" |
158 |
- sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \ |
159 |
- -i CMakeLists.txt || die "Failed to sed lastfm header suffix" |
160 |
-} |
161 |
- |
162 |
-src_configure() { |
163 |
- # spotify is not in portage |
164 |
- local mycmakeargs=( |
165 |
- -DBUILD_WERROR=OFF |
166 |
- # force to find crypto++ see bug #548544 |
167 |
- -DCRYPTOPP_LIBRARIES="crypto++" |
168 |
- -DCRYPTOPP_FOUND=ON |
169 |
- # avoid automagically enabling of ccache (bug #611010) |
170 |
- -DCCACHE_EXECUTABLE=OFF |
171 |
- -DENABLE_BREAKPAD=OFF #< disable crash reporting |
172 |
- -DENABLE_DEVICEKIT=OFF |
173 |
- -DENABLE_GIO=ON |
174 |
- -DENABLE_SPOTIFY_BLOB=OFF |
175 |
- -DUSE_BUILTIN_TAGLIB=OFF |
176 |
- -DUSE_SYSTEM_GMOCK=ON |
177 |
- -DUSE_SYSTEM_PROJECTM=ON |
178 |
- -DBUNDLE_PROJECTM_PRESETS=OFF |
179 |
- -DLINGUAS="$(l10n_get_locales)" |
180 |
- -DENABLE_BOX="$(usex box)" |
181 |
- -DENABLE_AUDIOCD="$(usex cdda)" |
182 |
- -DENABLE_DBUS="$(usex dbus)" |
183 |
- -DENABLE_DROPBOX="$(usex dropbox)" |
184 |
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
185 |
- -DENABLE_LIBGPOD="$(usex ipod)" |
186 |
- -DENABLE_LIBLASTFM="$(usex lastfm)" |
187 |
- -DENABLE_MOODBAR="$(usex moodbar)" |
188 |
- -DENABLE_LIBMTP="$(usex mtp)" |
189 |
- -DENABLE_VISUALISATIONS="$(usex projectm)" |
190 |
- -DENABLE_SEAFILE="$(usex seafile)" |
191 |
- -DENABLE_SKYDRIVE="$(usex skydrive)" |
192 |
- -DENABLE_LIBPULSE="$(usex pulseaudio)" |
193 |
- -DENABLE_UDISKS2="$(usex udisks)" |
194 |
- -DENABLE_WIIMOTEDEV="$(usex wiimote)" |
195 |
- ) |
196 |
- |
197 |
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
198 |
- |
199 |
- cmake-utils_src_configure |
200 |
-} |
201 |
- |
202 |
-src_test() { |
203 |
- cd "${CMAKE_BUILD_DIR}" || die |
204 |
- virtx emake test |
205 |
-} |
206 |
- |
207 |
-pkg_preinst() { |
208 |
- gnome2_icon_savelist |
209 |
-} |
210 |
- |
211 |
-pkg_postinst() { |
212 |
- xdg_desktop_database_update |
213 |
- gnome2_icon_cache_update |
214 |
- |
215 |
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " |
216 |
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " |
217 |
- elog "depending on your preferences" |
218 |
-} |
219 |
- |
220 |
-pkg_postrm() { |
221 |
- xdg_desktop_database_update |
222 |
- gnome2_icon_cache_update |
223 |
-} |
224 |
|
225 |
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch b/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch |
226 |
deleted file mode 100644 |
227 |
index 8903da17498..00000000000 |
228 |
--- a/media-sound/clementine/files/clementine-1.3.1_p20180314-qt-5.11.patch |
229 |
+++ /dev/null |
230 |
@@ -1,51 +0,0 @@ |
231 |
-From b0b72ccfee2484ec05861879cca45d62d87055ae Mon Sep 17 00:00:00 2001 |
232 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
233 |
-Date: Sat, 17 Mar 2018 00:29:11 +0100 |
234 |
-Subject: [PATCH] Fix build with Qt 5.11 |
235 |
- |
236 |
---- |
237 |
- src/playlist/playlistcontainer.cpp | 1 + |
238 |
- src/ui/globalshortcutssettingspage.cpp | 1 + |
239 |
- src/widgets/errordialog.cpp | 2 ++ |
240 |
- 3 files changed, 4 insertions(+) |
241 |
- |
242 |
-diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp |
243 |
-index 58f1ad2d6..2ba1a3ff1 100644 |
244 |
---- a/src/playlist/playlistcontainer.cpp |
245 |
-+++ b/src/playlist/playlistcontainer.cpp |
246 |
-@@ -23,6 +23,7 @@ |
247 |
- #include "playlistparsers/playlistparser.h" |
248 |
- #include "ui/iconloader.h" |
249 |
- |
250 |
-+#include <QAction> |
251 |
- #include <QFileDialog> |
252 |
- #include <QInputDialog> |
253 |
- #include <QKeyEvent> |
254 |
-diff --git a/src/ui/globalshortcutssettingspage.cpp b/src/ui/globalshortcutssettingspage.cpp |
255 |
-index ec5d29b28..c60a9561d 100644 |
256 |
---- a/src/ui/globalshortcutssettingspage.cpp |
257 |
-+++ b/src/ui/globalshortcutssettingspage.cpp |
258 |
-@@ -24,6 +24,7 @@ |
259 |
- #include "ui/iconloader.h" |
260 |
- #include "ui/settingsdialog.h" |
261 |
- |
262 |
-+#include <QAction> |
263 |
- #include <QKeyEvent> |
264 |
- #include <QMessageBox> |
265 |
- #include <QProcess> |
266 |
-diff --git a/src/widgets/errordialog.cpp b/src/widgets/errordialog.cpp |
267 |
-index 1086305f3..3fd590840 100644 |
268 |
---- a/src/widgets/errordialog.cpp |
269 |
-+++ b/src/widgets/errordialog.cpp |
270 |
-@@ -18,6 +18,8 @@ |
271 |
- #include "errordialog.h" |
272 |
- #include "ui_errordialog.h" |
273 |
- |
274 |
-+#include <QStyle> |
275 |
-+ |
276 |
- ErrorDialog::ErrorDialog(QWidget* parent) |
277 |
- : QDialog(parent), ui_(new Ui_ErrorDialog) { |
278 |
- ui_->setupUi(this); |
279 |
--- |
280 |
-2.16.2 |
281 |
- |