From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D1741582EF for ; Tue, 11 Feb 2025 20:54:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 25E27343166 for ; Tue, 11 Feb 2025 20:54:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1FD3211042D; Tue, 11 Feb 2025 20:54:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1482B11042D for ; Tue, 11 Feb 2025 20:54:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5B90343086 for ; Tue, 11 Feb 2025 20:54:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 232F827F5 for ; Tue, 11 Feb 2025 20:54:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1739307261.0bd68cd4ceee7ea98cafeb3a2405b001b6590c20.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/Manifest media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch X-VCS-Directories: media-sound/clementine/ media-sound/clementine/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0bd68cd4ceee7ea98cafeb3a2405b001b6590c20 X-VCS-Branch: master Date: Tue, 11 Feb 2025 20:54:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 36afc798-06f5-477e-bccd-a3cc6dea9314 X-Archives-Hash: 87755e4e1ebc997d3f6c7013e6be523b commit: 0bd68cd4ceee7ea98cafeb3a2405b001b6590c20 Author: Alexey Sokolov asokolov org> AuthorDate: Mon Feb 10 23:49:38 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 11 20:54:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd68cd4 media-sound/clementine: drop 1.4.0_rc2-r5 Signed-off-by: Alexey Sokolov asokolov.org> Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/clementine/Manifest | 1 - .../clementine/clementine-1.4.0_rc2-r5.ebuild | 170 --------------------- .../files/clementine-1.4.0_rc2-absl.patch | 15 -- .../files/clementine-1.4.0_rc2-c17.patch | 67 -------- .../clementine/files/clementine-1.4.0_rc2-lz.patch | 33 ---- .../files/clementine-1.4.0_rc2-projectm-dir.patch | 53 ------- 6 files changed, 339 deletions(-) diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 1a2f1e757349..b0b74e98d078 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.1_p28.tar.xz 5554308 BLAKE2B 213c5719ce987700739d625de07861143a85690c91908d458cb40db9b932f4a33caca727f2a2db942d96ee3e5f356841c09dfd293fa676ad134d1283937ef4fc SHA512 c5b06540909127e8b3bc774f2bee54584c0993e1ddebce4572cd8402bba5524babdcc3b74a1b6a8335c525ce64ee1347766b6698df05bdcf21209583b8d1dc9d diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild deleted file mode 100644 index e692aae14938..000000000000 --- a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2024 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} == *9999* ]]; 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 - # 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 - -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)" - "$(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 - - cmake_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx cmake_build clementine_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_rc2-absl.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch deleted file mode 100644 index 60c2adff3689..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch +++ /dev/null @@ -1,15 +0,0 @@ -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} ${GENTOO_FIX_ABSL_LIBS} - ) - 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 deleted file mode 100644 index 3121b1e15bf0..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 ---- a/ext/libclementine-remote/CMakeLists.txt -+++ b/ext/libclementine-remote/CMakeLists.txt -@@ -1,6 +1,6 @@ - include_directories(${PROTOBUF_INCLUDE_DIRS}) - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17") - - set(MESSAGES - remotecontrolmessages.proto ---- a/ext/libclementine-tagreader/CMakeLists.txt -+++ b/ext/libclementine-tagreader/CMakeLists.txt -@@ -3,7 +3,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common) - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17") - - set(MESSAGES - tagreadermessages.proto ---- a/gst/moodbar/CMakeLists.txt -+++ b/gst/moodbar/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 3.0.0) - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++17") - - include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch deleted file mode 100644 index a33f07d5a5f9..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-lz.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/clementine-player/Clementine/pull/7238 -https://bugs.gentoo.org/887105 - ---- a/3rdparty/qtiocompressor/CMakeLists.txt -+++ b/3rdparty/qtiocompressor/CMakeLists.txt -@@ -15,4 +15,4 @@ ADD_LIBRARY(qtiocompressor STATIC - ${IOCOMPRESSOR-SOURCES-MOC} - ) - --target_link_libraries(qtiocompressor Qt5::Core) -+target_link_libraries(qtiocompressor Qt5::Core ${ZLIB_LIBRARIES}) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -78,9 +78,7 @@ pkg_check_modules(LIBXML libxml-2.0) - pkg_check_modules(LIBSPOTIFY libspotify>=12.1.45) - pkg_check_modules(TAGLIB taglib) - --if (WIN32) - find_package(ZLIB REQUIRED) --endif (WIN32) - - find_library(LASTFM5_LIBRARIES lastfm5) - find_path(LASTFM5_INCLUDE_DIRS lastfm5/ws.h) ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1303,7 +1303,6 @@ target_link_libraries(clementine_lib - ${SQLITE_LIBRARIES} - - Qocoa -- z - ) - - link_directories( diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch deleted file mode 100644 index 8f92766193d6..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch +++ /dev/null @@ -1,53 +0,0 @@ -Read visualisations from subdirs - -https://bugs.gentoo.org/917064 -https://github.com/clementine-player/Clementine/issues/7151 - ---- a/src/visualisations/projectmpresetmodel.cpp -+++ b/src/visualisations/projectmpresetmodel.cpp -@@ -27,22 +27,26 @@ - #endif - - #include -+#include - #include -+#include - - ProjectMPresetModel::ProjectMPresetModel(ProjectMVisualisation* vis, - QObject* parent) - : QAbstractItemModel(parent), vis_(vis) { - // Find presets -- QDir preset_dir(vis_->preset_url()); -- QStringList presets( -- preset_dir.entryList(QStringList() << "*.milk" -- << "*.prjm", -+ QDirIterator it(vis_->preset_url(), -+ QStringList() << "*.milk" << "*.prjm", - QDir::Files | QDir::NoDotAndDotDot | QDir::Readable, -- QDir::Name | QDir::IgnoreCase)); -+ QDirIterator::Subdirectories); -+ std::set> files; -+ while (it.hasNext()) { -+ it.next(); -+ files.insert({it.filePath(), it.fileName()}); -+ } - -- for (const QString& filename : presets) { -- all_presets_ << Preset(preset_dir.absoluteFilePath(filename), filename, -- false); -+ for (const auto& [filePath, fileName] : files) { -+ all_presets_ << Preset(filePath, fileName, false); - } - } - ---- a/src/visualisations/projectmvisualisation.cpp -+++ b/src/visualisations/projectmvisualisation.cpp -@@ -93,7 +93,7 @@ void ProjectMVisualisation::InitProjectM() { - if (!QFile::exists(path)) continue; - - // Don't use empty directories -- if (QDir(path).entryList(QDir::Files | QDir::NoDotAndDotDot).isEmpty()) -+ if (QDir(path).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty()) - continue; - - preset_path = path;