Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
Date: Thu, 26 Apr 2018 03:32:14
Message-Id: 1524713373.c50ce6be0d1de5a792daa90fe043026c49f1ad0b.asturm@gentoo
1 commit: c50ce6be0d1de5a792daa90fe043026c49f1ad0b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 25 19:39:58 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 26 03:29:33 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50ce6be
7
8 media-sound/clementine: Drop old Qt4-based
9
10 Bug: https://bugs.gentoo.org/650692
11 Package-Manager: Portage-2.3.31, Repoman-2.3.9
12
13 media-sound/clementine/Manifest | 1 -
14 .../clementine-1.3.1_p20171113-r1.ebuild | 167 ---------------------
15 .../files/clementine-1.3-fix-tokenizer.patch | 21 ---
16 3 files changed, 189 deletions(-)
17
18 diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
19 index ab3c9e5fb0c..4b0aa4198c4 100644
20 --- a/media-sound/clementine/Manifest
21 +++ b/media-sound/clementine/Manifest
22 @@ -1,2 +1 @@
23 -DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
24 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
25
26 diff --git a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
27 deleted file mode 100644
28 index fe90073e56b..00000000000
29 --- a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
30 +++ /dev/null
31 @@ -1,167 +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 -COMMIT=83e860eabd9f4a864c553f110742027cdd01b76f
38 -EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
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 -inherit cmake-utils flag-o-matic gnome2-utils l10n vcs-snapshot virtualx xdg-utils
43 -
44 -DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
45 -HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
46 -SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
47 -
48 -LICENSE="GPL-3"
49 -SLOT="0"
50 -KEYWORDS="amd64 x86"
51 -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
52 -
53 -REQUIRED_USE="
54 - udisks? ( dbus )
55 - wiimote? ( dbus )
56 -"
57 -
58 -COMMON_DEPEND="
59 - dev-db/sqlite:=
60 - dev-libs/crypto++
61 - dev-libs/glib:2
62 - dev-libs/libxml2
63 - dev-libs/protobuf:=
64 - dev-libs/qjson
65 - dev-qt/qtcore:4[ssl]
66 - dev-qt/qtgui:4
67 - dev-qt/qtopengl:4
68 - dev-qt/qtsql:4
69 - media-libs/chromaprint:=
70 - media-libs/gstreamer:1.0
71 - media-libs/gst-plugins-base:1.0
72 - >=media-libs/libmygpo-qt-1.0.9[qt4]
73 - media-libs/taglib[mp4(+)]
74 - sys-libs/zlib
75 - virtual/glu
76 - virtual/opengl
77 - x11-libs/libX11
78 - cdda? ( dev-libs/libcdio:= )
79 - dbus? ( dev-qt/qtdbus:4 )
80 - ipod? ( >=media-libs/libgpod-0.8.0 )
81 - lastfm? ( >=media-libs/liblastfm-1[qt4] )
82 - moodbar? ( sci-libs/fftw:3.0 )
83 - mtp? ( >=media-libs/libmtp-1.0.0 )
84 - projectm? (
85 - media-libs/glew:=
86 - >=media-libs/libprojectm-1.2.0
87 - )
88 -"
89 -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
90 -# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
91 -# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
92 -# Still possibly essential but not applied yet patches are:
93 -# 06-fix-numeric-locale.patch
94 -# 08-stdlib.h-for-rand.patch
95 -RDEPEND="${COMMON_DEPEND}
96 - media-plugins/gst-plugins-meta:1.0
97 - media-plugins/gst-plugins-soup:1.0
98 - media-plugins/gst-plugins-taglib:1.0
99 - mms? ( media-plugins/gst-plugins-libmms:1.0 )
100 - mtp? ( gnome-base/gvfs[mtp] )
101 - udisks? ( sys-fs/udisks:2 )
102 -"
103 -DEPEND="${COMMON_DEPEND}
104 - >=dev-cpp/gtest-1.8.0
105 - dev-libs/boost
106 - sys-devel/gettext
107 - virtual/pkgconfig
108 - box? ( dev-cpp/sparsehash )
109 - dropbox? ( dev-cpp/sparsehash )
110 - googledrive? ( dev-cpp/sparsehash )
111 - pulseaudio? ( media-sound/pulseaudio )
112 - seafile? ( dev-cpp/sparsehash )
113 - skydrive? ( dev-cpp/sparsehash )
114 - test? (
115 - dev-qt/qttest:4
116 - gnome-base/gsettings-desktop-schemas
117 - )
118 -"
119 -
120 -DOCS=( Changelog README.md )
121 -
122 -PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
123 -
124 -src_prepare() {
125 - l10n_find_plocales_changes "src/translations" "" ".po"
126 -
127 - cmake-utils_src_prepare
128 - # some tests fail or hang
129 - sed -i \
130 - -e '/add_test_file(translations_test.cpp/d' \
131 - tests/CMakeLists.txt || die
132 -
133 - use test || cmake_comment_add_subdirectory tests
134 - rm -r 3rdparty/{gmock,google-breakpad,libprojectm,taglib} || die
135 -}
136 -
137 -src_configure() {
138 - # spotify is not in portage
139 - local mycmakeargs=(
140 - -DBUILD_WERROR=OFF
141 - # force to find crypto++ see bug #548544
142 - -DCRYPTOPP_LIBRARIES="crypto++"
143 - -DCRYPTOPP_FOUND=ON
144 - # avoid automagically enabling of ccache (bug #611010)
145 - -DCCACHE_EXECUTABLE=OFF
146 - -DENABLE_BREAKPAD=OFF #< disable crash reporting
147 - -DENABLE_DEVICEKIT=OFF
148 - -DENABLE_GIO=ON
149 - -DENABLE_SPOTIFY_BLOB=OFF
150 - -DUSE_BUILTIN_TAGLIB=OFF
151 - -DUSE_SYSTEM_PROJECTM=ON
152 - -DBUNDLE_PROJECTM_PRESETS=OFF
153 - -DLINGUAS="$(l10n_get_locales)"
154 - -DENABLE_BOX="$(usex box)"
155 - -DENABLE_AUDIOCD="$(usex cdda)"
156 - -DENABLE_DBUS="$(usex dbus)"
157 - -DENABLE_DROPBOX="$(usex dropbox)"
158 - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
159 - -DENABLE_LIBGPOD="$(usex ipod)"
160 - -DENABLE_LIBLASTFM="$(usex lastfm)"
161 - -DENABLE_MOODBAR="$(usex moodbar)"
162 - -DENABLE_LIBMTP="$(usex mtp)"
163 - -DENABLE_VISUALISATIONS="$(usex projectm)"
164 - -DENABLE_SEAFILE="$(usex seafile)"
165 - -DENABLE_SKYDRIVE="$(usex skydrive)"
166 - -DENABLE_LIBPULSE="$(usex pulseaudio)"
167 - -DENABLE_UDISKS2="$(usex udisks)"
168 - -DENABLE_WIIMOTEDEV="$(usex wiimote)"
169 - )
170 -
171 - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
172 - use test && mycmakeargs+=( -DUSE_SYSTEM_GMOCK=ON )
173 -
174 - cmake-utils_src_configure
175 -}
176 -
177 -src_test() {
178 - cd "${CMAKE_BUILD_DIR}" || die
179 - virtx emake test
180 -}
181 -
182 -pkg_preinst() {
183 - gnome2_icon_savelist
184 -}
185 -
186 -pkg_postinst() {
187 - xdg_desktop_database_update
188 - gnome2_icon_cache_update
189 -
190 - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
191 - elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
192 - elog "depending on your preferences"
193 -}
194 -
195 -pkg_postrm() {
196 - xdg_desktop_database_update
197 - gnome2_icon_cache_update
198 -}
199
200 diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
201 deleted file mode 100644
202 index 437518695a3..00000000000
203 --- a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
204 +++ /dev/null
205 @@ -1,21 +0,0 @@
206 -https://github.com/clementine-player/Clementine/issues/5297
207 -
208 ---- a/src/core/database.cpp
209 -+++ b/src/core/database.cpp
210 -@@ -265,6 +265,16 @@
211 - StaticInit();
212 -
213 - {
214 -+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
215 -+ QVariant v = db.driver()->handle();
216 -+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
217 -+ sqlite3* handle = *static_cast<sqlite3**>(v.data());
218 -+ if (handle) {
219 -+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
220 -+ }
221 -+ }
222 -+#endif
223 -+
224 - QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
225 - set_fts_tokenizer.bindValue(":name", "unicode");
226 - set_fts_tokenizer.bindValue(