[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 940208ab8e575fbde5337f019fd45d69e337eaba
Author: Alexey Sokolov asokolov org>
AuthorDate: Thu Jan 4 01:16:52 2024 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 5 10:36:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940208ab
media-sound/clementine: Fix build with older abseil
Bug: https://bugs.gentoo.org/919422
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/34631
Signed-off-by: Sam James gentoo.org>
media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild| 3 ++-
media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
index 6e37ca03e086..c6a6697e2ccc 100644
--- a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -148,6 +148,7 @@ src_configure() {
-DENABLE_UDISKS2="$(usex udisks)"
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
"$(cmake_use_find_package alsa ALSA)"
+ -DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD
-labsl_log_internal_check_op -labsl_log_internal_message)"
)
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
index 48eb9dda4227..60c2adff3689 100644
--- a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
@@ -10,6 +10,6 @@ https://bugs.gentoo.org/912853
target_link_libraries(libclementine-tagreader
- ${PROTOBUF_LIBRARY}
libclementine-common
-+ ${PROTOBUF_LIBRARY} absl_log_internal_check_op absl_log_internal_message
++ ${PROTOBUF_LIBRARY} ${GENTOO_FIX_ABSL_LIBS}
)
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 83d2aec8200c8232978d20d43701c4442376a316
Author: Alexey Sokolov asokolov org>
AuthorDate: Fri Nov 10 22:41:37 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Dec 23 20:05:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d2aec8
media-sound/clementine: read projectm visualizations from subdirs
Closes: https://bugs.gentoo.org/917064
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/33760
Signed-off-by: Joonas Niilola gentoo.org>
.../clementine/clementine-1.4.0_rc2-r5.ebuild | 169 +
.../files/clementine-1.4.0_rc2-projectm-dir.patch | 53 +++
2 files changed, 222 insertions(+)
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
new file mode 100644
index ..6e37ca03e086
--- /dev/null
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and
Qt"
+HOMEPAGE="https://www.clementine-player.org
https://github.com/clementine-player/Clementine;
+
+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"
+
+inherit cmake flag-o-matic plocale virtualx xdg
+
+if [[ ${PV} == ** ]]; then
+ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
+ inherit git-r3
+else
+
SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz
-> ${P}.tar.gz"
+ S="${WORKDIR}/Clementine-${PV/_}"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp
projectm pulseaudio seafile skydrive test +udisks wiimote"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+ dev-cpp/abseil-cpp:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/protobuf:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ media-libs/chromaprint:=
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+ >=media-libs/taglib-1.11.1_p20181028
+ sys-libs/zlib
+ x11-libs/libX11
+ alsa? ( media-libs/alsa-lib )
+ cdda? ( dev-libs/libcdio:= )
+ dbus? ( dev-qt/qtdbus:5 )
+ ipod? ( >=media-libs/libgpod-0.8.0 )
+ lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+ moodbar? ( sci-libs/fftw:3.0= )
+ mtp? ( >=media-libs/libmtp-1.0.0:= )
+ projectm? (
+ media-libs/glew:=
+ >=media-libs/libprojectm-3.1.12:0=
+ virtual/opengl
+ )
+ pulseaudio? ( media-libs/libpulse )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-soup:1.0
+ media-plugins/gst-plugins-taglib:1.0
+ mtp? ( gnome-base/gvfs[mtp] )
+ udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ dev-libs/libxml2
+ dev-qt/qtopengl:5
+ dev-qt/qtxml:5
+ virtual/glu
+ box? ( dev-cpp/sparsehash )
+ dropbox? ( dev-cpp/sparsehash )
+ googledrive? ( dev-cpp/sparsehash )
+ seafile? ( dev-cpp/sparsehash )
+ skydrive? ( dev-cpp/sparsehash )
+"
+BDEPEND="
+ >=dev-cpp/gtest-1.8.0
+ dev-qt/linguist-tools:5
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ dev-qt/qttest:5
+ gnome-base/gsettings-desktop-schemas
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
+ "${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
+ "${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+ "${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
+)
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+ plocale_find_changes "src/translations" "" ".po"
+
+ cmake_src_prepare
+ # some tests fail or hang
+ sed -i \
+ -e '/add_test_file(translations_test.cpp/d' \
+ tests/CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+ cmake_comment_add_subdirectory tests
+ fi
+
+ rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+ # spotify is not in portage
+ local mycmakeargs=(
+ -DBUILD_WERROR=OFF
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: a19cfd05bb1bc1ed9ed84342a95bca123b347eb9
Author: Alexey Sokolov asokolov org>
AuthorDate: Fri Oct 6 17:56:47 2023 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Oct 17 05:23:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19cfd05
media-sound/clementine: Fix build with new abseil and proto
Bug: https://bugs.gentoo.org/912853
Bug: https://bugs.gentoo.org/913738
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Yixun Lan gentoo.org>
...-.ebuild => clementine-1.4.0_rc2-r4.ebuild} | 10
media-sound/clementine/clementine-.ebuild | 6 ++
.../files/clementine-1.4.0_rc2-absl.patch | 15 +
.../files/clementine-1.4.0_rc2-c17.patch | 67 ++
4 files changed, 98 insertions(+)
diff --git a/media-sound/clementine/clementine-.ebuild
b/media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
similarity index 94%
copy from media-sound/clementine/clementine-.ebuild
copy to media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
index 9922ac005926..0ba33dd8074d 100644
--- a/media-sound/clementine/clementine-.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="
"
COMMON_DEPEND="
+ dev-cpp/abseil-cpp:=
dev-db/sqlite:3
dev-libs/glib:2
dev-libs/protobuf:=
@@ -91,6 +92,12 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
+ "${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
+ "${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+)
+
DOCS=( Changelog README.md )
src_prepare() {
@@ -111,12 +118,15 @@ src_prepare() {
}
src_configure() {
+ # spotify is not in portage
local mycmakeargs=(
-DBUILD_WERROR=OFF
# avoid automagically enabling of ccache (bug #611010)
-DCCACHE_EXECUTABLE=OFF
-DENABLE_BREAKPAD=OFF #< disable crash reporting
-DENABLE_GIO=ON
+ -DENABLE_SPOTIFY=OFF
+ -DENABLE_SPOTIFY_BLOB=OFF
-DUSE_SYSTEM_GMOCK=ON
-DUSE_SYSTEM_PROJECTM=ON
-DBUNDLE_PROJECTM_PRESETS=OFF
diff --git a/media-sound/clementine/clementine-.ebuild
b/media-sound/clementine/clementine-.ebuild
index 9922ac005926..4e0ac13d9ad3 100644
--- a/media-sound/clementine/clementine-.ebuild
+++ b/media-sound/clementine/clementine-.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="
"
COMMON_DEPEND="
+ dev-cpp/abseil-cpp:=
dev-db/sqlite:3
dev-libs/glib:2
dev-libs/protobuf:=
@@ -91,6 +92,11 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
+ "${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+)
+
DOCS=( Changelog README.md )
src_prepare() {
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
new file mode 100644
index ..48eb9dda4227
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
@@ -0,0 +1,15 @@
+Fix build
+
+https://bugs.gentoo.org/912853
+
+--- a/ext/libclementine-tagreader/CMakeLists.txt
b/ext/libclementine-tagreader/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library(libclementine-tagreader STATIC
+ )
+
+ target_link_libraries(libclementine-tagreader
+- ${PROTOBUF_LIBRARY}
+ libclementine-common
++ ${PROTOBUF_LIBRARY} absl_log_internal_check_op absl_log_internal_message
+ )
+
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch
b/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch
new file mode 100644
index ..3121b1e15bf0
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch
@@ -0,0 +1,67 @@
+Fix build
+
+https://bugs.gentoo.org/912853
+
+--- a/3rdparty/libprojectm/CMakeLists.txt
b/3rdparty/libprojectm/CMakeLists.txt
+@@ -24,7 +24,7 @@ set(BUILD_PROJECTM_STATIC ON)
+ set(DISABLE_NATIVE_PRESETS ON)
+ set(DISABLE_MILKDROP_PRESETS OFF)
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+
+ pkg_check_modules(GLEW glew)
+
+--- a/3rdparty/qtsingleapplication/CMakeLists.txt
b/3rdparty/qtsingleapplication/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.0.0)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+
+ set(SINGLEAPP-SOURCES
+ qtlocalpeer.cpp
+--- a/ext/libclementine-common/CMakeLists.txt
b/ext/libclementine-common/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+
+ set(SOURCES
+ core/closure.cpp
+---
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 302d46e47e75b664144499370bef450fed383df0
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Oct 16 04:46:22 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Oct 16 04:46:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302d46e4
media-sound/clementine: dropped obsolete 1.4.0_rc1
Bug: https://bugs.gentoo.org/877175
Signed-off-by: Miroslav Šulc gentoo.org>
media-sound/clementine/Manifest| 1 -
media-sound/clementine/clementine-1.4.0_rc1.ebuild | 181 -
...clementine-1.4.0_rc1-QPainterPath_include.patch | 50 --
0_rc1-gcc11-fix-static-assertion-failure.patch | 70
4 files changed, 302 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 2c93e95fd8ee..9d094a2ce96c 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B
a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d
SHA512
403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
-DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B
894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809
SHA512
c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
deleted file mode 100644
index 20ab0d44c70d..
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-inherit cmake flag-o-matic plocale virtualx xdg
-
-MY_P="${P/_}"
-if [[ ${PV} == ** ]]; then
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
- inherit git-r3
-else
- S="${WORKDIR}/${P/_}"
- SRC_URI_BASE="https://github.com/clementine-player/${PN^};
- COMMIT=""
- if [[ -n "${COMMIT}" ]] ; then
- SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN^}-${COMMIT}"
- elif [[ $(ver_cut 3) -gt 90 ]] ; then
- SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- else
-
SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
- fi
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and
Qt"
-HOMEPAGE="https://www.clementine-player.org
https://github.com/clementine-player/Clementine;
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp
projectm pulseaudio seafile skydrive test +udisks wiimote"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-BDEPEND="
- >=dev-cpp/gtest-1.8.0
- dev-qt/linguist-tools:5
- sys-devel/gettext
- virtual/pkgconfig
- test? (
- dev-qt/qttest:5
- gnome-base/gsettings-desktop-schemas
- )
-"
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+)]
- dev-db/sqlite:=
- dev-libs/crypto++:=
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwidgets:5
- media-libs/chromaprint:=
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
- >=media-libs/taglib-1.11.1_p20181028
- sys-libs/zlib
- virtual/glu
- x11-libs/libX11
- cdda? ( dev-libs/libcdio:= )
- dbus? ( dev-qt/qtdbus:5 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
- moodbar? ( sci-libs/fftw:3.0 )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- projectm? (
- media-libs/glew:=
- >=media-libs/libprojectm-3.1.12:0=
- virtual/opengl
- )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs[mtp] )
- udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 108a30eff5e383a41da0285e07d44ed74eb40c88
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jul 2 10:39:53 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jul 2 10:42:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108a30ef
media-sound/clementine: Fixed build with gcc11
Thanks-to: Jiří Moravec volny.cz>
Closes: https://bugs.gentoo.org/788607
Signed-off-by: Lars Wendler gentoo.org>
media-sound/clementine/clementine-1.4.0_rc1.ebuild | 1 +
0_rc1-gcc11-fix-static-assertion-failure.patch | 70 ++
2 files changed, 71 insertions(+)
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index ef72ab5c0af..620d245f5d3 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -108,6 +108,7 @@ DOCS=( Changelog README.md )
PATCHES=(
"${FILESDIR}/${P}-QPainterPath_include.patch" #725678
+ "${FILESDIR}/${P}-gcc11-fix-static-assertion-failure.patch" #788607
)
src_prepare() {
diff --git
a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
new file mode 100644
index 000..1a492fe5664
--- /dev/null
+++
b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
@@ -0,0 +1,70 @@
+From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?=
+Date: Wed, 16 Dec 2020 20:03:26 +0100
+Subject: [PATCH] Drop -std=c++0x and -U__STRICT_ANSI__
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This was causing compilation failures, static assertion failed, with GCC 11.
+
+Fix #6865
+
+Signed-off-by: Robert-André Mauchin
+---
+ ext/clementine-spotifyblob/CMakeLists.txt | 2 +-
+ ext/clementine-tagreader/CMakeLists.txt | 2 +-
+ src/CMakeLists.txt| 2 +-
+ tests/CMakeLists.txt | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ext/clementine-spotifyblob/CMakeLists.txt
b/ext/clementine-spotifyblob/CMakeLists.txt
+index e5342ee5b..6fd551d57 100644
+--- a/ext/clementine-spotifyblob/CMakeLists.txt
b/ext/clementine-spotifyblob/CMakeLists.txt
+@@ -7,7 +7,7 @@
include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob)
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
+ include_directories(${CMAKE_SOURCE_DIR}/src)
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall
-Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs
-Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x
-U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall
-Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs
-Wno-unused-private-field -Wno-unknown-warning-option")
+
+ link_directories(${SPOTIFY_LIBRARY_DIRS})
+
+diff --git a/ext/clementine-tagreader/CMakeLists.txt
b/ext/clementine-tagreader/CMakeLists.txt
+index 855e390cf..a48b01450 100644
+--- a/ext/clementine-tagreader/CMakeLists.txt
b/ext/clementine-tagreader/CMakeLists.txt
+@@ -7,7 +7,7 @@
include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
+ include_directories(${CMAKE_SOURCE_DIR}/src)
+ include_directories(${CMAKE_BINARY_DIR}/src)
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 627b2e7cb..0bbc775ba 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall
-Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs
-Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x
-U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall
-Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs
-Wno-unused-private-field -Wno-unknown-warning-option")
+
+ option(BUILD_WERROR "Build with -Werror" ON)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 4474e7be5..ff571fc19 100644
+--- a/tests/CMakeLists.txt
b/tests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.8.11)
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive
-Wno-c++11-narrowing -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
+
+ if(USE_SYSTEM_GMOCK)
+ include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 66e5a91fc96dd9acf01f84b458c7c4b39aa405bf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 13 08:50:06 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 13 08:50:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e5a91f
media-sound/clementine: Fix restore from systray with >=Qt-5.12.4
See upstream PR: https://github.com/clementine-player/Clementine/pull/6351
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../clementine/clementine-1.3.1_p20190609.ebuild | 2 ++
...-1.3.1_p20190609-fix-restore-from-systray.patch | 34 ++
2 files changed, 36 insertions(+)
diff --git a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
index 54765a4608b..a4d5f63d5bb 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
@@ -104,6 +104,8 @@ RESTRICT="test"
DOCS=( Changelog README.md )
+PATCHES=( "${FILESDIR}/${P}-fix-restore-from-systray.patch" )
+
src_prepare() {
l10n_find_plocales_changes "src/translations" "" ".po"
diff --git
a/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch
b/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch
new file mode 100644
index 000..9f27e219e89
--- /dev/null
+++
b/media-sound/clementine/files/clementine-1.3.1_p20190609-fix-restore-from-systray.patch
@@ -0,0 +1,34 @@
+From 1bf633e71b7b5d8e5965971036d66e1d18552b49 Mon Sep 17 00:00:00 2001
+From: Michael Niggli
+Date: Fri, 31 May 2019 17:04:46 +0200
+Subject: [PATCH] Fix blank window when restoring from systray
+
+This applies the fix qBittorrent used for this same issue:
+https://github.com/qbittorrent/qBittorrent/issues/9240,
+so credit goes to those guys
+---
+ src/ui/mainwindow.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
+index 2944d46ec..ad603fd64 100644
+--- a/src/ui/mainwindow.cpp
b/src/ui/mainwindow.cpp
+@@ -1441,7 +1441,7 @@ void MainWindow::closeEvent(QCloseEvent* event) {
+ keep_running = s.value("keeprunning", tray_icon_->IsVisible()).toBool();
+
+ if (keep_running && event->spontaneous()) {
+-event->accept();
++event->ignore();
+ SetHiddenInTray(true);
+ } else {
+ Exit();
+@@ -1454,7 +1454,7 @@ void MainWindow::SetHiddenInTray(bool hidden) {
+ // Some window managers don't remember maximized state between calls to
+ // hide() and show(), so we have to remember it ourself.
+ if (hidden) {
+-hide();
++QTimer::singleShot(0, this, ::hide);
+ } else {
+ if (was_maximized_)
+ showMaximized();
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 80b389e422c3815ed885df9e36d1bccfe929ec5d
Author: Lars Wendler gentoo org>
AuthorDate: Sun Feb 17 16:05:08 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Feb 17 16:05:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b389e4
media-sound/clementine: Removed old.
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
media-sound/clementine/Manifest| 2 -
.../clementine/clementine-1.3.1_p20180416.ebuild | 181
.../clementine/clementine-1.3.1_p20181201.ebuild | 182 -
.../files/clementine-1.3.1_p20181201-cmake.patch | 165 ---
.../files/clementine-fts3-tokenizer.patch | 36
5 files changed, 566 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 6e52851f4d7..2ef425142c8 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,3 +1 @@
-DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B
37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76
SHA512
8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
-DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B
c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9
SHA512
fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c
DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B
ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db
SHA512
b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
diff --git a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
deleted file mode 100644
index 2af2d69f7b7..000
--- a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-MY_P="${P/_}"
-if [[ ${PV} == ** ]]; then
- EGIT_BRANCH="qt5"
- EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
- GIT_ECLASS="git-r3"
-else
- COMMIT=bd096dcbc3cfa8965ee96245b95c4027278b42a6
-
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils
${GIT_ECLASS}
-unset GIT_ECLASS
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and
Qt"
-HOMEPAGE="https://www.clementine-player.org
https://github.com/clementine-player/Clementine;
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp
projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+)]
- dev-db/sqlite:=
- dev-libs/crypto++[asm]
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwidgets:5
- media-libs/chromaprint:=
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
- media-libs/taglib
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- cdda? ( dev-libs/libcdio:= )
- dbus? ( dev-qt/qtdbus:5 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
- moodbar? ( sci-libs/fftw:3.0 )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- projectm? (
- media-libs/glew:=
- >=media-libs/libprojectm-1.2.0
- )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is
required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version;
check clementine's patches:
-#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: f7bad51a4cf9b76f1859cee8aff0e1086d73a64b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 17 22:56:11 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 17 23:10:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7bad51a
media-sound/clementine: 1.3.1_p20181112 snapshot bump
Bug: https://bugs.gentoo.org/658808
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-sound/clementine/Manifest| 1 +
.../clementine/clementine-1.3.1_p20181112.ebuild | 182 +
.../files/clementine-1.3.1_p20181112-no-dbus.patch | 41 +
3 files changed, 224 insertions(+)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 369a56dd408..10cd87cf3d4 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1,3 @@
DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B
37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76
SHA512
8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
DIST clementine-1.3.1_p20180523.tar.gz 8490122 BLAKE2B
783cd420c8e3cd7423ecb6caa3466efd2c09e9033c2a198f52dc113603233f1bf3e3dc5208491338c0fdc9ab26e5b661e7fced0dd835b4c19a867fa3cacc9ccd
SHA512
a47de226108240313fef2ce965726b3afea988030adffe38fdabf5d0dc46b2eda42cfebc32d77e939eb6dd687a99556c9bd8848c6a5e78c434950d00a8833200
+DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B
da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d
SHA512
eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa
diff --git a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
new file mode 100644
index 000..0840a685935
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+MY_P="${P/_}"
+if [[ ${PV} == ** ]]; then
+ EGIT_BRANCH="qt5"
+ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
+ GIT_ECLASS="git-r3"
+else
+ COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5
+
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils
${GIT_ECLASS}
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and
Qt"
+HOMEPAGE="https://www.clementine-player.org
https://github.com/clementine-player/Clementine;
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp
projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+)]
+ dev-db/sqlite:=
+ dev-libs/crypto++[asm]
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/protobuf:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwidgets:5
+ media-libs/chromaprint:=
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+ >=media-libs/taglib-1.11.1_p20181028
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ cdda? ( dev-libs/libcdio:= )
+ dbus? ( dev-qt/qtdbus:5 )
+ ipod? ( >=media-libs/libgpod-0.8.0 )
+ lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+ moodbar? ( sci-libs/fftw:3.0 )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ projectm? (
+ media-libs/glew:=
+ >=media-libs/libprojectm-1.2.0
+ )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is
required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version;
check clementine's patches:
+#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/gst-plugins-meta:1.0
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 7869a12948ccd5fce91507f8481a947e606985df
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 16 23:18:17 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 17 00:26:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7869a129
media-sound/clementine: 1.3.1_p20180314 snapshot bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/clementine/Manifest| 1 +
.../clementine/clementine-1.3.1_p20180314.ebuild | 192 +
.../files/clementine-1.3.1_p20180314-qt-5.11.patch | 51 ++
3 files changed, 244 insertions(+)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 0e1b8a2a3b6..558788994a4 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1,3 @@
DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B
bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a
SHA512
39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
DIST clementine-1.3.1_p20180219.tar.gz 8486446 BLAKE2B
f0d34dae90acfd41a4dad6943ea088fb64d16308caf8dce569c0c5a900c149a0c40838b8f420a42e9e5cf6718965cec8fe7f9bb2ed7489719f3d8316308f2d49
SHA512
7464f03be6894202ecfeb9f2dd97821cd76cec1285be2dc82155b023406c57ec1a94e3659438726b6bf3c667579ab43f668f03e12c261aea05aa468e73a05146
+DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B
978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c
SHA512
5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a
diff --git a/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
b/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
new file mode 100644
index 000..296ae7151df
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20180314.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+MY_P="${P/_}"
+if [[ ${PV} == ** ]]; then
+ EGIT_BRANCH="qt5"
+ EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
+ GIT_ECLASS="git-r3"
+else
+ COMMIT=2d7894915dfc9043da9282d216775ef75041c773
+
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils
${GIT_ECLASS} vcs-snapshot
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and
Qt"
+HOMEPAGE="https://www.clementine-player.org
https://github.com/clementine-player/Clementine;
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp
projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+)]
+ dev-db/sqlite:=
+ dev-libs/crypto++
+ dev-libs/glib:2
+ dev-libs/libxml2
+ dev-libs/protobuf:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ media-libs/chromaprint:=
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+ media-libs/taglib
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ cdda? ( dev-libs/libcdio:= )
+ dbus? ( dev-qt/qtdbus:5 )
+ ipod? ( >=media-libs/libgpod-0.8.0 )
+ lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
+ moodbar? ( sci-libs/fftw:3.0 )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ projectm? (
+ media-libs/glew:=
+ >=media-libs/libprojectm-1.2.0
+ )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is
required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version;
check clementine's patches:
+#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-soup:1.0
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 85f6b085c7f460f2ac9b8f64781151f082d9e2cf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 19 09:32:08 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 19 09:32:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f6b085
media-sound/clementine: Drop old
Closes: https://bugs.gentoo.org/640300
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-sound/clementine/Manifest| 1 -
media-sound/clementine/clementine-1.3.1-r5.ebuild | 174 -
.../files/clementine-1.3.1-chromaprint14.patch | 41 --
.../files/clementine-1.3.1-fix-desktop-file.patch | 52 --
.../clementine-1.3.1-libechonest_removal.patch | 701 -
media-sound/clementine/metadata.xml| 2 -
6 files changed, 971 deletions(-)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 59c2e0dfbb0..e631e549623 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
-DIST clementine-1.3.1.tar.gz 8501827 BLAKE2B
ebb003f28f9a4dd8fff4e5a92aeb1b6c948be794731c202241b8cb91f4678d6b2d035d6c9cd0d6e7b4b7d9a494d3c1c5bb5e88243e7a34e565c07c34d048ebdd
SHA512
1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790
DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B
bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a
SHA512
39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
diff --git a/media-sound/clementine/clementine-1.3.1-r5.ebuild
b/media-sound/clementine/clementine-1.3.1-r5.ebuild
deleted file mode 100644
index 88c6a2096dc..000
--- a/media-sound/clementine/clementine-1.3.1-r5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
-
-LANGS=" af ar be bg bn br bs ca cs cy da de el 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 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"
-
-inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
-[[ ${PV} == ** ]] && inherit git-r3
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and
Qt"
-HOMEPAGE="https://www.clementine-player.org
https://github.com/clementine-player/Clementine;
-[[ ${PV} == ** ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == ** ]] || \
-KEYWORDS="amd64 x86"
-IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms
moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
-IUSE+="${LANGS// / linguas_}"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
- dev-db/sqlite:=
- >=dev-libs/glib-2.24.1-r1
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- >=dev-qt/qtcore-4.5:4[ssl]
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtopengl-4.5:4
- >=dev-qt/qtsql-4.5:4
- >=media-libs/chromaprint-0.6
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt4(+)]
- >=media-libs/taglib-1.8[mp4(+)]
- sys-libs/zlib
- dev-libs/crypto++
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- cdda? ( dev-libs/libcdio )
- dbus? ( >=dev-qt/qtdbus-4.5:4 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew:=
- >=media-libs/libprojectm-1.2.0 )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is
required; check if this can be overcome someway;
-# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version;
check the clementine's patches:
-#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
- dbus? ( udisks? ( sys-fs/udisks:0 ) )
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs[mtp] )
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.39:=
- virtual/pkgconfig
- sys-devel/gettext
- dev-qt/qttest:4
- || (
-
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: f36c3c321d5e383adbfb2ed448ad1e9d1f598179
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 19 12:39:38 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 19 15:09:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36c3c32
media-sound/clementine: Switch to qt5
Forward-port fts3-tokenizer fix to qt5 branch.
Add patch to properly find linguist-tools for lconvert.
Closes: https://bugs.gentoo.org/562610
Package-Manager: Portage-2.3.14, Repoman-2.3.6
media-sound/clementine/clementine-.ebuild | 47 --
.../files/clementine-fts3-tokenizer.patch | 36 +
.../clementine/files/clementine-qt5-lconvert.patch | 28 +
3 files changed, 98 insertions(+), 13 deletions(-)
diff --git a/media-sound/clementine/clementine-.ebuild
b/media-sound/clementine/clementine-.ebuild
index 3e249872f86..50ae57df046 100644
--- a/media-sound/clementine/clementine-.ebuild
+++ b/media-sound/clementine/clementine-.ebuild
@@ -3,6 +3,7 @@
EAPI=6
+EGIT_BRANCH="qt5"
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
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"
@@ -19,7 +20,7 @@ LICENSE="GPL-3"
SLOT="0"
[[ ${PV} == ** ]] || \
KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp
projectm pulseaudio seafile skydrive test +udisks wiimote"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp
projectm pulseaudio seafile skydrive test +udisks wiimote +X"
REQUIRED_USE="
udisks? ( dbus )
@@ -27,35 +28,42 @@ REQUIRED_USE="
"
COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+)]
dev-db/sqlite:=
dev-libs/crypto++
dev-libs/glib:2
dev-libs/libxml2
dev-libs/protobuf:=
- dev-libs/qjson
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
media-libs/chromaprint:=
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt4(+)]
+ >=media-libs/libmygpo-qt-1.0.9[qt5]
media-libs/taglib[mp4(+)]
sys-libs/zlib
virtual/glu
virtual/opengl
- x11-libs/libX11
cdda? ( dev-libs/libcdio )
- dbus? ( dev-qt/qtdbus:4 )
+ dbus? ( dev-qt/qtdbus:5 )
ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+ lastfm? ( >=media-libs/liblastfm-1[qt5] )
moodbar? ( sci-libs/fftw:3.0 )
mtp? ( >=media-libs/libmtp-1.0.0 )
projectm? (
media-libs/glew:=
>=media-libs/libprojectm-1.2.0
)
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
"
# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is
required; check if this can be overcome someway;
# Libprojectm-1.2 seems to work fine, so no reason to use bundled version;
check clementine's patches:
@@ -77,7 +85,7 @@ DEPEND="${COMMON_DEPEND}
dev-cpp/gmock
)
dev-libs/boost:=
- dev-qt/qttest:4
+ dev-qt/linguist-tools:5
sys-devel/gettext
virtual/pkgconfig
box? ( dev-cpp/sparsehash )
@@ -86,15 +94,22 @@ DEPEND="${COMMON_DEPEND}
pulseaudio? ( media-sound/pulseaudio )
seafile? ( dev-cpp/sparsehash )
skydrive? ( dev-cpp/sparsehash )
- test? ( gnome-base/gsettings-desktop-schemas )
+ test? (
+ dev-qt/qttest:5
+ gnome-base/gsettings-desktop-schemas
+ )
"
+
DOCS=( Changelog README.md )
MY_P="${P/_}"
[[ ${PV} == ** ]] || \
S="${WORKDIR}/${MY_P^}"
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-fts3-tokenizer.patch
+ "${FILESDIR}"/${PN}-qt5-lconvert.patch
+)
src_prepare() {
l10n_find_plocales_changes "src/translations" "" ".po"
@@ -104,6 +119,11 @@ src_prepare() {
sed -i \
-e '/add_test_file(translations_test.cpp/d' \
tests/CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+ cmake_comment_add_subdirectory tests
+ fi
}
src_configure() {
@@ -139,6 +159,7 @@ src_configure() {
-DENABLE_LIBPULSE="$(usex pulseaudio)"
-DENABLE_UDISKS2="$(usex udisks)"
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 435d5fdb52747acb507a0cbc1fec3778110e0a37
Author: Alexander Golubev gmail com>
AuthorDate: Mon Dec 26 22:23:30 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Dec 26 23:38:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=435d5fdb
media-sound/clementine-1.3.1: drop echonest support
Gentoo Bug: 573712
Thanks for the patch to Lars Wendler.
Also rename the recently added patch 'clementine-chromaprint14' to meet
gentoo patch naming suggestions.
Closes: https://github.com/gentoo/gentoo/pull/3246
...-1.3.1-r4.ebuild => clementine-1.3.1-r5.ebuild} | 4 +-
patch => clementine-1.3.1-chromaprint14.patch} | 0
.../clementine-1.3.1-libechonest_removal.patch | 701 +
3 files changed, 703 insertions(+), 2 deletions(-)
diff --git a/media-sound/clementine/clementine-1.3.1-r4.ebuild
b/media-sound/clementine/clementine-1.3.1-r5.ebuild
similarity index 98%
rename from media-sound/clementine/clementine-1.3.1-r4.ebuild
rename to media-sound/clementine/clementine-1.3.1-r5.ebuild
index a61c2fe..4d23bb0 100644
--- a/media-sound/clementine/clementine-1.3.1-r4.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r5.ebuild
@@ -41,7 +41,6 @@ COMMON_DEPEND="
>=media-libs/chromaprint-0.6
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- media-libs/libechonest:=[qt4(+)]
>=media-libs/libmygpo-qt-1.0.9[qt4(+)]
>=media-libs/taglib-1.8[mp4(+)]
sys-libs/zlib
@@ -95,7 +94,8 @@ S="${WORKDIR}/${MY_P^}"
PATCHES=(
"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
"${FILESDIR}"/${P}-fix-desktop-file.patch
- "${FILESDIR}"/${PN}-chromaprint14.patch #603662
+ "${FILESDIR}"/${P}-chromaprint14.patch #603662
+ "${FILESDIR}"/${P}-libechonest_removal.patch
)
src_prepare() {
diff --git a/media-sound/clementine/files/clementine-chromaprint14.patch
b/media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch
similarity index 100%
rename from media-sound/clementine/files/clementine-chromaprint14.patch
rename to media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch
diff --git
a/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch
b/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch
new file mode 100644
index ..63eb096
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch
@@ -0,0 +1,701 @@
+Remove depend upon media-libs/libechonest and its support from clementine due
to echonest service
+was shutdown and this functionality is useless now and results in nothing but
a slight security
+and privacy risk.
+See Gentoo bug #573712.
+Based upon patch extracted from upstream git; original patch info:
+commit a8a0f2e4fdd3d4b2fd23b8628a3abc27c290d01d
+Author: John Maguire
+Date: Mon Jun 27 14:45:40 2016 +0100
+
+Remove echonest and update songkick concert fetcher.
+--- Clementine-1.3.1/CMakeLists.txt
Clementine-1.3.1/CMakeLists.txt
+@@ -365,9 +365,6 @@
+ endif (NOT APPLE)
+ endif (USE_SYSTEM_QXT)
+
+-find_path(ECHONEST_INCLUDE_DIRS echonest/echonest_export.h)
+-find_library(ECHONEST_LIBRARIES echonest)
+-
+ # Use system gmock if it's available
+ # We need to look for both gmock and gtest
+ find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h)
+--- Clementine-1.3.1/src/CMakeLists.txt
Clementine-1.3.1/src/CMakeLists.txt
+@@ -35,7 +35,6 @@
+ include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
+ include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
+ include_directories(${QXT_INCLUDE_DIRS})
+-include_directories(${ECHONEST_INCLUDE_DIRS})
+ include_directories(${SHA2_INCLUDE_DIRS})
+ include_directories(${CHROMAPRINT_INCLUDE_DIRS})
+ include_directories(${MYGPOQT_INCLUDE_DIRS})
+@@ -297,8 +296,6 @@
+ songinfo/artistinfoview.cpp
+ songinfo/collapsibleinfoheader.cpp
+ songinfo/collapsibleinfopane.cpp
+- songinfo/echonestbiographies.cpp
+- songinfo/echonestimages.cpp
+ songinfo/songinfobase.cpp
+ songinfo/songinfofetcher.cpp
+ songinfo/songinfoprovider.cpp
+@@ -586,8 +583,6 @@
+ songinfo/artistinfoview.h
+ songinfo/collapsibleinfoheader.h
+ songinfo/collapsibleinfopane.h
+- songinfo/echonestbiographies.h
+- songinfo/echonestimages.h
+ songinfo/songinfobase.h
+ songinfo/songinfofetcher.h
+ songinfo/songinfoprovider.h
+@@ -822,16 +817,12 @@
+ internet/lastfm/lastfmcompat.cpp
+ internet/lastfm/lastfmservice.cpp
+ internet/lastfm/lastfmsettingspage.cpp
+-songinfo/echonestsimilarartists.cpp
+-songinfo/echonesttags.cpp
+ songinfo/lastfmtrackinfoprovider.cpp
+ songinfo/tagwidget.cpp
+ HEADERS
+ covers/lastfmcoverprovider.h
+ internet/lastfm/lastfmservice.h
+ internet/lastfm/lastfmsettingspage.h
+-songinfo/echonestsimilarartists.h
+-songinfo/echonesttags.h
+ songinfo/lastfmtrackinfoprovider.h
+ songinfo/tagwidget.h
+ UI
+@@ -1241,7 +1232,6 @@
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 75a31d8181bb748f4ed65443e6b819fa6c534fbd
Author: Lars Wendler gentoo org>
AuthorDate: Sun Apr 17 17:50:49 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Apr 17 17:52:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a31d81
media-sound/clementine: Bumped 1.3 ebuild to EAPI-6. Removed spotify support
again until we have a reliable dev-libs/crypto++ available.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler gentoo.org>
media-sound/clementine/clementine-1.3.ebuild | 41 +++---
.../files/clementine-1.3-fix-tokenizer.patch | 4 +--
.../files/clementine-1.3_rc1-cmake.patch | 32 +
3 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/media-sound/clementine/clementine-1.3.ebuild
b/media-sound/clementine/clementine-1.3.ebuild
index bfac234..2e12657 100644
--- a/media-sound/clementine/clementine-1.3.ebuild
+++ b/media-sound/clementine/clementine-1.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
@@ -56,7 +56,6 @@ COMMON_DEPEND="
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
projectm? ( media-libs/glew:= )
- >=dev-libs/crypto++-5.6.2-r4
"
# now only presets are used, libprojectm is internal
#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
@@ -93,7 +92,10 @@ MY_P="${P/_}"
[[ ${PV} == ** ]] || \
S="${WORKDIR}/C${MY_P:1}"
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3_rc1-cmake.patch"
+ "${FILESDIR}/${PN}-1.3-fix-tokenizer.patch"
+)
src_prepare() {
cmake-utils_src_prepare
@@ -116,27 +118,24 @@ src_configure() {
-DLINGUAS="${langs}"
-DBUNDLE_PROJECTM_PRESETS=OFF
-DUSE_SYSTEM_PROJECTM=ON
- $(cmake-utils_use cdda ENABLE_AUDIOCD)
- $(cmake-utils_use dbus ENABLE_DBUS)
- $(cmake-utils_use udisks ENABLE_DEVICEKIT)
- $(cmake-utils_use ipod ENABLE_LIBGPOD)
- $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
- $(cmake-utils_use mtp ENABLE_LIBMTP)
- $(cmake-utils_use moodbar ENABLE_MOODBAR)
+ -DENABLE_AUDIOCD="$(usex cdda)"
+ -DENABLE_DBUS="$(usex dbus)"
+ -DENABLE_DEVICEKIT="$(usex udisks)"
+ -DENABLE_LIBGPOD="$(usex ipod)"
+ -DENABLE_LIBLASTFM="$(usex lastfm)"
+ -DENABLE_LIBMTP="$(usex mtp)"
+ -DENABLE_MOODBAR="$(usex moodbar)"
-DENABLE_GIO=ON
- $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
- $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+ -DENABLE_WIIMOTEDEV="$(usex wiimote)"
+ -DENABLE_VISUALISATIONS="$(usex projectm)"
$(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
- $(cmake-utils_use box ENABLE_BOX)
- $(cmake-utils_use dropbox ENABLE_DROPBOX)
- $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
- $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
- $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
+ -DENABLE_BOX="$(usex box)"
+ -DENABLE_DROPBOX="$(usex dropbox)"
+ -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+ -DENABLE_SKYDRIVE="$(usex skydrive)"
+ -DENABLE_UBUNTU_ONE="$(usex ubuntu-one)"
-DENABLE_SPOTIFY_BLOB=OFF
-DENABLE_BREAKPAD=OFF
- #$(cmake-utils_use !system-sqlite STATIC_SQLITE)
- #$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
- #$(cmake-utils_use system-sqlite
MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
-DUSE_BUILTIN_TAGLIB=OFF
-DUSE_SYSTEM_GMOCK=ON
)
@@ -148,7 +147,7 @@ src_configure() {
src_test() {
cd "${CMAKE_BUILD_DIR}" || die
- Xemake test
+ virtx emake test
}
pkg_preinst() {
diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
index 6413bf7..4375186 100644
--- a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
+++ b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
@@ -1,7 +1,7 @@
https://github.com/clementine-player/Clementine/issues/5297
src/core/database.cpp
-+++ src/core/database.cpp
+--- a/src/core/database.cpp
b/src/core/database.cpp
@@ -265,6 +265,16 @@
StaticInit();
diff --git a/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
new file mode 100644
index 000..22a922b
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: d9b0d9b1b437b7b130549e5b683cf4afc8a865e2
Author: Jason A. Donenfeld gentoo org>
AuthorDate: Sun Apr 17 04:41:15 2016 +
Commit: Jason Donenfeld gentoo org>
CommitDate: Sun Apr 17 04:41:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b0d9b1
media-sound/clementine: needs patch for tokenizer
Package-Manager: portage-2.2.28
media-sound/clementine/clementine-1.3.ebuild| 2 ++
media-sound/clementine/clementine-.ebuild | 5 ++---
.../files/clementine-1.3-fix-tokenizer.patch| 21 +
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/media-sound/clementine/clementine-1.3.ebuild
b/media-sound/clementine/clementine-1.3.ebuild
index 3eb1742..bfac234 100644
--- a/media-sound/clementine/clementine-1.3.ebuild
+++ b/media-sound/clementine/clementine-1.3.ebuild
@@ -93,6 +93,8 @@ MY_P="${P/_}"
[[ ${PV} == ** ]] || \
S="${WORKDIR}/C${MY_P:1}"
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
+
src_prepare() {
cmake-utils_src_prepare
diff --git a/media-sound/clementine/clementine-.ebuild
b/media-sound/clementine/clementine-.ebuild
index 79b9c7d..bfac234 100644
--- a/media-sound/clementine/clementine-.ebuild
+++ b/media-sound/clementine/clementine-.ebuild
@@ -56,6 +56,7 @@ COMMON_DEPEND="
mtp? ( >=media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
projectm? ( media-libs/glew:= )
+ >=dev-libs/crypto++-5.6.2-r4
"
# now only presets are used, libprojectm is internal
#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
@@ -92,9 +93,7 @@ MY_P="${P/_}"
[[ ${PV} == ** ]] || \
S="${WORKDIR}/C${MY_P:1}"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3_rc1-cmake.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
src_prepare() {
cmake-utils_src_prepare
diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
new file mode 100644
index 000..6413bf7
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
@@ -0,0 +1,21 @@
+https://github.com/clementine-player/Clementine/issues/5297
+
+--- src/core/database.cpp
src/core/database.cpp
+@@ -265,6 +265,16 @@
+ StaticInit();
+
+ {
++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
++QVariant v = db.driver()->handle();
++if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
++ sqlite3* handle = *static_cast(v.data());
++ if (handle) {
++sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1,
NULL);
++ }
++}
++#endif
++
+ QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
+ set_fts_tokenizer.bindValue(":name", "unicode");
+ set_fts_tokenizer.bindValue(
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: 1fb08fe2ed703c87172c9ead38f96d8f8ede6e12
Author: Lars Wendler gentoo org>
AuthorDate: Wed Jan 13 17:20:32 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Jan 13 17:20:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb08fe2
media-sound/clementine: Bump to version 1.3_rc1 (bug #571462).
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler gentoo.org>
media-sound/clementine/Manifest| 1 +
media-sound/clementine/clementine-1.3_rc1.ebuild | 167 +
.../files/clementine-1.3_rc1-cmake.patch | 41 +
3 files changed, 209 insertions(+)
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 25001dc..9a18ea5 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1,3 @@
DIST clementine-1.2.2.tar.gz 9076752 SHA256
1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512
48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca
WHIRLPOOL
13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
DIST clementine-1.2.3.tar.gz 9076977 SHA256
7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512
fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3
WHIRLPOOL
23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
+DIST clementine-1.3_rc1.tar.gz 8477665 SHA256
f08b797b47305b8a0b7e1713d11977df12e09911f05c577c9f81641369f252a0 SHA512
973410a0d2baf0646a77eb5bcbea2af3f34a4baa5671f7a81fa99203703c478d38dd2f32ce0ccac9babf8add56717fd5fdec8a4bacefe8b9b8fa0256ec509edb
WHIRLPOOL
968ca43b4a15169926ad68a009c568ae03ef17e8b0542fe6c4ebd07fc4e64ae6782ab63d3a05851064e288522e44e885a9a1dc52b94246e016c60c91e41e0a76
diff --git a/media-sound/clementine/clementine-1.3_rc1.ebuild
b/media-sound/clementine/clementine-1.3_rc1.ebuild
new file mode 100644
index 000..4c4758a
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3_rc1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git;
+
+LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu
fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa
pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
+[[ ${PV} == ** ]] && inherit git-2
+
+DESCRIPTION="A modern music player and library organizer based on Amarok 1.4
and Qt4"
+HOMEPAGE="http://www.clementine-player.org
https://github.com/clementine-player/Clementine;
+[[ ${PV} == ** ]] || \
+SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == ** ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp
projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+# qca dep is temporary for bug #489850
+COMMON_DEPEND="
+ dev-db/sqlite:=
+ >=dev-libs/glib-2.24.1-r1
+ dev-libs/libxml2
+ dev-libs/protobuf:=
+ dev-libs/qjson
+ >=dev-qt/qtcore-4.5:4
+ >=dev-qt/qtgui-4.5:4
+ >=dev-qt/qtopengl-4.5:4
+ >=dev-qt/qtsql-4.5:4[sqlite]
+ >=media-libs/chromaprint-0.6
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/libechonest:=
+ >=media-libs/libmygpo-qt-1.0.8
+ >=media-libs/taglib-1.8[mp4]
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ cdda? ( dev-libs/libcdio )
+ dbus? ( >=dev-qt/qtdbus-4.5:4 )
+ ipod? ( >=media-libs/libgpod-0.8.0 )
+ lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ moodbar? ( sci-libs/fftw:3.0 )
+ projectm? ( media-libs/glew:= )
+"
+# now only presets are used, libprojectm is internal
+#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to
expose the symbols we need to use FTS"
+RDEPEND="${COMMON_DEPEND}
+ dbus? ( udisks? ( sys-fs/udisks:2 ) )
+ mms? ( media-plugins/gst-plugins-libmms:1.0 )
+ mtp? ( gnome-base/gvfs )
+ projectm? ( >=media-libs/libprojectm-1.2.0 )
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-soup:1.0
+ media-plugins/gst-plugins-taglib:1.0
+"
[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
commit: ecf8d4814fde069659bf0d999ee5bddc3f27a18b
Author: Lars Wendler polynomial-c AT gentoo DOT org
AuthorDate: Tue Aug 25 08:12:02 2015 +
Commit: Lars Wendler polynomial-c AT gentoo DOT org
CommitDate: Tue Aug 25 08:13:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf8d481
media-sound/clementine: Added subslot dependency for media-libs/glew
and slot dependency for dev-db/sqlite.
Fixed compilation with =dev-libs/boost-1.57.0 (bug #542528).
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler polynomial-c AT gentoo.org
media-sound/clementine/clementine-1.2.3.ebuild | 7 +-
...tine-1.2.3-hide_boost_includes_from_q_moc.patch | 181 +
2 files changed, 185 insertions(+), 3 deletions(-)
diff --git a/media-sound/clementine/clementine-1.2.3.ebuild
b/media-sound/clementine/clementine-1.2.3.ebuild
index d9410eb..eb76fd1 100644
--- a/media-sound/clementine/clementine-1.2.3.ebuild
+++ b/media-sound/clementine/clementine-1.2.3.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND=
dbus? ( =dev-qt/qtdbus-4.5:4 )
=dev-qt/qtopengl-4.5:4
=dev-qt/qtsql-4.5:4[sqlite]
- system-sqlite? ( dev-db/sqlite[fts3(+)] )
+ system-sqlite? ( dev-db/sqlite:3[fts3(+)] )
=media-libs/taglib-1.8[mp4]
=dev-libs/glib-2.24.1-r1
dev-libs/libxml2
@@ -57,7 +57,7 @@ COMMON_DEPEND=
lastfm? ( =media-libs/liblastfm-1 )
mtp? ( =media-libs/libmtp-1.0.0 )
moodbar? ( sci-libs/fftw:3.0 )
- projectm? ( media-libs/glew )
+ projectm? ( media-libs/glew:= )
# now only presets are used, libprojectm is internal
#
https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
@@ -94,7 +94,8 @@ RESTRICT=test
S=${WORKDIR}/${P^}
PATCHES=(
- ${FILESDIR}/clementine-1.2.3-namespaces.patch
+ ${FILESDIR}/${PN}-1.2.3-namespaces.patch
+ ${FILESDIR}/${P}-hide_boost_includes_from_q_moc.patch
)
src_prepare() {
diff --git
a/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch
b/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch
new file mode 100644
index 000..c582d7a
--- /dev/null
+++
b/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch
@@ -0,0 +1,181 @@
+Description: Wrap boost includes to avoid FTBFS due to qt4 moc.
+Author: Robert Bruce Park robert.p...@canonical.com
+Bug-Debian: https://bugs.debian.org/795144
+Last-Update: 2015-04-13
+
+--- a/src/core/boundfuturewatcher.h
b/src/core/boundfuturewatcher.h
+@@ -3,7 +3,9 @@
+
+ #include QFutureWatcher
+
++#ifndef Q_MOC_RUN
+ #include boost/noncopyable.hpp
++#endif
+
+ template typename T, typename D
+ class BoundFutureWatcher : public QFutureWatcherT, boost::noncopyable {
+--- a/src/core/database.cpp
b/src/core/database.cpp
+@@ -23,7 +23,9 @@
+ #include core/logging.h
+ #include core/taskmanager.h
+
++#ifndef Q_MOC_RUN
+ #include boost/scope_exit.hpp
++#endif
+
+ #include QCoreApplication
+ #include QDir
+--- a/src/core/macglobalshortcutbackend.mm
b/src/core/macglobalshortcutbackend.mm
+@@ -22,7 +22,9 @@
+ #include mac_startup.h
+ #import mac_utilities.h
+
++#ifndef Q_MOC_RUN
+ #include boost/noncopyable.hpp
++#endif
+
+ #include QAction
+ #include QList
+--- a/src/core/mergedproxymodel.h
b/src/core/mergedproxymodel.h
+@@ -25,10 +25,12 @@
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+
++#ifndef Q_MOC_RUN
+ #include boost/multi_index_container.hpp
+ #include boost/multi_index/member.hpp
+ #include boost/multi_index/ordered_index.hpp
+ #include boost/multi_index/hashed_index.hpp
++#endif
+
+ using boost::multi_index::multi_index_container;
+ using boost::multi_index::indexed_by;
+--- a/src/core/scopedtransaction.h
b/src/core/scopedtransaction.h
+@@ -18,7 +18,9 @@
+ #ifndef SCOPEDTRANSACTION_H
+ #define SCOPEDTRANSACTION_H
+
++#ifndef Q_MOC_RUN
+ #include boost/noncopyable.hpp
++#endif
+
+ class QSqlDatabase;
+
+--- a/src/core/signalchecker.h
b/src/core/signalchecker.h
+@@ -20,8 +20,10 @@
+
+ #include glib-object.h
+
++#ifndef Q_MOC_RUN
+ #include boost/function_types/function_arity.hpp
+ #include boost/typeof/typeof.hpp
++#endif
+
+ // Do not call this directly, use CHECKED_GCONNECT instead.
+ bool CheckedGConnect(
+--- a/src/devices/macdevicelister.mm
b/src/devices/macdevicelister.mm
+@@ -38,7 +38,9 @@
+ #import Foundation/NSString.h
+ #import Foundation/NSURL.h
+
++#ifndef Q_MOC_RUN
+ #include boost/scope_exit.hpp
++#endif
+
+ #include libmtp.h
+
+--- a/src/library/groupbydialog.h
b/src/library/groupbydialog.h
+@@ -25,9 +25,11 @@
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+
++#ifndef Q_MOC_RUN
+ #include boost/multi_index_container.hpp
+ #include boost/multi_index/member.hpp
+ #include boost/multi_index/ordered_index.hpp
++#endif
+
+ #include librarymodel.h
+
+--- a/tests/database_test.cpp
