* [gentoo-commits] repo/gentoo:master commit in: media-sound/easytag/files/, media-sound/easytag/
@ 2018-12-02 18:43 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-12-02 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 645351f868ac449b80ad507dd46ad0ccb1c3874e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 17:41:23 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 18:43:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645351f8
media-sound/easytag: Fix ogg corruption
Non-maintainer commit. (Revert) Patch taken from openSUSE.
See also: https://bugzilla.gnome.org/show_bug.cgi?id=776110
Reported-by: Florian Berger <florian.berger <AT> posteo.de>
Thanks-to: Patrice Levesque <gentoo.wayne <AT> ptaff.ca>
Closes: https://bugs.gentoo.org/617818
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/easytag/easytag-2.4.3-r1.ebuild | 72 ++++++
.../files/easytag-2.4.3-ogg-corruption.patch | 246 +++++++++++++++++++++
2 files changed, 318 insertions(+)
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r1.ebuild
new file mode 100644
index 00000000000..30e559c81cd
--- /dev/null
+++ b/media-sound/easytag/easytag-2.4.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+inherit 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="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="
+ opus? ( vorbis )
+ speex? ( vorbis )
+"
+
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ 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-1.9.1[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}
+ app-text/docbook-xml-dtd:4.4
+ app-text/yelp-tools
+ dev-libs/libxml2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50
+ >=sys-devel/gettext-0.18.3.2
+ virtual/pkgconfig
+ test? (
+ dev-libs/appstream-glib
+ >=dev-util/desktop-file-utils-0.22
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-ogg-corruption.patch" )
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-Werror \
+ $(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-ogg-corruption.patch b/media-sound/easytag/files/easytag-2.4.3-ogg-corruption.patch
new file mode 100644
index 00000000000..7c4a9f619c3
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.4.3-ogg-corruption.patch
@@ -0,0 +1,246 @@
+From e5c640ca3f259f1b74e716723345521987a7bd68 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Wed, 9 Nov 2016 17:29:34 +0000
+Subject: Do not maintain an open handle on Ogg files
+
+Only keep a file open for reading long enough to read the necessary
+items from the file. Remove the file input stream from EtOggState, as
+it is no longer preserved across function calls.
+
+ src/tags/vcedit.c | 92 ++++++++++++++++++++++---------------------------------
+ 1 file changed, 36 insertions(+), 56 deletions(-)
+
+--- b/src/tags/vcedit.c
++++ a/src/tags/vcedit.c
+@@ -35,6 +35,7 @@
+ struct _EtOggState
+ {
+ /*< private >*/
++ GFileInputStream *in;
+ #ifdef ENABLE_SPEEX
+ SpeexHeader *si;
+ #endif
+@@ -125,6 +126,11 @@
+ }
+ #endif /* ENABLE_OPUS */
+
++ if (state->in)
++ {
++ g_object_unref (state->in);
++ }
++
+ memset (state, 0, sizeof (*state));
+ }
+
+@@ -239,7 +245,6 @@
+
+ static gboolean
+ _fetch_next_packet (EtOggState *s,
+- GInputStream *istream,
+ ogg_packet *p,
+ ogg_page *page,
+ GError **error)
+@@ -269,8 +274,8 @@
+ while (ogg_sync_pageout (s->oy, page) <= 0)
+ {
+ buffer = ogg_sync_buffer (s->oy, CHUNKSIZE);
++ bytes = g_input_stream_read (G_INPUT_STREAM (s->in), buffer,
++ CHUNKSIZE, NULL, error);
+- bytes = g_input_stream_read (istream, buffer, CHUNKSIZE, NULL,
+- error);
+ ogg_sync_wrote (s->oy, bytes);
+
+ if(bytes == 0)
+@@ -303,7 +308,7 @@
+
+ g_assert (error == NULL || *error == NULL);
+ ogg_stream_pagein (s->os, page);
++ return _fetch_next_packet (s, p, page, error);
+- return _fetch_next_packet (s, istream, p, page, error);
+ }
+ }
+
+@@ -402,13 +407,14 @@
+ return FALSE;
+ }
+
++ state->in = istream;
+ state->oy = g_slice_new (ogg_sync_state);
+ ogg_sync_init (state->oy);
+
+ while(1)
+ {
+ buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
++ bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
+- bytes = g_input_stream_read (G_INPUT_STREAM (istream), buffer,
+ CHUNKSIZE, NULL, error);
+ if (bytes == -1)
+ {
+@@ -648,7 +654,7 @@
+ }
+
+ buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
++ bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
+- bytes = g_input_stream_read (G_INPUT_STREAM (istream), buffer,
+ CHUNKSIZE, NULL, error);
+
+ if (bytes == -1)
+@@ -670,14 +676,11 @@
+
+ /* Headers are done! */
+ g_assert (error == NULL || *error == NULL);
+- /* TODO: Handle error during stream close. */
+- g_object_unref (istream);
+
+ return TRUE;
+
+ err:
+ g_assert (error == NULL || *error != NULL);
+- g_object_unref (istream);
+ vcedit_clear_internals (state);
+ return FALSE;
+ }
+@@ -699,7 +702,6 @@
+ char *buffer;
+ int bytes;
+ int needflush = 0, needout = 0;
+- GFileInputStream *istream;
+ GOutputStream *ostream;
+ gchar *buf;
+ gsize size;
+@@ -707,22 +709,11 @@
+
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
++ fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
++ G_FILE_QUERY_INFO_NONE, NULL, error);
+- istream = g_file_read (file, NULL, error);
+-
+- if (!istream)
+- {
+- g_assert (error == NULL || *error != NULL);
+- return FALSE;
+- }
+-
+- fileinfo = g_file_input_stream_query_info (istream,
+- G_FILE_ATTRIBUTE_STANDARD_SIZE,
+- NULL, error);
+-
+ if (!fileinfo)
+ {
+ g_assert (error == NULL || *error != NULL);
+- g_object_unref (istream);
+ return FALSE;
+ }
+
+@@ -783,8 +774,7 @@
+ }
+ }
+
++ while (_fetch_next_packet (state, &op, &ogin, error))
+- while (_fetch_next_packet (state, G_INPUT_STREAM (istream), &op, &ogin,
+- error))
+ {
+ if (needflush)
+ {
+@@ -960,7 +950,7 @@
+ {
+ /* We copy the rest of the stream (other logical streams)
+ * through, a page at a time. */
++ while(1)
+- while (1)
+ {
+ result = ogg_sync_pageout (state->oy, &ogout);
+
+@@ -999,7 +989,7 @@
+
+ buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
+
++ bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
+- bytes = g_input_stream_read (G_INPUT_STREAM (istream), buffer,
+ CHUNKSIZE, NULL, error);
+
+ if (bytes == -1)
+@@ -1017,19 +1007,11 @@
+ }
+ }
+
++
+ cleanup:
+ ogg_stream_clear (&streamout);
+ ogg_packet_clear (&header_comments);
+
+- if (!g_input_stream_close (G_INPUT_STREAM (istream), NULL, error))
+- {
+- /* Ignore the _close() failure, and try the write anyway. */
+- g_warning ("Error closing Ogg file for reading: %s",
+- (*error)->message);
+- g_clear_error (error);
+- }
+-
+- g_object_unref (istream);
+ g_free (state->mainbuf);
+ g_free (state->bookbuf);
+ state->mainbuf = state->bookbuf = NULL;
+@@ -1063,13 +1045,41 @@
+ buf = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (ostream));
+ size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream));
+
++ /* At least on Windows, writing to a file with an open-for-reading stream
++ * fails, so close the input stream before writing to the file. */
++ if (!g_input_stream_close (G_INPUT_STREAM (state->in), NULL, error))
++ {
++ /* Ignore the _close() failure, and try the write anyway. */
++ g_warning ("Error closing Ogg file for reading: %s",
++ (*error)->message);
++ g_clear_error (error);
++ }
++
++ g_object_unref (state->in);
++ state->in = NULL;
++
+ /* Write the in-memory data back out to the original file. */
+ if (!g_file_replace_contents (file, buf, size, NULL, FALSE,
+ G_FILE_CREATE_NONE, NULL, NULL, error))
+ {
++ GError *tmp_error = NULL;
++
+ g_object_unref (ostream);
+ g_free (buf);
+
++ /* Re-open the file for reading, to keep the internal state
++ * consistent. */
++ state->in = g_file_read (file, NULL, &tmp_error);
++
++ if (!state->in)
++ {
++ g_warning ("Error opening Ogg file for reading after write failure: %s",
++ tmp_error->message);
++ g_clear_error (&tmp_error);
++ g_assert (error == NULL || *error != NULL);
++ return FALSE;
++ }
++
+ g_assert (error == NULL || *error != NULL);
+ return FALSE;
+ }
+@@ -1077,6 +1087,16 @@
+ g_free (buf);
+ g_object_unref (ostream);
+
++ /* Re-open the file, now that the write has completed. */
++ state->in = g_file_read (file, NULL, error);
++
++ if (!state->in)
++ {
++ g_assert (error == NULL || *error != NULL);
++ return FALSE;
++ }
++
++
+ return TRUE;
+ }
+
+--
+cgit v0.12
+
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/easytag/files/, media-sound/easytag/
@ 2018-12-02 18:43 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-12-02 18:43 UTC (permalink / raw
To: gentoo-commits
commit: b9df34ae7f374cb3d447ef6d5dff50d763b49633
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 18:16:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 18:43:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9df34ae
media-sound/easytag: Drop old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/easytag/Manifest | 1 -
media-sound/easytag/easytag-2.1.8.ebuild | 59 ------------------
media-sound/easytag/easytag-2.4.3.ebuild | 71 ----------------------
.../easytag/files/easytag-2.1.8-desktop.patch | 11 ----
media-sound/easytag/files/easytag-2.1.8-docs.patch | 14 -----
.../easytag/files/easytag-2.1.8-taglib.patch | 11 ----
.../easytag/files/easytag-2.1.8-werror.patch | 11 ----
7 files changed, 178 deletions(-)
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 597967490d3..e2441ec4eb5 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,2 +1 @@
-DIST easytag-2.1.8.tar.xz 2459496 BLAKE2B 4ba27728071a3a87af72a37cd0337d361ae690c42a70690ef935d4a0fdf27904c0928b448f64fac61194e02f18e04ea26c600f65365e8ea7aa4d76128f7a5d82 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48
DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
diff --git a/media-sound/easytag/easytag-2.1.8.ebuild b/media-sound/easytag/easytag-2.1.8.ebuild
deleted file mode 100644
index b7b085725ff..00000000000
--- a/media-sound/easytag/easytag-2.1.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools gnome.org xdg-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://projects.gnome.org/easytag/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac mp3 mp4 nls speex vorbis wavpack"
-
-RDEPEND=">=x11-libs/gtk+-2.24:2
- mp3? (
- >=media-libs/id3lib-3.8.3-r7
- media-libs/libid3tag
- )
- flac? (
- media-libs/flac
- media-libs/libvorbis
- )
- mp4? ( media-libs/taglib[mp4(+)] )
- vorbis? ( media-libs/libvorbis )
- wavpack? ( media-sound/wavpack )
- speex? (
- media-libs/speex
- media-libs/libvorbis
- )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-werror.patch
- epatch "${FILESDIR}"/${P}-taglib.patch
- epatch "${FILESDIR}"/${P}-docs.patch
- eautoreconf
-}
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack)
-}
-
-pkg_postinst() { xdg_desktop_database_update; }
-pkg_postrm() { xdg_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.4.3.ebuild b/media-sound/easytag/easytag-2.4.3.ebuild
deleted file mode 100644
index c5aaafa076e..00000000000
--- a/media-sound/easytag/easytag-2.4.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit 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="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="
- opus? ( vorbis )
- speex? ( vorbis )
-"
-
-RDEPEND="
- >=dev-libs/glib-2.38:2
- 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-1.9.1[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}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- dev-libs/appstream-glib
- >=dev-util/desktop-file-utils-0.22
- )
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-Werror \
- $(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.1.8-desktop.patch b/media-sound/easytag/files/easytag-2.1.8-desktop.patch
deleted file mode 100644
index 6cc72765a65..00000000000
--- a/media-sound/easytag/files/easytag-2.1.8-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- easytag.desktop.in
-+++ easytag.desktop.in
-@@ -6,7 +6,7 @@
- Type=Application
- Icon=easytag
- Categories=GTK;AudioVideo;AudioVideoEditing;
--MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
-+MimeType=audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
- Exec=easytag %F
- Terminal=false
- StartupNotify=true
diff --git a/media-sound/easytag/files/easytag-2.1.8-docs.patch b/media-sound/easytag/files/easytag-2.1.8-docs.patch
deleted file mode 100644
index 1ecb076d0d3..00000000000
--- a/media-sound/easytag/files/easytag-2.1.8-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -197,11 +197,6 @@
- $(AM_V_at)$(POST_UNINSTALL)
- test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)"
-
--dist_doc_DATA = \
-- HACKING \
-- THANKS \
-- TODO
--
- dist_noinst_DATA = \
- $(desktop_in_files) \
- $(easytag_headers) \
diff --git a/media-sound/easytag/files/easytag-2.1.8-taglib.patch b/media-sound/easytag/files/easytag-2.1.8-taglib.patch
deleted file mode 100644
index d565a7615d7..00000000000
--- a/media-sound/easytag/files/easytag-2.1.8-taglib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- easytag-2.1.8/configure.ac
-+++ easytag-2.1.8/configure.ac
-@@ -202,7 +202,7 @@
- TAGLIB_DEPS="taglib_c >= 1.6.0"
- AS_IF([test "x$enable_mp4" != "xno"],
- [PKG_CHECK_EXISTS([$TAGLIB_DEPS], [have_taglib=yes], [have_taglib=no])],
-- [have_wavpack=no])
-+ [have_taglib=no])
-
- AS_IF([test "x$have_taglib" != "xno"],
- [AC_DEFINE([ENABLE_MP4], [], [Define for taglib MP4 support])],
diff --git a/media-sound/easytag/files/easytag-2.1.8-werror.patch b/media-sound/easytag/files/easytag-2.1.8-werror.patch
deleted file mode 100644
index d7a77066503..00000000000
--- a/media-sound/easytag/files/easytag-2.1.8-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -239,7 +239,7 @@
- AC_MSG_RESULT([$have_ws2])])
-
- dnl Check that the compiler accepts the given warning flags.
--warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"
-+warning_flags="-Wall -Wstrict-prototypes -Wnested-externs"
-
- realsave_CFLAGS="$CFLAGS"
- for option in $warning_flags; do
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/easytag/files/, media-sound/easytag/
@ 2025-01-29 23:36 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-01-29 23:36 UTC (permalink / raw
To: gentoo-commits
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 <lantw@src.gnome.org>
+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
+
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/easytag/files/, media-sound/easytag/
@ 2025-01-30 16:18 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-01-30 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 1e1c0d83035ef7e86bd30ca54737ef2a0e017957
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jan 30 08:22:27 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 16:17:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1c0d83
media-sound/easytag: fix dep and tests
appstream-glib is required even without test enabled
fix appdata.xml for testing
Closes: https://bugs.gentoo.org/949060
Closes: https://bugs.gentoo.org/708466
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/40378
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/easytag/easytag-2.4.3-r7.ebuild | 3 ++-
media-sound/easytag/files/easytag-2.4.3-fix-appdata.patch | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/media-sound/easytag/easytag-2.4.3-r7.ebuild b/media-sound/easytag/easytag-2.4.3-r7.ebuild
index 3d22bac4869f..4b8b3470b368 100644
--- a/media-sound/easytag/easytag-2.4.3-r7.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r7.ebuild
@@ -48,13 +48,13 @@ 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-libs/appstream-glib
>=dev-util/desktop-file-utils-0.22
)"
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}"/${P}-ogg-corruption.patch
"${FILESDIR}"/${P}-fix-build-taglib2.patch
"${FILESDIR}"/${P}-fix-check-id3.patch
+ "${FILESDIR}"/${P}-fix-appdata.patch
)
src_configure() {
diff --git a/media-sound/easytag/files/easytag-2.4.3-fix-appdata.patch b/media-sound/easytag/files/easytag-2.4.3-fix-appdata.patch
new file mode 100644
index 000000000000..e0fb19211cad
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.4.3-fix-appdata.patch
@@ -0,0 +1,11 @@
+--- a/data/easytag.appdata.xml.in
++++ b/data/easytag.appdata.xml.in
+@@ -30,4 +30,8 @@
+ </kudos>
+ <update_contact>amigadave@amigadave.com</update_contact>
+ <translation type="gettext">easytag</translation>
++ <content_rating type="oars-1.1" />
++ <releases>
++ <release version="2.4.3" date="2016-12-05"/>
++ </releases>
+ </component>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-30 16:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-02 18:43 [gentoo-commits] repo/gentoo:master commit in: media-sound/easytag/files/, media-sound/easytag/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-12-02 18:43 Andreas Sturmlechner
2025-01-29 23:36 Andreas Sturmlechner
2025-01-30 16:18 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox