From nobody Sun Jun 16 13:47:57 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W2DqK5g1Dz5Nq3p; Sun, 16 Jun 2024 13:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2DqK57j0z45f3; Sun, 16 Jun 2024 13:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718545677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tjOBW/oZJjnl6ySm8ahneBdh73LV7rpHdmPuGhQOUY=; b=XjfcHUI5O9NCQRrnWV7/f8DTf4mJmAAaNeGBLyTOr8+/PsaiNfY6ZGokTD8AP0lq2jczuf wmryawJyz3SSSQiUf97Xle7uDH6KJHIicxrUGbEijhOFV5KMoKKFPGkjhLr+B1VtW1nfb+ N5nOaxXCBN9QqaqxZmfAIrJzFlVGqsBKrpDFN63uV0fpdHJYsm/OGwHhS6evbS/NCNKdJ6 B9kRDSzQm/wAY4Oc7Yprhv1DtBXDlRyikMPLG7oTw5xT7bupCgApQ+0b7mofzRYSGx2swY 9kzN9TvshAj33oUMJdXLcPvG7CFFOOrz5Th5ICFHJPrXsBzsrXktY7HOY272Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718545677; a=rsa-sha256; cv=none; b=MwyuZpNph2Bw2WWFF3ljkRGgUZlozDrcOJoCWdmPZKwwnD25fM+JQEfNJW7I3h9S9Fa2/l N0CFNTFRbl83Ys3Dn1tuVqRDS09W1fLfD+yFxDK4ANf3dcNCdCYHi6NKO5icFknBQr8R6d i2bbGDUgwlghwuaVelajQopPiTcJAqUkU6VOz05bE3pzXFVGxVJkIK2T6wS/nFc9cxGFe/ N5erIVegO5lK+vVIy60/RRXof1mVP+plUbQ2RlROM49YZOnjohTuIpYSjx1wphwaToC2CY umo7Cn36HQgUS748cmxIiyPhroVRb44EXpm+H7bHtDatGhC/t5wU0JFNsdAlFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718545677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tjOBW/oZJjnl6ySm8ahneBdh73LV7rpHdmPuGhQOUY=; b=XzQf5DeY25Ifojs30v+85QdkPa/W6tD34kRTy5z+/me7i5jLUdBePs4XoQ56zeUUrzqyGe j8sGNZx3mEY/LJ7m62K0CPmYveVUB2HSYuklvficKqC8pRV1Q2N55xEWP8rPvDGcjKsXk4 EK2tHyV7NYK+D83TplIpzTCfgfuJRGeQA752s1+LeNAmFhhVXvHtkFpDmYvV/pqrJ4PAIW 5BzlHXBOLWlr3rp3Qrd5hjfAqf5h5qimQHM8hxAcDHOR4yzwZceFRQWwvvCWjbPHVGr6uS LG22ZEmO29BJJ+zzkscFGwikO0LdQBJaktAXP9pQW0ihpG4H1k/Q73+Ln2sCww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W2DqK4Y97zqhC; Sun, 16 Jun 2024 13:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45GDlvkZ084837; Sun, 16 Jun 2024 13:47:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GDlvhV084834; Sun, 16 Jun 2024 13:47:57 GMT (envelope-from git) Date: Sun, 16 Jun 2024 13:47:57 GMT Message-Id: <202406161347.45GDlvhV084834@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: 37ab807bb11a - main - audio/easytag: fix build on i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37ab807bb11a4de7a44b994ae2885f1151561f09 Auto-Submitted: auto-generated The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/ports/commit/?id=37ab807bb11a4de7a44b994ae2885f1151561f09 commit 37ab807bb11a4de7a44b994ae2885f1151561f09 Author: Roman Bogorodskiy AuthorDate: 2024-06-16 13:29:00 +0000 Commit: Roman Bogorodskiy CommitDate: 2024-06-16 13:44:16 +0000 audio/easytag: fix build on i386 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 --- audio/easytag/files/patch-src_tags_gio__wrapper.cc | 72 +++++++++++++++++++++- audio/easytag/files/patch-src_tags_gio__wrapper.h | 35 +++++++++-- 2 files changed, 99 insertions(+), 8 deletions(-) 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 @@ -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) + { 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 @@ -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; +