mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

audio/easytag: fix build on i386

Browse Source 
After updating audio/taglib to 2.0.1, easytag stopped building on i386.
Apparently, this is happening because taglib started using types such as
"offset_t" and "size_t" in its interfaces, causing types mismatch on
i386.

Reported by:	pkg-fallout
This commit is contained in:
Roman Bogorodskiy 2024-06-16 15:29:00 +02:00
parent c574df1456
commit 37ab807bb1
2 changed files with 99 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
audio/easytag/files/patch-src_tags_gio__wrapper.cc
View File

@ -10,7 +10,7 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/easytag/-/blob/main/ta
TagLib::ByteVector
-GIO_InputStream::readBlock (TagLib::ulong len)
+GIO_InputStream::readBlock (unsigned long len)
+GIO_InputStream::readBlock (size_t len)
{
if (error)
{
@ -47,12 +47,46 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/easytag/-/blob/main/ta
{
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)
{
@ -103,3 +137,37 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/easytag/-/blob/main/ta
{
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)
{

35
audio/easytag/files/patch-src_tags_gio__wrapper.h
View File

@ -5,12 +5,12 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/easytag/-/blob/main/ta
--- 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);
@ -23,13 +23,25 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/easytag/-/blob/main/ta
+#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);
@ -42,4 +54,15 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/easytag/-/blob/main/ta
+#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;