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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E876138359 for ; Sat, 8 Aug 2020 16:55:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B856E0B4A; Sat, 8 Aug 2020 16:55:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D89D1E0B4A for ; Sat, 8 Aug 2020 16:55:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB25934F482 for ; Sat, 8 Aug 2020 16:55:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4CCE318 for ; Sat, 8 Aug 2020 16:55:39 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1596905631.500f9cbf8e5c576c893077ca6b3952cbee1b728d.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mp3splt-gtk/files/, media-sound/mp3splt-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild X-VCS-Directories: media-sound/mp3splt-gtk/files/ media-sound/mp3splt-gtk/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 500f9cbf8e5c576c893077ca6b3952cbee1b728d X-VCS-Branch: master Date: Sat, 8 Aug 2020 16:55:39 +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: a10b2a3d-bd4c-4188-a04d-393281500915 X-Archives-Hash: 97031019a453bcec44ac98110941f039 commit: 500f9cbf8e5c576c893077ca6b3952cbee1b728d Author: David Seifert gentoo org> AuthorDate: Sat Aug 8 16:53:51 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Aug 8 16:53:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=500f9cbf media-sound/mp3splt-gtk: Fix building under -fno-common Closes: https://bugs.gentoo.org/707126 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: David Seifert gentoo.org> .../files/mp3splt-gtk-0.9.2-fno-common.patch | 11 +++++++++ .../mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild | 26 ++++++++++++---------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch new file mode 100644 index 00000000000..646d59008c6 --- /dev/null +++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/splitpoints_window.h ++++ b/src/splitpoints_window.h +@@ -41,7 +41,7 @@ + #include "all_includes.h" + + //!The enum telling which item is kept in which column of the splitpoint tree +-enum { ++typedef enum { + COL_CHECK = 0, + COL_DESCRIPTION = 1, + COL_MINUTES = 2, diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild index edd740e0856..9355f823068 100644 --- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild +++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit versionator autotools +inherit autotools -DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding" +DESCRIPTION="A GTK+ based utility to split mp3 and ogg files without decoding" HOMEPAGE="http://mp3splt.sourceforge.net" SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz" @@ -20,12 +20,14 @@ RDEPEND=" dev-libs/dbus-glib gstreamer? ( media-libs/gstreamer:1.0 - media-plugins/gst-plugins-meta:1.0[mp3] ) -" -DEPEND="${RDEPEND} + media-plugins/gst-plugins-meta:1.0[mp3] + )" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( sys-devel/gettext ) -" + nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}"/${PN}-0.9.2-fno-common.patch ) src_prepare() { default @@ -33,15 +35,15 @@ src_prepare() { } src_configure() { - local myconf + local myconf=() - use nls || myconf+=" --disable-nls" - use gstreamer || myconf+=" --disable-gstreamer" + use nls || myconf+=( --disable-nls ) + use gstreamer || myconf+=( --disable-gstreamer ) econf \ --disable-audacious \ --disable-gnome \ $(use_enable doc doxygen_doc) \ --disable-cutter \ - ${myconf} + "${myconf[@]}" }