[gentoo-commits] repo/gentoo:master commit in: media-sound/ripperx/, media-sound/ripperx/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/ripperx/, media-sound/ripperx/files/

[Miroslav Šulc]

commit:     35d25f36ce62f15dd1b5d76d40f946692f53a032
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 10:05:42 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 10:05:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d25f36

media-sound/ripperx: fixed incompatible pointer + sorted vars

Closes: https://bugs.gentoo.org/919258
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../ripperx/files/ripperx-2.7.3-incompatible-pointer.patch    | 11 +++++++++++
 media-sound/ripperx/ripperx-2.7.3.ebuild                      |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/media-sound/ripperx/files/ripperx-2.7.3-incompatible-pointer.patch b/media-sound/ripperx/files/ripperx-2.7.3-incompatible-pointer.patch
new file mode 100644
index 000000000000..e026df64486d
--- /dev/null
+++ b/media-sound/ripperx/files/ripperx-2.7.3-incompatible-pointer.patch
@@ -0,0 +1,11 @@
+--- a/src/misc_utils.c
++++ b/src/misc_utils.c
+@@ -792,7 +792,7 @@ int create_filenames_from_format(_main_data *main_data)
+ 		config.mp3_path[i] = 0;
+ 	if (config.cddb_config.make_directories && config.cddb_config.dir_format_string[0])
+ 	{
+-		rc2 = parse_rx_format_string( &df,
++		rc2 = parse_rx_format_string( (char **)&df,
+ 				config.cddb_config.dir_format_string, -1, 
+ 				main_data->disc_artist, main_data->disc_title, main_data->disc_year, "" );
+ 		if ( rc2 < 0 ) {

diff --git a/media-sound/ripperx/ripperx-2.7.3.ebuild b/media-sound/ripperx/ripperx-2.7.3.ebuild
index 1b2d20834a94..998368e6ddc0 100644
--- a/media-sound/ripperx/ripperx-2.7.3.ebuild
+++ b/media-sound/ripperx/ripperx-2.7.3.ebuild
@@ -9,6 +9,7 @@ DESCRIPTION="GTK program to rip CD audio tracks to Ogg, MP3 or FLAC"
 HOMEPAGE="https://sourceforge.net/projects/ripperx"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P/x/X}.tar.gz"
 
+S="${WORKDIR}/${P/x/X}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
@@ -24,12 +25,11 @@ BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}/${P/x/X}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-ceilf-underlink.patch
 	"${FILESDIR}"/${P}-ldflags.patch
 	"${FILESDIR}"/${P}-pkgconfig.patch
+	"${FILESDIR}"/${P}-incompatible-pointer.patch
 )
 
 src_configure() {