Tuesday, May 27, 2025

UPDATE: easytag-2.4.3

Simple diff to make easytag happy with taglib2. Tested on amd64. OK?

Cheers Rafael

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index f4e20e63e81..a078362c48b 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -2,7 +2,7 @@ COMMENT= tag editor for various audio file formats

GNOME_PROJECT= easytag
GNOME_VERSION= 2.4.3
-REVISION= 12
+REVISION= 14

CATEGORIES= audio

@@ -11,13 +11,14 @@ PERMIT_PACKAGE= Yes

WANTLIB += ${COMPILER_LIBCXX} FLAC X11 Xau Xcomposite Xcursor
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
-WANTLIB += atk-1.0 atk-bridge-2.0 c cairo cairo-gobject crypto
-WANTLIB += epoxy execinfo expat ffi fontconfig freetype fribidi
-WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += graphite2 gtk-3 harfbuzz iconv id3 id3tag intl jpeg
-WANTLIB += m ogg opus opusfile pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre2-8 pixman-1 png speex tag vorbis vorbisfile wavpack
-WANTLIB += xcb xcb-render xcb-shm z
+WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
+WANTLIB += crypto dbus-1 epoll-shim epoxy expat ffi fontconfig
+WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gtk-3 harfbuzz iconv
+WANTLIB += id3 id3tag intl jpeg m ogg opus opusfile pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png speex
+WANTLIB += tag vorbis vorbisfile wavpack wayland-client wayland-cursor
+WANTLIB += wayland-egl xcb xcb-render xcb-shm xkbcommon z

COMPILER = base-clang ports-gcc base-gcc

diff --git a/audio/easytag/patches/patch-src_tags_gio_wrapper_cc b/audio/easytag/patches/patch-src_tags_gio_wrapper_cc
new file mode 100644
index 00000000000..d436622e01a
--- /dev/null
+++ b/audio/easytag/patches/patch-src_tags_gio_wrapper_cc
@@ -0,0 +1,174 @@
+Fix build with Taglib 2.x
+
+Based on patch from Arch Linux:
+https://gitlab.archlinux.org/archlinux/packaging/packages/easytag/-/blob/main/taglib-2.patch?ref_type=heads
+
+Index: src/tags/gio_wrapper.cc
+--- src/tags/gio_wrapper.cc.orig
++++ src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,24 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++#if TAGLIB_MAJOR_VERSION >= 2
++ TagLib::offset_t start,
++ size_t replace)
++#else
++ unsigned long start,
++ unsigned long replace)
++

No comments:

Post a Comment