From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 EFC8215813A for ; Mon, 13 Jan 2025 21:54:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6772E0827; Mon, 13 Jan 2025 21:54:23 +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 pigeon.gentoo.org (Postfix) with ESMTPS id A905DE0827 for ; Mon, 13 Jan 2025 21:54:23 +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 B216333BF60 for ; Mon, 13 Jan 2025 21:54:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEEB320A3 for ; Mon, 13 Jan 2025 21:54:20 +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: <1736805249.df11c7075061a2a73ced62277731cba964d6064f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/clementine-9999.ebuild X-VCS-Directories: media-sound/clementine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: df11c7075061a2a73ced62277731cba964d6064f X-VCS-Branch: master Date: Mon, 13 Jan 2025 21:54:20 +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: 04fe696d-68f9-4563-95d3-952300b5937d X-Archives-Hash: e42bc64725b978761b14c0ca4478d7d0 commit: df11c7075061a2a73ced62277731cba964d6064f Author: Alexey Sokolov asokolov org> AuthorDate: Wed Jan 8 02:17:27 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 13 21:54:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df11c707 media-sound/clementine: update live Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/40039 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/clementine/clementine-9999.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index f3083d6651fb..823a70ac7fe8 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -14,8 +14,9 @@ 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/_}" + MY_PV="$(ver_cut 1-3)-$(ver_cut 5)-gxxxxxxxxx" + SRC_URI="https://github.com/clementine-player/Clementine/releases/download/${MY_PV}/clementine-${MY_PV}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/clementine-${MY_PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi @@ -92,13 +93,6 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/clementine-1.4.0_rc2-c17.patch" - "${FILESDIR}/clementine-1.4.0_rc2-absl2.patch" - "${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch" - "${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch" -) - DOCS=( Changelog README.md ) src_prepare() { @@ -147,6 +141,12 @@ src_configure() { "$(cmake_use_find_package alsa ALSA)" ) + if [[ ${PV} != *9999* ]]; then + mycmakeargs+=( + -DFORCE_GIT_REVISION="${MY_PV}" + ) + fi + use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT cmake_src_configure