diff --git a/audio/easytag/files/patch-src_tags_gio__wrapper.cc b/audio/easytag/files/patch-src_tags_gio__wrapper.cc
index e1fa5d491485..4f85cd38dd40 100644
--- a/audio/easytag/files/patch-src_tags_gio__wrapper.cc
+++ b/audio/easytag/files/patch-src_tags_gio__wrapper.cc
@@ -1,105 +1,173 @@
 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
 
 --- src/tags/gio_wrapper.cc.orig	2016-06-24 14:57:32 UTC
 +++ src/tags/gio_wrapper.cc
 @@ -47,11 +47,11 @@ TagLib::ByteVector
  }
  
  TagLib::ByteVector
 -GIO_InputStream::readBlock (TagLib::ulong len)
-+GIO_InputStream::readBlock (unsigned long 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::insert (TagLib::ByteVector const &dat
  
  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)
 +#endif
 +
  {
      g_warning ("%s", "Trying to write to read-only file!");
  }
  
  void
 -GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
 +#if TAGLIB_MAJOR_VERSION >= 2
 +GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
 +#else
 +GIO_InputStream::removeBlock (unsigned long start, unsigned long len)
 +#endif
  {
      g_warning ("%s", "Trying to write to read-only file!");
  }
+@@ -95,7 +105,7 @@ void
+ }
+ 
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+     if (error)
+     {
+@@ -133,13 +143,13 @@ GIO_InputStream::clear ()
+     }
+ }
+ 
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+     return g_seekable_tell (G_SEEKABLE (stream));
+ }
+ 
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+     if (error)
+@@ -161,7 +171,7 @@ void
+ }
+ 
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+     g_warning ("%s", "Trying to truncate read-only file");
+ }
 @@ -200,11 +210,11 @@ TagLib::ByteVector
  }
  
  TagLib::ByteVector
 -GIO_IOStream::readBlock (TagLib::ulong len)
-+GIO_IOStream::readBlock (unsigned long len)
++GIO_IOStream::readBlock (size_t len)
  {
      if (error)
      {
 -        return TagLib::ByteVector::null;
 +        return TagLib::ByteVector();
      }
  
      gsize bytes = 0;
 @@ -239,8 +249,14 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
  
  void
  GIO_IOStream::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)
 +#endif
 +
  {
      if (error)
      {
 @@ -278,7 +294,7 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
      seek (0);
  
      while (g_input_stream_read_all (istream, buffer,
 -                                    MIN (G_N_ELEMENTS (buffer), start),
 +                                    MIN (G_N_ELEMENTS (buffer), (unsigned long)start),
                                      &r, NULL, &error) && r > 0)
      {
          gsize w;
 @@ -351,9 +367,13 @@ void
  }
  
  void
 -GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
 +#if TAGLIB_MAJOR_VERSION >= 2
 +GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
 +#else
 +GIO_IOStream::removeBlock (unsigned long start, unsigned long len)
 +#endif
  {
 -    if (start + len >= (TagLib::ulong)length ())
 +    if (start + len >= (unsigned long)length ())
      {
          truncate (start);
          return;
+@@ -400,7 +420,7 @@ void
+ }
+ 
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+     if (error)
+     {
+@@ -434,13 +454,13 @@ GIO_IOStream::clear ()
+     g_clear_error (&error);
+ }
+ 
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+     return g_seekable_tell (G_SEEKABLE (stream));
+ }
+ 
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+     long rv = -1;
+@@ -464,7 +484,7 @@ void
+ }
+ 
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+     if (error)
+     {
diff --git a/audio/easytag/files/patch-src_tags_gio__wrapper.h b/audio/easytag/files/patch-src_tags_gio__wrapper.h
index fdb8c1f36362..75cb496d374d 100644
--- a/audio/easytag/files/patch-src_tags_gio__wrapper.h
+++ b/audio/easytag/files/patch-src_tags_gio__wrapper.h
@@ -1,45 +1,68 @@
 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
 
 --- src/tags/gio_wrapper.h.orig	2016-06-24 14:57:32 UTC
 +++ src/tags/gio_wrapper.h
-@@ -33,10 +33,15 @@ class GIO_InputStream : public TagLib::IOStream (publi
+@@ -33,17 +33,22 @@ class GIO_InputStream : public TagLib::IOStream (publi
      GIO_InputStream (GFile *file_);
      virtual ~GIO_InputStream ();
      virtual TagLib::FileName name () const;
 -    virtual TagLib::ByteVector readBlock (TagLib::ulong length);
-+    virtual TagLib::ByteVector readBlock (unsigned long length);
++    virtual TagLib::ByteVector readBlock (size_t length);
      virtual void writeBlock (TagLib::ByteVector const &data);
 -    virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
 -    virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
 +#if TAGLIB_MAJOR_VERSION >= 2
 +    virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
 +    virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
 +#else
 +    virtual void insert (TagLib::ByteVector const &data, unsigned long start = 0, unsigned long replace = 0);
 +    virtual void removeBlock (unsigned long start = 0, unsigned long length = 0);
 +#endif
      virtual bool readOnly () const;
      virtual bool isOpen () const;
-     virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
-@@ -61,10 +66,15 @@ class GIO_IOStream : public TagLib::IOStream (public)
+-    virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++    virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+     virtual void clear ();
+-    virtual long int tell () const;
+-    virtual long int length ();
+-    virtual void truncate (long int length);
++    virtual TagLib::offset_t tell () const;
++    virtual TagLib::offset_t length ();
++    virtual void truncate (TagLib::offset_t length);
+ 
+     virtual const GError *getError() const;
+ 
+@@ -61,17 +66,23 @@ class GIO_IOStream : public TagLib::IOStream (public)
      GIO_IOStream (GFile *file_);
      virtual ~GIO_IOStream ();
      virtual TagLib::FileName name () const;
 -    virtual TagLib::ByteVector readBlock (TagLib::ulong length);
-+    virtual TagLib::ByteVector readBlock (unsigned long length);
++    virtual TagLib::ByteVector readBlock (size_t length);
++
      virtual void writeBlock (TagLib::ByteVector const &data);
 -    virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
 -    virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
 +#if TAGLIB_MAJOR_VERSION >= 2
 +    virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
 +    virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
 +#else
 +    virtual void insert (TagLib::ByteVector const &data, unsigned long start = 0, unsigned long replace = 0);
 +    virtual void removeBlock (unsigned long start = 0, unsigned long len = 0);
 +#endif
      virtual bool readOnly () const;
      virtual bool isOpen () const;
-     virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+-    virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++    virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+     virtual void clear ();
+-    virtual long int tell () const;
+-    virtual long int length ();
+-    virtual void truncate (long int length);
++    virtual TagLib::offset_t tell () const;
++    virtual TagLib::offset_t length ();
++    virtual void truncate (TagLib::offset_t length);
+ 
+     virtual const GError *getError() const;
+