gentoo auto-resync : 19:02:2025 - 00:15:15

3 files changed, 144 insertions, 0 deletions

diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 35b0b0cbc36a..7546614835de 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,3 +1,4 @@
+AUX easytag-2.4.3-c23.patch 2330 BLAKE2B 1f14d3178ea8ae9c86e2c14bae91ad29a00b2587237ec2e8adf8a5e525652d9243580a8faa54ac4a46d4d454b2634fe7886310e91670b7a04727a5c803f71f0b SHA512 29efc911b88ce2da78254e7332703bd5cd45688578542d245992fcd2911e17b469c212b43be72c9eb6a2ae9013d2f44ac5250bc467b988feb94dec6e3bc7fe64
 AUX easytag-2.4.3-fix-appdata.patch 355 BLAKE2B 5c6cfbc47933676967729e961befaf8ac816c90f15eeb6ba83eb9f392294ddca5ec5d73a94d903a8eea6f379ff77f7a5addacae1adcad62b5023e08f9b734e20 SHA512 33fda6ea703e10161deac5cb932c24d2eb41ca268a544726051ed6d93359541f30d73a18a9e5f78483e1d70d12c790928c7ab0811ca7bde5982a575a3ba3dccf
 AUX easytag-2.4.3-fix-build-taglib2.patch 6569 BLAKE2B a1486a91e418ca3701a4bd25c57979c07f5bf0fce69e2c4abeb72c1bf8654667cc64cc3d3920470aca2ae4ad7a37fbcb0bd8cb7ac53ed893c149ac923e940bdb SHA512 ad08cf0ed12ffecce4fe67eed05cb7850f984c7c5d66954d518f7cdb2ab0a3716d896b0fa01bd273fe92a5abe97f01d71eba17dabbae867501a7534c9150dbff
 AUX easytag-2.4.3-fix-check-id3.patch 1954 BLAKE2B 170fce00c7ebb33f183a61f59a45b47548c8770aa583454fdb42628470bcd0616e4d5738b3f5b50f1b824cba3e20606596511dd859b27548af7885f92035711f SHA512 08209028408640b1d9b14b9e00a22387e913b90bb9fd98daec3ab5a1351747123c05aa718148835596e14653d97e11ddb88a51762ad5adcf54871e0fdbdc64ea
@@ -5,4 +6,5 @@ AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdf
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
 EBUILD easytag-2.4.3-r6.ebuild 1971 BLAKE2B cc41ea0cdb02a1cf520f4cdf669189c8e693c3c4f65c6954534d43a0c941e76e9b48989c96a273ed5c320aaa2b9b0e435a086606bde7036dda925308ad8ece45 SHA512 835083104b3ada76d5b62ca026407c7f35210e0ccd8980f84475446740915c98934b240ea99877bfa48365ad46ee77f83eef1b6952560ff575d765e3d4634a7c
 EBUILD easytag-2.4.3-r7.ebuild 1978 BLAKE2B d4f29d576175381b0f1cbbc7c812fc2f16602a0b6e7d8ae5d16c1d24f6c9e9b1a15df78d2ac4b11ff337cc97314b54ec3670ac5cc859ae84dd7f0d4e17d56c9f SHA512 ef4c2ad432d2832d5890d54261a5f0c360d5c92bcb6e140ecdf97daeb07cc5bbb96c6c392668c61c5fb4bb44a5f34895b158e7e00485117d8b51bcbbd361a6ac
+EBUILD easytag-2.4.3-r8.ebuild 2053 BLAKE2B 2ef5db6ff0fe606943a2f9849dd76c222cb40c693ac5641b1d922767b3ac192b4b56020e77d3cc9e7a64295dae9235af1e7aacc4e6d64aebb803863e034753ea SHA512 5d6cd44854957a7c225e1e9d85439675cd6ba6e0a670f1f7f3c01c25015b2914aac5b48a2f9cd84b776aea9422c15adbaeab15397c5d2b864a9e82a333e6b689
 MISC metadata.xml 422 BLAKE2B d1415eb185e22013f0567c5553c886558d812f8edaa2c817f684d6f0c1bb04d8a7fa8fd63abf929d07e9d9f181d0dd64af3c2c2c77f5769e3a718530598d9529 SHA512 438a22ec60b4e7b2061fd6d7645b4a31b537c06fec22968b86496e85f98306227ff6025eb2afd8a0dbaa57929aa78b3f7bc4631f9232f1204e8efa3d6f16e238
