| 1 |
commit: 500f9cbf8e5c576c893077ca6b3952cbee1b728d |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 8 16:53:51 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 8 16:53:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=500f9cbf |
| 7 |
|
| 8 |
media-sound/mp3splt-gtk: Fix building under -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/707126 |
| 11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/mp3splt-gtk-0.9.2-fno-common.patch | 11 +++++++++ |
| 15 |
.../mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild | 26 ++++++++++++---------- |
| 16 |
2 files changed, 25 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..646d59008c6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch |
| 23 |
@@ -0,0 +1,11 @@ |
| 24 |
+--- a/src/splitpoints_window.h |
| 25 |
++++ b/src/splitpoints_window.h |
| 26 |
+@@ -41,7 +41,7 @@ |
| 27 |
+ #include "all_includes.h" |
| 28 |
+ |
| 29 |
+ //!The enum telling which item is kept in which column of the splitpoint tree |
| 30 |
+-enum { |
| 31 |
++typedef enum { |
| 32 |
+ COL_CHECK = 0, |
| 33 |
+ COL_DESCRIPTION = 1, |
| 34 |
+ COL_MINUTES = 2, |
| 35 |
|
| 36 |
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 |
| 37 |
index edd740e0856..9355f823068 100644 |
| 38 |
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild |
| 39 |
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild |
| 40 |
@@ -1,11 +1,11 @@ |
| 41 |
# Copyright 1999-2020 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
-EAPI=6 |
| 45 |
+EAPI=7 |
| 46 |
|
| 47 |
-inherit versionator autotools |
| 48 |
+inherit autotools |
| 49 |
|
| 50 |
-DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding" |
| 51 |
+DESCRIPTION="A GTK+ based utility to split mp3 and ogg files without decoding" |
| 52 |
HOMEPAGE="http://mp3splt.sourceforge.net" |
| 53 |
SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz" |
| 54 |
|
| 55 |
@@ -20,12 +20,14 @@ RDEPEND=" |
| 56 |
dev-libs/dbus-glib |
| 57 |
gstreamer? ( |
| 58 |
media-libs/gstreamer:1.0 |
| 59 |
- media-plugins/gst-plugins-meta:1.0[mp3] ) |
| 60 |
-" |
| 61 |
-DEPEND="${RDEPEND} |
| 62 |
+ media-plugins/gst-plugins-meta:1.0[mp3] |
| 63 |
+ )" |
| 64 |
+DEPEND="${RDEPEND}" |
| 65 |
+BDEPEND=" |
| 66 |
virtual/pkgconfig |
| 67 |
- nls? ( sys-devel/gettext ) |
| 68 |
-" |
| 69 |
+ nls? ( sys-devel/gettext )" |
| 70 |
+ |
| 71 |
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-fno-common.patch ) |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
default |
| 75 |
@@ -33,15 +35,15 @@ src_prepare() { |
| 76 |
} |
| 77 |
|
| 78 |
src_configure() { |
| 79 |
- local myconf |
| 80 |
+ local myconf=() |
| 81 |
|
| 82 |
- use nls || myconf+=" --disable-nls" |
| 83 |
- use gstreamer || myconf+=" --disable-gstreamer" |
| 84 |
+ use nls || myconf+=( --disable-nls ) |
| 85 |
+ use gstreamer || myconf+=( --disable-gstreamer ) |
| 86 |
|
| 87 |
econf \ |
| 88 |
--disable-audacious \ |
| 89 |
--disable-gnome \ |
| 90 |
$(use_enable doc doxygen_doc) \ |
| 91 |
--disable-cutter \ |
| 92 |
- ${myconf} |
| 93 |
+ "${myconf[@]}" |
| 94 |
} |
Archives