commit: fe73f24f8e8285703272b44191e171ed75f86178 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Tue Jan 14 11:26:47 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 29 23:36:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe73f24f
media-sound/easytag: fix detection for id3lib see https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/3 eautoreconf fixed location for metainfo too Closes: https://bugs.gentoo.org/947107 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/40126 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...tag-2.4.3-r7.ebuild => easytag-2.4.3-r8.ebuild} | 10 ++---- .../files/easytag-2.4.3-fix-check-id3.patch | 42 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/media-sound/easytag/easytag-2.4.3-r7.ebuild b/media-sound/easytag/easytag-2.4.3-r8.ebuild similarity index 91% rename from media-sound/easytag/easytag-2.4.3-r7.ebuild rename to media-sound/easytag/easytag-2.4.3-r8.ebuild index 594ad5101f03..1267431fa7b2 100644 --- a/media-sound/easytag/easytag-2.4.3-r7.ebuild +++ b/media-sound/easytag/easytag-2.4.3-r8.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +GNOME2_EAUTORECONF="yes" inherit gnome2 DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags" @@ -60,6 +61,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-ogg-corruption.patch "${FILESDIR}"/${P}-fix-build-taglib2.patch + "${FILESDIR}"/${P}-fix-check-id3.patch ) src_configure() { @@ -77,9 +79,3 @@ src_configure() { $(use_enable mp4) \ $(use_enable wavpack) } - -src_install() { - gnome2_src_install - # https://gitlab.gnome.org/GNOME/easytag/-/issues/82 - mv "${ED}"/usr/share/{appdata,metainfo} || die -} diff --git a/media-sound/easytag/files/easytag-2.4.3-fix-check-id3.patch b/media-sound/easytag/files/easytag-2.4.3-fix-check-id3.patch new file mode 100644 index 000000000000..f096c936a8ac --- /dev/null +++ b/media-sound/easytag/files/easytag-2.4.3-fix-check-id3.patch @@ -0,0 +1,42 @@ +https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/3.patch +From a41d48c8849aff8f6bc19ae1f449d8509c20d3ae Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan <[email protected]> +Date: Sat, 20 Jul 2019 15:42:05 +0800 +Subject: [PATCH] Use C++ linker to check for id3lib + +Instead of manually adding -lstdc++ to the linker command line, which +isn't going to work if the C++ runtime library isn't provided by GCC, +use the C++ compiler driver to link the program to avoid the need to +figure out the name of the C++ runtime library ourselves. + +This fixes the check on FreeBSD, which uses Clang and LLVM libc++ by +default. +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8d93ef65..3603da27 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -254,7 +254,8 @@ AS_IF([test "x$have_mp3" != "xno"], + AS_IF([test "x$have_mp3" = "xyes" -a "x$enable_id3v23" != "xno"], + dnl Check which libs are required by id3lib, libid3.la is fucked up + [LIBS_SAVE="$LIBS" +- AC_SEARCH_LIBS([ID3Tag_Link], ["id3" "id3 -lstdc++" "id3 -lz" "id3 -lz -lstdc++"], [have_id3lib=yes], [have_id3lib=no]) ++ AC_LANG_PUSH([C++]) ++ AC_SEARCH_LIBS([ID3Tag_Link], ["id3" "id3 -lz"], [have_id3lib=yes], [have_id3lib=no]) + + dnl expected version for cross compiling + ID3LIB_MAJOR=3 +@@ -272,6 +273,7 @@ AS_IF([test "x$have_mp3" = "xyes" -a "x$enable_id3v23" != "xno"], + fclose(output); + return 0; + ]])], [. ./conftest.id3; AC_MSG_RESULT([${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}])], [AC_MSG_ERROR([could not determine id3lib version])], [echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"]) ++ AC_LANG_POP([C++]) + LIBS="$LIBS_SAVE" + AC_DEFINE_UNQUOTED([ID3LIB_MAJOR], [$ID3LIB_MAJOR], [id3lib major version]) + AC_DEFINE_UNQUOTED([ID3LIB_MINOR], [$ID3LIB_MINOR], [id3lib minor version]) +-- +GitLab +
