commit: 302d46e47e75b664144499370bef450fed383df0 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sun Oct 16 04:46:22 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Oct 16 04:46:22 2022 +0000 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 <fordfrog <AT> 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..000000000000 --- 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} == *9999* ]]; 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} - dev-libs/boost - dev-qt/qtopengl:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - box? ( dev-cpp/sparsehash ) - dropbox? ( dev-cpp/sparsehash ) - googledrive? ( dev-cpp/sparsehash ) - pulseaudio? ( media-sound/pulseaudio ) - seafile? ( dev-cpp/sparsehash ) - skydrive? ( dev-cpp/sparsehash ) -" - -RESTRICT="test" - -DOCS=( Changelog README.md ) - -PATCHES=( - "${FILESDIR}/${P}-QPainterPath_include.patch" #725678 - "${FILESDIR}/${P}-gcc11-fix-static-assertion-failure.patch" #788607 -) - -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 - # force to find crypto++ see bug #548544 - -DCRYPTOPP_LIBRARIES="cryptopp" - -DCRYPTOPP_FOUND=ON - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DENABLE_DEVICEKIT=OFF - -DENABLE_GIO=ON - -DENABLE_SPOTIFY_BLOB=OFF - -DUSE_SYSTEM_GMOCK=ON - -DUSE_SYSTEM_PROJECTM=ON - -DBUNDLE_PROJECTM_PRESETS=OFF - -DLINGUAS="$(plocale_get_locales)" - -DENABLE_BOX="$(usex box)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus) - -DENABLE_DROPBOX="$(usex dropbox)" - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBLASTFM="$(usex lastfm)" - -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_VISUALISATIONS="$(usex projectm)" - -DENABLE_SEAFILE="$(usex seafile)" - -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_WIIMOTEDEV="$(usex wiimote)" - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx emake test -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" -} diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch deleted file mode 100644 index 3a441412ba26..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7715ae5c01528213a97369e14d5461efd264cc27 Mon Sep 17 00:00:00 2001 -From: SDNick484 <[email protected]> -Date: Thu, 28 May 2020 10:34:31 +0200 -Subject: [PATCH] Adds missing QPainterPath include - ---- - src/widgets/freespacebar.cpp | 1 + - src/widgets/osdpretty.cpp | 1 + - src/widgets/sliderwidget.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp -index 3067f722b..c9789d353 100644 ---- a/src/widgets/freespacebar.cpp -+++ b/src/widgets/freespacebar.cpp -@@ -20,6 +20,7 @@ - - #include <QLinearGradient> - #include <QPainter> -+#include <QPainterPath> - - const int FreeSpaceBar::kBarHeight = 20; - const int FreeSpaceBar::kBarBorderRadius = 8; -diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp -index 9d95716d8..30cef7dae 100644 ---- a/src/widgets/osdpretty.cpp -+++ b/src/widgets/osdpretty.cpp -@@ -26,6 +26,7 @@ - #include <QLayout> - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include <QSettings> - #include <QTimer> - #include <QTimeLine> -diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp -index 581a0de7b..96bbc0e5e 100644 ---- a/src/widgets/sliderwidget.cpp -+++ b/src/widgets/sliderwidget.cpp -@@ -27,6 +27,7 @@ - #include <QSize> - #include <QTimer> - #include <QStyle> -+#include <QtGui> - #include <QMenu> - #include <QWheelEvent> - #include <QMouseEvent> --- -2.27.0.rc2 - 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 deleted file mode 100644 index 1a492fe5664c..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch +++ /dev/null @@ -1,70 +0,0 @@ -From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <[email protected]> -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 <[email protected]> ---- - 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})
