Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4BA6D84DA9 for ; Sun, 2 Jul 2023 15:27:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 9X-z2W9upF5n for ; Sun, 2 Jul 2023 15:27:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 73DB884D00 for ; Sun, 2 Jul 2023 15:27:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 62E7FFA89; Sun, 2 Jul 2023 15:27:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168831167179770" MIME-Version: 1.0 Date: Sun, 2 Jul 2023 15:27:51 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/graphics/gexiv2 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20230702152751.62E7FFA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168831167179770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sun Jul 2 15:27:51 UTC 2023 Modified Files: pkgsrc/graphics/gexiv2: distinfo pkgsrc/graphics/gexiv2/patches: patch-gexiv2_gexiv2-metadata.cpp patch-gexiv2_gexiv2-stream-io.cpp patch-gexiv2_gexiv2-stream-io.h Log Message: gexiv2: fix build w/ clang Type of offset parameter of StreamIo::seek() must match that of parent class BasicIo. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/gexiv2/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-metadata.cpp \ pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.cpp \ pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168831167179770 Content-Disposition: inline Content-Length: 5605 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gexiv2/distinfo diff -u pkgsrc/graphics/gexiv2/distinfo:1.13 pkgsrc/graphics/gexiv2/distinfo:1.14 --- pkgsrc/graphics/gexiv2/distinfo:1.13 Sat Jul 1 22:14:58 2023 +++ pkgsrc/graphics/gexiv2/distinfo Sun Jul 2 15:27:51 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2023/07/01 22:14:58 wiz Exp $ +$NetBSD: distinfo,v 1.14 2023/07/02 15:27:51 tnn Exp $ BLAKE2s (gexiv2-0.14.1.tar.xz) = 22e5e884cb248e3a332fa204d2da6e2905f3cdb760a0dfbacf7b405f52d992d1 SHA512 (gexiv2-0.14.1.tar.xz) = f510e49c0b2633bcc370ca21af0822032f04f5d5b57c7f76807797601b0a98b7749fdf68df37a405c9d90734adf75282a3dad59c24830874f64f7bd33152052d @@ -7,10 +7,10 @@ SHA1 (patch-gexiv2_gexiv2-metadata-exif. SHA1 (patch-gexiv2_gexiv2-metadata-gps.cpp) = ca85d6a85da7a0f6cfdfbfa715906ffcac8a0098 SHA1 (patch-gexiv2_gexiv2-metadata-iptc.cpp) = f5cfde230049ef08594f71a95ad188d274928e2d SHA1 (patch-gexiv2_gexiv2-metadata-xmp.cpp) = d00cce03e2ef2815fe795b2c75054c9b1c6d0dac -SHA1 (patch-gexiv2_gexiv2-metadata.cpp) = a03aa972c783a2cac20125fcc42183ebaac13c84 +SHA1 (patch-gexiv2_gexiv2-metadata.cpp) = f2b3278a6fc0184591d42fd03f117f4a0be7dc10 SHA1 (patch-gexiv2_gexiv2-preview-image.cpp) = c85191e9eca7001e8b1c4ee584f8cfebf17a1a75 -SHA1 (patch-gexiv2_gexiv2-stream-io.cpp) = 21bbf132420ac046ed699cd26c1b7cb226c3c632 -SHA1 (patch-gexiv2_gexiv2-stream-io.h) = db9e18736c171475423e4ee703b1fbe4a4920f44 +SHA1 (patch-gexiv2_gexiv2-stream-io.cpp) = c5f7c641a88de7cacec489c1214db39510b36d32 +SHA1 (patch-gexiv2_gexiv2-stream-io.h) = a96e74dcda24e6a7c457fce34a7e79ff58bb714c SHA1 (patch-gexiv2_meson.build) = 8d106c99fa1ada8e22ec82567b38f223be9e6ad3 SHA1 (patch-meson.build) = 06cf41e7773326d5b9cea57f1a7eed13d4d72cfe SHA1 (patch-test_python_test__metadata.py) = 95e372d9daaffc921b9436b5cd0be2eb446965d5 Index: pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-metadata.cpp diff -u pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-metadata.cpp:1.1 pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-metadata.cpp:1.2 --- pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-metadata.cpp:1.1 Sat Jul 1 22:14:58 2023 +++ pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-metadata.cpp Sun Jul 2 15:27:51 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-gexiv2_gexiv2-metadata.cpp,v 1.1 2023/07/01 22:14:58 wiz Exp $ +$NetBSD: patch-gexiv2_gexiv2-metadata.cpp,v 1.2 2023/07/02 15:27:51 tnn Exp $ Fix build with exiv2 0.28.0. https://gitlab.gnome.org/GNOME/gexiv2/-/commit/06adc8fb70cb8c77c0cd364195d8251811106ef8 @@ -46,6 +46,15 @@ https://gitlab.gnome.org/GNOME/gexiv2/-/ #else using size_type = long; #endif +@@ -54,7 +57,7 @@ public: + size_type _size; + + ~GioIo() { g_clear_object (&_is); g_clear_error (&_error); _seekable = NULL;} +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) || EXIV2_TEST_VERSION(0,27,99) + typedef int64_t seek_offset_t; + #else + typedef long seek_offset_t; @@ -66,6 +69,9 @@ public: using ptr_type = Exiv2::BasicIo::AutoPtr; #endif Index: pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.cpp diff -u pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.cpp:1.1 pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.cpp:1.2 --- pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.cpp:1.1 Sat Jul 1 22:14:59 2023 +++ pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.cpp Sun Jul 2 15:27:51 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-gexiv2_gexiv2-stream-io.cpp,v 1.1 2023/07/01 22:14:59 wiz Exp $ +$NetBSD: patch-gexiv2_gexiv2-stream-io.cpp,v 1.2 2023/07/02 15:27:51 tnn Exp $ Fix build with exiv2 0.28.0. https://gitlab.gnome.org/GNOME/gexiv2/-/commit/06adc8fb70cb8c77c0cd364195d8251811106ef8 @@ -24,6 +24,15 @@ https://gitlab.gnome.org/GNOME/gexiv2/-/ StreamIo::StreamIo (ManagedStreamCallbacks* callbacks) : cb (callbacks), memio(nullptr), is_open (FALSE), can_write(FALSE) { /* at least reading and seeking must be possible to read metatada */ +@@ -119,7 +120,7 @@ int StreamIo::putb (Exiv2::byte data) { + return EOF; + } + +-int StreamIo::seek (long offset, Position position) { ++int StreamIo::seek (int64_t offset, Position position) { + // FIXME: handle Error + switch (position) { + case (beg): @@ -138,7 +139,7 @@ int StreamIo::seek (long offset, Positio return 0; } Index: pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.h diff -u pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.h:1.1 pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.h:1.2 --- pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.h:1.1 Sat Jul 1 22:14:59 2023 +++ pkgsrc/graphics/gexiv2/patches/patch-gexiv2_gexiv2-stream-io.h Sun Jul 2 15:27:51 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-gexiv2_gexiv2-stream-io.h,v 1.1 2023/07/01 22:14:59 wiz Exp $ +$NetBSD: patch-gexiv2_gexiv2-stream-io.h,v 1.2 2023/07/02 15:27:51 tnn Exp $ Fix build with exiv2 0.28.0. https://gitlab.gnome.org/GNOME/gexiv2/-/commit/06adc8fb70cb8c77c0cd364195d8251811106ef8 @@ -21,8 +21,12 @@ https://gitlab.gnome.org/GNOME/gexiv2/-/ #endif StreamIo (ManagedStreamCallbacks* cb); -@@ -45,14 +49,25 @@ public: - int seek (long offset, Position pos) override; +@@ -42,17 +46,28 @@ public: + size_type read (Exiv2::byte* buf, size_type rcount) override; + int getb () override; + void transfer (Exiv2::BasicIo& src) override; +- int seek (long offset, Position pos) override; ++ int seek (int64_t offset, Position pos) override; Exiv2::byte* mmap (bool isWriteable = false) override; int munmap () override; - long tell () const override; --_----------=_168831167179770--