diff --git a/media-sound/easytag/easytag-2.4.3-r8.ebuild b/media-sound/easytag/easytag-2.4.3-r8.ebuild
new file mode 100644
index 000000000000..c455422cab3b
--- /dev/null
+++ b/media-sound/easytag/easytag-2.4.3-r8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME2_EAUTORECONF="yes"
+inherit flag-o-matic gnome2
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+# Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78
+# is solved
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	opus? ( vorbis )
+	speex? ( vorbis )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	|| (
+		media-libs/libcanberra-gtk3
+		media-libs/libcanberra[gtk3(-)]
+	)
+	>=x11-libs/gtk+-3.10:3
+	flac? ( >=media-libs/flac-1.3:= )
+	mp3? (
+		>=media-libs/id3lib-3.8.3-r8
+		>=media-libs/libid3tag-0.15.1b-r4:=
+	)
+	mp4? ( media-libs/taglib:=[mp4(+)] )
+	opus? (
+		>=media-libs/opus-1.1
+		>=media-libs/opusfile-0.4
+	)
+	speex? ( >=media-libs/speex-1.2_rc1 )
+	vorbis? (
+		>=media-libs/libogg-1.3.1
+		>=media-libs/libvorbis-1.3.4
+	)
+	wavpack? ( >=media-sound/wavpack-4.70 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.4
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-libs/appstream-glib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.18.3.2
+	virtual/pkgconfig
+	test? (
+		>=dev-util/desktop-file-utils-0.22
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ogg-corruption.patch
+	"${FILESDIR}"/${P}-fix-build-taglib2.patch
+	"${FILESDIR}"/${P}-fix-check-id3.patch
+	"${FILESDIR}"/${P}-fix-appdata.patch
+	"${FILESDIR}"/${P}-c23.patch
+)
+
+src_configure() {
+	# bug #949814
+	filter-lto
+
+	gnome2_src_configure \
+		--disable-Werror \
+		--disable-nautilus-actions \
+		$(use_enable test appdata-validate) \
+		$(use_enable test tests) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3v23) \
+		$(use_enable vorbis ogg) \
+		$(use_enable opus) \
+		$(use_enable speex) \
+		$(use_enable flac) \
+		$(use_enable mp4) \
+		$(use_enable wavpack)
+}
diff --git a/media-sound/easytag/files/easytag-2.4.3-c23.patch b/media-sound/easytag/files/easytag-2.4.3-c23.patch
new file mode 100644
index 000000000000..431ee20da064
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.4.3-c23.patch
@@ -0,0 +1,56 @@
+The C23 patch we added to media-libs/id3lib for https://bugs.gentoo.org/949086
+means that 'bool' isn't exposed by the id3lib headers anymore (see
+commit 5b0d1e373dcd8c4f79735d033d205a6f36698c59 for the details on why)
+so we need to use 'my_bool' which *is* exposed by them instead when
+apparently making up our own interfaces here in easytag.
+
+See https://bugs.gentoo.org/949814.
+--- a/src/tags/id3lib/id3_bugfix.h
++++ b/src/tags/id3lib/id3_bugfix.h
+@@ -29,13 +29,13 @@
+ G_BEGIN_DECLS
+ 
+ #if !HAVE_DECL_ID3FIELD_SETENCODING
+-ID3_C_EXPORT bool                  CCONV ID3Field_SetEncoding    (ID3Field *field, ID3_TextEnc enc);
++ID3_C_EXPORT my_bool                  CCONV ID3Field_SetEncoding    (ID3Field *field, ID3_TextEnc enc);
+ #endif /* !HAVE_DECL_ID3FIELD_SETENCODING */
+ #if !HAVE_DECL_ID3FIELD_GETENCODING
+ ID3_C_EXPORT ID3_TextEnc           CCONV ID3Field_GetEncoding    (const ID3Field *field);
+ #endif /* !HAVE_DECL_ID3FIELD_GETENCODING */
+ #if !HAVE_DECL_ID3FIELD_ISENCODABLE
+-ID3_C_EXPORT bool                  CCONV ID3Field_IsEncodable    (const ID3Field *field);
++ID3_C_EXPORT my_bool                  CCONV ID3Field_IsEncodable    (const ID3Field *field);
+ #endif /* !HAVE_DECL_ID3FIELD_ISENCODABLE */
+ ID3_C_EXPORT ID3_FieldType         CCONV ID3Field_GetType        (const ID3Field *field);
+ //ID3_C_EXPORT ID3_FieldID           CCONV ID3Field_GetID          (const ID3Field *field);
+diff --git a/src/tags/id3lib/c_wrapper.cpp b/src/tags/id3lib/c_wrapper.cpp
+index ace7442..d7ad422 100644
+--- a/src/tags/id3lib/c_wrapper.cpp
++++ b/src/tags/id3lib/c_wrapper.cpp
+@@ -39,7 +39,7 @@ extern "C"
+   // Tag wrappers
+   //
+ 
+-  ID3_C_EXPORT bool CCONV
++  ID3_C_EXPORT my_bool CCONV
+   ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc)
+   {
+     bool changed = false;
+@@ -61,7 +61,7 @@ extern "C"
+     return enc;
+   }
+ 
+-  ID3_C_EXPORT bool CCONV
++  ID3_C_EXPORT my_bool CCONV
+   ID3Field_IsEncodable(const ID3Field *field)
+   {
+     bool isEncodable = false;
+@@ -116,7 +116,7 @@ extern "C"
+   // Call with :
+   //    Mp3_Headerinfo* headerInfo = malloc(sizeof(Mp3_Headerinfo));
+   //    ID3Tag_GetMp3HeaderInfo(tag, headerInfo);
+-  /*ID3_C_EXPORT bool CCONV
++  /*ID3_C_EXPORT my_bool CCONV
+   ID3Tag_GetMp3HeaderInfo(ID3Tag *tag, Mp3_Headerinfo* headerInfo)
+   {
+     const Mp3_Headerinfo* rem_headerInfo = NULL;