1 |
commit: 80b389e422c3815ed885df9e36d1bccfe929ec5d |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 17 16:05:08 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 17 16:05:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b389e4 |
7 |
|
8 |
media-sound/clementine: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
media-sound/clementine/Manifest | 2 - |
14 |
.../clementine/clementine-1.3.1_p20180416.ebuild | 181 -------------------- |
15 |
.../clementine/clementine-1.3.1_p20181201.ebuild | 182 --------------------- |
16 |
.../files/clementine-1.3.1_p20181201-cmake.patch | 165 ------------------- |
17 |
.../files/clementine-fts3-tokenizer.patch | 36 ---- |
18 |
5 files changed, 566 deletions(-) |
19 |
|
20 |
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest |
21 |
index 6e52851f4d7..2ef425142c8 100644 |
22 |
--- a/media-sound/clementine/Manifest |
23 |
+++ b/media-sound/clementine/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62 |
26 |
-DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c |
27 |
DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15 |
28 |
|
29 |
diff --git a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild |
30 |
deleted file mode 100644 |
31 |
index 2af2d69f7b7..00000000000 |
32 |
--- a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,181 +0,0 @@ |
35 |
-# Copyright 1999-2018 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-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" |
41 |
- |
42 |
-MY_P="${P/_}" |
43 |
-if [[ ${PV} == *9999* ]]; then |
44 |
- EGIT_BRANCH="qt5" |
45 |
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
46 |
- GIT_ECLASS="git-r3" |
47 |
-else |
48 |
- COMMIT=bd096dcbc3cfa8965ee96245b95c4027278b42a6 |
49 |
- SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
50 |
- KEYWORDS="amd64 x86" |
51 |
-fi |
52 |
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} |
53 |
-unset GIT_ECLASS |
54 |
- |
55 |
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" |
56 |
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" |
57 |
- |
58 |
-LICENSE="GPL-3" |
59 |
-SLOT="0" |
60 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" |
61 |
- |
62 |
-REQUIRED_USE=" |
63 |
- udisks? ( dbus ) |
64 |
- wiimote? ( dbus ) |
65 |
-" |
66 |
- |
67 |
-COMMON_DEPEND=" |
68 |
- app-crypt/qca:2[qt5(+)] |
69 |
- dev-db/sqlite:= |
70 |
- dev-libs/crypto++[asm] |
71 |
- dev-libs/glib:2 |
72 |
- dev-libs/libxml2 |
73 |
- dev-libs/protobuf:= |
74 |
- dev-qt/qtconcurrent:5 |
75 |
- dev-qt/qtcore:5 |
76 |
- dev-qt/qtgui:5 |
77 |
- dev-qt/qtnetwork:5[ssl] |
78 |
- dev-qt/qtsql:5[sqlite] |
79 |
- dev-qt/qtwidgets:5 |
80 |
- media-libs/chromaprint:= |
81 |
- media-libs/gstreamer:1.0 |
82 |
- media-libs/gst-plugins-base:1.0 |
83 |
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)] |
84 |
- media-libs/taglib |
85 |
- sys-libs/zlib |
86 |
- virtual/glu |
87 |
- virtual/opengl |
88 |
- x11-libs/libX11 |
89 |
- cdda? ( dev-libs/libcdio:= ) |
90 |
- dbus? ( dev-qt/qtdbus:5 ) |
91 |
- ipod? ( >=media-libs/libgpod-0.8.0 ) |
92 |
- lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) |
93 |
- moodbar? ( sci-libs/fftw:3.0 ) |
94 |
- mtp? ( >=media-libs/libmtp-1.0.0 ) |
95 |
- projectm? ( |
96 |
- media-libs/glew:= |
97 |
- >=media-libs/libprojectm-1.2.0 |
98 |
- ) |
99 |
-" |
100 |
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
101 |
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches: |
102 |
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches |
103 |
-# Still possibly essential but not applied yet patches are: |
104 |
-# 06-fix-numeric-locale.patch |
105 |
-# 08-stdlib.h-for-rand.patch |
106 |
-RDEPEND="${COMMON_DEPEND} |
107 |
- media-plugins/gst-plugins-meta:1.0 |
108 |
- media-plugins/gst-plugins-soup:1.0 |
109 |
- media-plugins/gst-plugins-taglib:1.0 |
110 |
- mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
111 |
- mtp? ( gnome-base/gvfs[mtp] ) |
112 |
- udisks? ( sys-fs/udisks:2 ) |
113 |
-" |
114 |
-DEPEND="${COMMON_DEPEND} |
115 |
- >=dev-cpp/gtest-1.8.0 |
116 |
- dev-libs/boost |
117 |
- dev-qt/linguist-tools:5 |
118 |
- dev-qt/qtopengl:5 |
119 |
- dev-qt/qtx11extras:5 |
120 |
- dev-qt/qtxml:5 |
121 |
- sys-devel/gettext |
122 |
- virtual/pkgconfig |
123 |
- box? ( dev-cpp/sparsehash ) |
124 |
- dropbox? ( dev-cpp/sparsehash ) |
125 |
- googledrive? ( dev-cpp/sparsehash ) |
126 |
- pulseaudio? ( media-sound/pulseaudio ) |
127 |
- seafile? ( dev-cpp/sparsehash ) |
128 |
- skydrive? ( dev-cpp/sparsehash ) |
129 |
- test? ( |
130 |
- dev-qt/qttest:5 |
131 |
- gnome-base/gsettings-desktop-schemas |
132 |
- ) |
133 |
-" |
134 |
- |
135 |
-RESTRICT="test" |
136 |
- |
137 |
-S="${WORKDIR}/${PN^}-${COMMIT}" |
138 |
- |
139 |
-DOCS=( Changelog README.md ) |
140 |
- |
141 |
-PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch ) |
142 |
- |
143 |
-src_prepare() { |
144 |
- l10n_find_plocales_changes "src/translations" "" ".po" |
145 |
- |
146 |
- cmake-utils_src_prepare |
147 |
- # some tests fail or hang |
148 |
- sed -i \ |
149 |
- -e '/add_test_file(translations_test.cpp/d' \ |
150 |
- tests/CMakeLists.txt || die |
151 |
- |
152 |
- if ! use test; then |
153 |
- sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die |
154 |
- cmake_comment_add_subdirectory tests |
155 |
- fi |
156 |
-} |
157 |
- |
158 |
-src_configure() { |
159 |
- # spotify is not in portage |
160 |
- local mycmakeargs=( |
161 |
- -DBUILD_WERROR=OFF |
162 |
- # force to find crypto++ see bug #548544 |
163 |
- -DCRYPTOPP_LIBRARIES="cryptopp" |
164 |
- -DCRYPTOPP_FOUND=ON |
165 |
- # avoid automagically enabling of ccache (bug #611010) |
166 |
- -DCCACHE_EXECUTABLE=OFF |
167 |
- -DENABLE_BREAKPAD=OFF #< disable crash reporting |
168 |
- -DENABLE_DEVICEKIT=OFF |
169 |
- -DENABLE_GIO=ON |
170 |
- -DENABLE_SPOTIFY_BLOB=OFF |
171 |
- -DUSE_BUILTIN_TAGLIB=OFF |
172 |
- -DUSE_SYSTEM_GMOCK=ON |
173 |
- -DUSE_SYSTEM_PROJECTM=ON |
174 |
- -DBUNDLE_PROJECTM_PRESETS=OFF |
175 |
- -DLINGUAS="$(l10n_get_locales)" |
176 |
- -DENABLE_BOX="$(usex box)" |
177 |
- -DENABLE_AUDIOCD="$(usex cdda)" |
178 |
- -DENABLE_DBUS="$(usex dbus)" |
179 |
- -DENABLE_DROPBOX="$(usex dropbox)" |
180 |
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
181 |
- -DENABLE_LIBGPOD="$(usex ipod)" |
182 |
- -DENABLE_LIBLASTFM="$(usex lastfm)" |
183 |
- -DENABLE_MOODBAR="$(usex moodbar)" |
184 |
- -DENABLE_LIBMTP="$(usex mtp)" |
185 |
- -DENABLE_VISUALISATIONS="$(usex projectm)" |
186 |
- -DENABLE_SEAFILE="$(usex seafile)" |
187 |
- -DENABLE_SKYDRIVE="$(usex skydrive)" |
188 |
- -DENABLE_LIBPULSE="$(usex pulseaudio)" |
189 |
- -DENABLE_UDISKS2="$(usex udisks)" |
190 |
- -DENABLE_WIIMOTEDEV="$(usex wiimote)" |
191 |
- ) |
192 |
- |
193 |
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
194 |
- |
195 |
- cmake-utils_src_configure |
196 |
-} |
197 |
- |
198 |
-src_test() { |
199 |
- cd "${CMAKE_BUILD_DIR}" || die |
200 |
- virtx emake test |
201 |
-} |
202 |
- |
203 |
-pkg_postinst() { |
204 |
- xdg_desktop_database_update |
205 |
- gnome2_icon_cache_update |
206 |
- |
207 |
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " |
208 |
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " |
209 |
- elog "depending on your preferences" |
210 |
-} |
211 |
- |
212 |
-pkg_postrm() { |
213 |
- xdg_desktop_database_update |
214 |
- gnome2_icon_cache_update |
215 |
-} |
216 |
|
217 |
diff --git a/media-sound/clementine/clementine-1.3.1_p20181201.ebuild b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild |
218 |
deleted file mode 100644 |
219 |
index 3d3061880f8..00000000000 |
220 |
--- a/media-sound/clementine/clementine-1.3.1_p20181201.ebuild |
221 |
+++ /dev/null |
222 |
@@ -1,182 +0,0 @@ |
223 |
-# Copyright 1999-2018 Gentoo Authors |
224 |
-# Distributed under the terms of the GNU General Public License v2 |
225 |
- |
226 |
-EAPI=6 |
227 |
- |
228 |
-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" |
229 |
- |
230 |
-MY_P="${P/_}" |
231 |
-if [[ ${PV} == *9999* ]]; then |
232 |
- EGIT_BRANCH="qt5" |
233 |
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" |
234 |
- GIT_ECLASS="git-r3" |
235 |
-else |
236 |
- COMMIT=d87307fbc718a57ca38b5354f196db05b560036c |
237 |
- SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
238 |
- KEYWORDS="~amd64 ~x86" |
239 |
-fi |
240 |
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} |
241 |
-unset GIT_ECLASS |
242 |
- |
243 |
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" |
244 |
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" |
245 |
- |
246 |
-LICENSE="GPL-3" |
247 |
-SLOT="0" |
248 |
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" |
249 |
- |
250 |
-REQUIRED_USE=" |
251 |
- udisks? ( dbus ) |
252 |
- wiimote? ( dbus ) |
253 |
-" |
254 |
- |
255 |
-COMMON_DEPEND=" |
256 |
- app-crypt/qca:2[qt5(+)] |
257 |
- dev-db/sqlite:= |
258 |
- dev-libs/crypto++[asm] |
259 |
- dev-libs/glib:2 |
260 |
- dev-libs/libxml2 |
261 |
- dev-libs/protobuf:= |
262 |
- dev-qt/qtconcurrent:5 |
263 |
- dev-qt/qtcore:5 |
264 |
- dev-qt/qtgui:5 |
265 |
- dev-qt/qtnetwork:5[ssl] |
266 |
- dev-qt/qtsql:5[sqlite] |
267 |
- dev-qt/qtwidgets:5 |
268 |
- media-libs/chromaprint:= |
269 |
- media-libs/gstreamer:1.0 |
270 |
- media-libs/gst-plugins-base:1.0 |
271 |
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)] |
272 |
- >=media-libs/taglib-1.11.1_p20181028 |
273 |
- sys-libs/zlib |
274 |
- virtual/glu |
275 |
- x11-libs/libX11 |
276 |
- cdda? ( dev-libs/libcdio:= ) |
277 |
- dbus? ( dev-qt/qtdbus:5 ) |
278 |
- ipod? ( >=media-libs/libgpod-0.8.0 ) |
279 |
- lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) |
280 |
- moodbar? ( sci-libs/fftw:3.0 ) |
281 |
- mtp? ( >=media-libs/libmtp-1.0.0 ) |
282 |
- projectm? ( |
283 |
- media-libs/glew:= |
284 |
- >=media-libs/libprojectm-1.2.0 |
285 |
- virtual/opengl |
286 |
- ) |
287 |
-" |
288 |
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; |
289 |
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches: |
290 |
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches |
291 |
-# Still possibly essential but not applied yet patches are: |
292 |
-# 06-fix-numeric-locale.patch |
293 |
-# 08-stdlib.h-for-rand.patch |
294 |
-RDEPEND="${COMMON_DEPEND} |
295 |
- media-plugins/gst-plugins-meta:1.0 |
296 |
- media-plugins/gst-plugins-soup:1.0 |
297 |
- media-plugins/gst-plugins-taglib:1.0 |
298 |
- mms? ( media-plugins/gst-plugins-libmms:1.0 ) |
299 |
- mtp? ( gnome-base/gvfs[mtp] ) |
300 |
- udisks? ( sys-fs/udisks:2 ) |
301 |
-" |
302 |
-DEPEND="${COMMON_DEPEND} |
303 |
- >=dev-cpp/gtest-1.8.0 |
304 |
- dev-libs/boost |
305 |
- dev-qt/linguist-tools:5 |
306 |
- dev-qt/qtx11extras:5 |
307 |
- dev-qt/qtxml:5 |
308 |
- sys-devel/gettext |
309 |
- virtual/pkgconfig |
310 |
- box? ( dev-cpp/sparsehash ) |
311 |
- dropbox? ( dev-cpp/sparsehash ) |
312 |
- googledrive? ( dev-cpp/sparsehash ) |
313 |
- projectm? ( dev-qt/qtopengl:5 ) |
314 |
- pulseaudio? ( media-sound/pulseaudio ) |
315 |
- seafile? ( dev-cpp/sparsehash ) |
316 |
- skydrive? ( dev-cpp/sparsehash ) |
317 |
- test? ( |
318 |
- dev-qt/qttest:5 |
319 |
- gnome-base/gsettings-desktop-schemas |
320 |
- ) |
321 |
-" |
322 |
- |
323 |
-RESTRICT="test" |
324 |
- |
325 |
-S="${WORKDIR}/${PN^}-${COMMIT}" |
326 |
- |
327 |
-DOCS=( Changelog README.md ) |
328 |
- |
329 |
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) |
330 |
- |
331 |
-src_prepare() { |
332 |
- l10n_find_plocales_changes "src/translations" "" ".po" |
333 |
- |
334 |
- cmake-utils_src_prepare |
335 |
- # some tests fail or hang |
336 |
- sed -i \ |
337 |
- -e '/add_test_file(translations_test.cpp/d' \ |
338 |
- tests/CMakeLists.txt || die |
339 |
- |
340 |
- if ! use test; then |
341 |
- sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die |
342 |
- cmake_comment_add_subdirectory tests |
343 |
- fi |
344 |
- |
345 |
- rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die |
346 |
-} |
347 |
- |
348 |
-src_configure() { |
349 |
- # spotify is not in portage |
350 |
- local mycmakeargs=( |
351 |
- -DBUILD_WERROR=OFF |
352 |
- # force to find crypto++ see bug #548544 |
353 |
- -DCRYPTOPP_LIBRARIES="cryptopp" |
354 |
- -DCRYPTOPP_FOUND=ON |
355 |
- # avoid automagically enabling of ccache (bug #611010) |
356 |
- -DCCACHE_EXECUTABLE=OFF |
357 |
- -DENABLE_BREAKPAD=OFF #< disable crash reporting |
358 |
- -DENABLE_DEVICEKIT=OFF |
359 |
- -DENABLE_GIO=ON |
360 |
- -DENABLE_SPOTIFY_BLOB=OFF |
361 |
- -DUSE_SYSTEM_GMOCK=ON |
362 |
- -DUSE_SYSTEM_PROJECTM=ON |
363 |
- -DBUNDLE_PROJECTM_PRESETS=OFF |
364 |
- -DLINGUAS="$(l10n_get_locales)" |
365 |
- -DENABLE_BOX="$(usex box)" |
366 |
- -DENABLE_AUDIOCD="$(usex cdda)" |
367 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus) |
368 |
- -DENABLE_DROPBOX="$(usex dropbox)" |
369 |
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" |
370 |
- -DENABLE_LIBGPOD="$(usex ipod)" |
371 |
- -DENABLE_LIBLASTFM="$(usex lastfm)" |
372 |
- -DENABLE_MOODBAR="$(usex moodbar)" |
373 |
- -DENABLE_LIBMTP="$(usex mtp)" |
374 |
- -DENABLE_VISUALISATIONS="$(usex projectm)" |
375 |
- -DENABLE_SEAFILE="$(usex seafile)" |
376 |
- -DENABLE_SKYDRIVE="$(usex skydrive)" |
377 |
- -DENABLE_LIBPULSE="$(usex pulseaudio)" |
378 |
- -DENABLE_UDISKS2="$(usex udisks)" |
379 |
- -DENABLE_WIIMOTEDEV="$(usex wiimote)" |
380 |
- ) |
381 |
- |
382 |
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT |
383 |
- |
384 |
- cmake-utils_src_configure |
385 |
-} |
386 |
- |
387 |
-src_test() { |
388 |
- cd "${CMAKE_BUILD_DIR}" || die |
389 |
- virtx emake test |
390 |
-} |
391 |
- |
392 |
-pkg_postinst() { |
393 |
- xdg_desktop_database_update |
394 |
- gnome2_icon_cache_update |
395 |
- |
396 |
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " |
397 |
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " |
398 |
- elog "depending on your preferences" |
399 |
-} |
400 |
- |
401 |
-pkg_postrm() { |
402 |
- xdg_desktop_database_update |
403 |
- gnome2_icon_cache_update |
404 |
-} |
405 |
|
406 |
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch b/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch |
407 |
deleted file mode 100644 |
408 |
index 633bf39be9d..00000000000 |
409 |
--- a/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch |
410 |
+++ /dev/null |
411 |
@@ -1,165 +0,0 @@ |
412 |
-From 940fcb260b345d2598d04fd07c6718566b3adda1 Mon Sep 17 00:00:00 2001 |
413 |
-From: Andreas Sturmlechner <asturm@g.o> |
414 |
-Date: Sat, 1 Dec 2018 23:29:43 +0100 |
415 |
-Subject: [PATCH 1/3] Qt5::Test is not required in the global QT_LIBRARIES |
416 |
- definition |
417 |
- |
418 |
---- |
419 |
- CMakeLists.txt | 2 +- |
420 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
421 |
- |
422 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
423 |
-index e660a376a..e18e008c0 100644 |
424 |
---- a/CMakeLists.txt |
425 |
-+++ b/CMakeLists.txt |
426 |
-@@ -110,7 +110,7 @@ if(WIN32) |
427 |
- find_package(Qt5 REQUIRED COMPONENTS WinExtras) |
428 |
- endif() |
429 |
- |
430 |
--set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL Qt5::Test) |
431 |
-+set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL) |
432 |
- |
433 |
- if(DBUS_FOUND) |
434 |
- set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) |
435 |
--- |
436 |
-2.19.2 |
437 |
- |
438 |
- |
439 |
-From 4e11613088d24f248046d449f63bfd245f1e82cc Mon Sep 17 00:00:00 2001 |
440 |
-From: Andreas Sturmlechner <asturm@g.o> |
441 |
-Date: Sat, 1 Dec 2018 23:44:35 +0100 |
442 |
-Subject: [PATCH 2/3] Qt5::DBus had already been optional, drop bogus pkgconfig |
443 |
- search |
444 |
- |
445 |
-This partially reverts commit 4321ecf7d26c5eed577a97d230786bb9f56ea37f. |
446 |
---- |
447 |
- CMakeLists.txt | 17 +++++++---------- |
448 |
- 1 file changed, 7 insertions(+), 10 deletions(-) |
449 |
- |
450 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
451 |
-index e18e008c0..0d1403e04 100644 |
452 |
---- a/CMakeLists.txt |
453 |
-+++ b/CMakeLists.txt |
454 |
-@@ -52,7 +52,6 @@ find_package(PkgConfig REQUIRED) |
455 |
- find_package(Protobuf REQUIRED) |
456 |
- find_package(FFTW3) |
457 |
- find_package(ALSA) |
458 |
--pkg_check_modules(DBUS dbus-1) |
459 |
- if (NOT APPLE) |
460 |
- find_package(X11) |
461 |
- endif() |
462 |
-@@ -96,13 +95,10 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable) |
463 |
- # QT |
464 |
- set(QT_MIN_VERSION 5.6.0) |
465 |
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test) |
466 |
-+find_package(Qt5DBus ${QT_MIN_VERSION}) |
467 |
- if(X11_FOUND) |
468 |
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) |
469 |
- endif() |
470 |
--if(DBUS_FOUND) |
471 |
-- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus) |
472 |
-- get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) |
473 |
--endif() |
474 |
- if(APPLE) |
475 |
- find_package(Qt5 REQUIRED COMPONENTS MacExtras) |
476 |
- endif() |
477 |
-@@ -112,8 +108,9 @@ endif() |
478 |
- |
479 |
- set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL) |
480 |
- |
481 |
--if(DBUS_FOUND) |
482 |
-+if(Qt5DBus_FOUND) |
483 |
- set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) |
484 |
-+ get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) |
485 |
- endif() |
486 |
- if(X11_FOUND) |
487 |
- set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras) |
488 |
-@@ -286,19 +283,19 @@ optional_component(LIBLASTFM ON "Last.fm support" |
489 |
- ) |
490 |
- |
491 |
- optional_component(DBUS ON "D-Bus support" |
492 |
-- DEPENDS "D-Bus" DBUS_FOUND |
493 |
-+ DEPENDS "Qt5DBus" Qt5DBus_FOUND |
494 |
- ) |
495 |
- |
496 |
- optional_component(WIIMOTEDEV ON "Wiimote support" |
497 |
-- DEPENDS "D-Bus support" DBUS_FOUND |
498 |
-+ DEPENDS "D-Bus support" Qt5DBus_FOUND |
499 |
- ) |
500 |
- |
501 |
- optional_component(DEVICEKIT ON "Devices: DeviceKit backend" |
502 |
-- DEPENDS "D-Bus support" DBUS_FOUND |
503 |
-+ DEPENDS "D-Bus support" Qt5DBus_FOUND |
504 |
- ) |
505 |
- |
506 |
- optional_component(UDISKS2 ON "Devices: UDisks2 backend" |
507 |
-- DEPENDS "D-Bus support" DBUS_FOUND |
508 |
-+ DEPENDS "D-Bus support" Qt5DBus_FOUND |
509 |
- ) |
510 |
- |
511 |
- if (CRYPTOPP_FOUND OR HAVE_SPOTIFY_BLOB) |
512 |
--- |
513 |
-2.19.2 |
514 |
- |
515 |
- |
516 |
-From 21e9f8be5b986581ab04869d28c335f949423ef5 Mon Sep 17 00:00:00 2001 |
517 |
-From: Andreas Sturmlechner <asturm@g.o> |
518 |
-Date: Sun, 2 Dec 2018 00:21:17 +0100 |
519 |
-Subject: [PATCH 3/3] Find X11 only once, in root CMakeLists.txt |
520 |
- |
521 |
-Since we have HAVE_X11, use HAVE_X11 in cmake. |
522 |
---- |
523 |
- 3rdparty/qxt/CMakeLists.txt | 1 - |
524 |
- CMakeLists.txt | 4 ++-- |
525 |
- src/CMakeLists.txt | 1 - |
526 |
- 3 files changed, 2 insertions(+), 4 deletions(-) |
527 |
- |
528 |
-diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt |
529 |
-index 8fd9220ae..73c67a9fa 100644 |
530 |
---- a/3rdparty/qxt/CMakeLists.txt |
531 |
-+++ b/3rdparty/qxt/CMakeLists.txt |
532 |
-@@ -10,7 +10,6 @@ set(QXT-MOC-HEADERS |
533 |
- qxtglobalshortcut.h |
534 |
- ) |
535 |
- |
536 |
--find_package(X11) |
537 |
- include_directories(${X11_INCLUDE_DIR}) |
538 |
- include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) |
539 |
- |
540 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
541 |
-index 0d1403e04..bd191b59e 100644 |
542 |
---- a/CMakeLists.txt |
543 |
-+++ b/CMakeLists.txt |
544 |
-@@ -96,7 +96,7 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable) |
545 |
- set(QT_MIN_VERSION 5.6.0) |
546 |
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test) |
547 |
- find_package(Qt5DBus ${QT_MIN_VERSION}) |
548 |
--if(X11_FOUND) |
549 |
-+if(HAVE_X11) |
550 |
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) |
551 |
- endif() |
552 |
- if(APPLE) |
553 |
-@@ -112,7 +112,7 @@ if(Qt5DBus_FOUND) |
554 |
- set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) |
555 |
- get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) |
556 |
- endif() |
557 |
--if(X11_FOUND) |
558 |
-+if(HAVE_X11) |
559 |
- set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras) |
560 |
- endif() |
561 |
- if(APPLE) |
562 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
563 |
-index 0eb14e28c..4a612d5bd 100644 |
564 |
---- a/src/CMakeLists.txt |
565 |
-+++ b/src/CMakeLists.txt |
566 |
-@@ -1364,7 +1364,6 @@ if (UNIX AND NOT APPLE) |
567 |
- # command but they're actually used by libraries that appear after them, so |
568 |
- # they end up getting ignored. This appends them to the very end of the link |
569 |
- # line, ensuring they're always used. |
570 |
-- find_package(X11) |
571 |
- if (FREEBSD) |
572 |
- target_link_libraries(clementine_lib ${X11_X11_LIB}) |
573 |
- else () |
574 |
--- |
575 |
-2.19.2 |
576 |
- |
577 |
|
578 |
diff --git a/media-sound/clementine/files/clementine-fts3-tokenizer.patch b/media-sound/clementine/files/clementine-fts3-tokenizer.patch |
579 |
deleted file mode 100644 |
580 |
index 41a5cd76c99..00000000000 |
581 |
--- a/media-sound/clementine/files/clementine-fts3-tokenizer.patch |
582 |
+++ /dev/null |
583 |
@@ -1,36 +0,0 @@ |
584 |
-From 77b6d72a3e8d841977a3e30ea435cd9e9289fc96 Mon Sep 17 00:00:00 2001 |
585 |
-From: Alexander Golubev <fatzer2@×××××.com> |
586 |
-Date: Thu, 16 Mar 2017 14:54:55 +0300 |
587 |
-Subject: [PATCH] core/database: configure fts3 tokenizer support |
588 |
- |
589 |
-Original patch by Arfrever |
590 |
-This fixes https://github.com/clementine-player/Clementine/issues/5297 |
591 |
---- |
592 |
- src/core/database.cpp | 14 ++++++++++++++ |
593 |
- 1 file changed, 14 insertions(+) |
594 |
- |
595 |
-diff --git a/src/core/database.cpp b/src/core/database.cpp |
596 |
-index 86e8a1052..36113d8c1 100644 |
597 |
---- a/src/core/database.cpp |
598 |
-+++ b/src/core/database.cpp |
599 |
-@@ -265,6 +265,20 @@ QSqlDatabase Database::Connect() { |
600 |
- StaticInit(); |
601 |
- |
602 |
- { |
603 |
-+ |
604 |
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER |
605 |
-+ // In case sqlite>=3.12 is compiled without -DSQLITE_ENABLE_FTS3_TOKENIZER (generally a good idea |
606 |
-+ // due to security reasons) the fts3 support should be enabled explicitly. |
607 |
-+ // see https://github.com/clementine-player/Clementine/issues/5297 |
608 |
-+ QVariant v = db.driver()->handle(); |
609 |
-+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { |
610 |
-+ sqlite3* handle = *static_cast<sqlite3**>(v.data()); |
611 |
-+ if (handle) { |
612 |
-+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); |
613 |
-+ } |
614 |
-+ } |
615 |
-+#endif |
616 |
-+ |
617 |
- QSqlQuery set_fts_tokenizer(db); |
618 |
- set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)"); |
619 |
- set_fts_tokenizer.bindValue(":name", "unicode"); |