From nobody Sun Jul 09 22:09:54 2023 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 4QzhBq1LZYz4mr3f; Sun, 9 Jul 2023 22:09:55 +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 4QzhBp6l9pz3D84; Sun, 9 Jul 2023 22:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940594; 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=6cxAcwBPYSPCn6++g9oPvfd1W+edXmAD95h4FEsm3s8=; b=ukCtSRpKFG1ZR17Gm+LHBLmgiRIfPQiR5/fqjcOaWPJM1CxmiX1gQy3lLtgmaheAPyTR6h W7tcKA+1o8hoiST/msV6FCkxFZVpI89Uq64Pd2uGGiwK5kK+GYVQV1u34a1kqaY3nMriOX M0QsiK8OaHBA6j0B8LHjcTEyd17YiVg2StlMW/1MUNOxlAf8O5X2NFE7ObFrY1WDd5Ze7A PqH2uRvJQOjdWYIDBbTK1idsjUjlavuSC5KMIzDPvtUll1fKH4wPurlG/dkq5SysASI0fn s5f1jRG9RSyL5nAaIHnszaFH2hzAYLsessYDwKWFNBVyd29v5l2UQauCOJWVWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688940594; 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=6cxAcwBPYSPCn6++g9oPvfd1W+edXmAD95h4FEsm3s8=; b=TERhunDFU5QsgJc9vmUhu47LADMxufhy6G9ZVL0X2eE/SDGTzRlxVUF6uu/0X1prgqRQ+t qQmzWoSccwpWEO4greO2/fOHAuUVeHwMT+unwQrRoQ68MVCUggXkG/0b+pwQT3PjTMuw8F dvhbkf9QrQWJwJZamv83FzJGLV5aCpqalg2zvyr0sHE3992xSjrTEXHrHt9KJehz8xnJrh zqT0NJThjGB1/QFckpBnRl9whqo8aLk4t5VM0xAxyffZ1fx9mnz/F+VPqUgm8TmmiCbm6b 4WEKbRH7DWJ4+avxJZD6mT62rECccB2ry9NIqqYg+BxnhvU3duwb12uYd0y/Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688940594; a=rsa-sha256; cv=none; b=xDzgZppXTbi5l3qM1p/JKcMfpi90QvPoFJufA9LspOW/p/6UD/PjXavSMzh0zce69r1zU+ Ml91c51FuHi9uCYUH/8S3x9eSlBmn9+EkDQoSj1ID1MuVaVgTFjTK0AkxQN8jEq8NPPeUM oZstlc+cSgz+eUvf6NRFFIaHnSIOHVSilrvYoEz2Na20s8S3OA3PPl6pMVG6ABi/OEJnXf 23pCB78AUDI+IfeFEoOgOq9u5DeYaM6SH2a5WA5yIYhGWXpjENj9rql3iRPo5kk8gopFkN 0TiSaOVbR4gaOFWIUPkf8CTIPsU7iIIvD+L3FTem09PkUk/sa0LqfUsxYMRQpg== 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 4QzhBp5cL8zL0Z; Sun, 9 Jul 2023 22:09:54 +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 369M9sVK034551; Sun, 9 Jul 2023 22:09:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369M9sF7034550; Sun, 9 Jul 2023 22:09:54 GMT (envelope-from git) Date: Sun, 9 Jul 2023 22:09:54 GMT Message-Id: <202307092209.369M9sF7034550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: eadb1e6037c8 - main - graphics/qgis: make compatible with exiv2 0.28 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eadb1e6037c802f9224cc541e4a2d74a0aabf064 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=eadb1e6037c802f9224cc541e4a2d74a0aabf064 commit eadb1e6037c802f9224cc541e4a2d74a0aabf064 Author: Matthias Andree AuthorDate: 2023-07-03 00:02:57 +0000 Commit: Matthias Andree CommitDate: 2023-07-09 22:09:05 +0000 graphics/qgis: make compatible with exiv2 0.28 PR: 272311 --- graphics/qgis/Makefile | 1 + .../files/patch-src_core_raster_qgsexiftools.cpp | 38 ++++++++++++++++++++++ graphics/qgis/pkg-plist | 1 + 3 files changed, 40 insertions(+) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index fe59a7ba82be..7b23636144c0 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,5 +1,6 @@ PORTNAME= qgis DISTVERSION= 3.32.0 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ diff --git a/graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp b/graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp new file mode 100644 index 000000000000..20e191c481ee --- /dev/null +++ b/graphics/qgis/files/patch-src_core_raster_qgsexiftools.cpp @@ -0,0 +1,38 @@ +--- src/core/raster/qgsexiftools.cpp.orig 2023-05-26 12:01:43 UTC ++++ src/core/raster/qgsexiftools.cpp +@@ -66,7 +66,7 @@ QVariant decodeXmpData( const QString &key, Exiv2::Xmp + case Exiv2::signedLong: + case Exiv2::unsignedLongLong: + case Exiv2::signedLongLong: +- val = QVariant::fromValue( it->toLong() ); ++ val = QVariant::fromValue( it->toInt64() ); + break; + + case Exiv2::tiffDouble: +@@ -80,7 +80,7 @@ QVariant decodeXmpData( const QString &key, Exiv2::Xmp + case Exiv2::signedByte: + case Exiv2::tiffIfd: + case Exiv2::tiffIfd8: +- val = QVariant::fromValue( static_cast< int >( it->toLong() ) ); ++ val = QVariant::fromValue( static_cast< int >( it->toInt64() ) ); + break; + + case Exiv2::date: +@@ -182,7 +182,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex + case Exiv2::signedLong: + case Exiv2::unsignedLongLong: + case Exiv2::signedLongLong: +- val = QVariant::fromValue( it->toLong() ); ++ val = QVariant::fromValue( it->toInt64() ); + break; + + case Exiv2::tiffDouble: +@@ -196,7 +196,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex + case Exiv2::signedByte: + case Exiv2::tiffIfd: + case Exiv2::tiffIfd8: +- val = QVariant::fromValue( static_cast< int >( it->toLong() ) ); ++ val = QVariant::fromValue( static_cast< int >( it->toInt64() ) ); + break; + + case Exiv2::date: diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist index 8c3c4063dd8e..219fbed9ee81 100644 --- a/graphics/qgis/pkg-plist +++ b/graphics/qgis/pkg-plist @@ -1,5 +1,6 @@ %%SERVER%%bin/admin.sld bin/qgis +bin/qgis_bench %%SERVER%%bin/qgis_mapserv.fcgi %%SERVER%%bin/qgis_mapserver bin/qgis_process