From nobody Fri Jul 14 13:25:02 2023 X-Original-To: dev-commits-ports-all@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 4R2XJv5BRzz4n90m; Fri, 14 Jul 2023 13:25:03 +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 4R2XJv0j5Zz4Bp6; Fri, 14 Jul 2023 13:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689341103; 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=yKDTxtEhVKqR9cY4eVEPm+kF2YmssKc05D1f5Tk1Pa8=; b=T4ZgTRTQZBJ0BqolWeor7RJ1T6+YnmbiWSy1jaW0lfCTnGOxYi1VrwCW5AU3Tlv+k+FQwd L9opkLaXwsBA6qbPOfB0NhWrvsPdsudTfSL3b1qF7yW2unFTblPFtfdk0JD2F6S8S50+ZO jsCmP0ZdFM/BpkbI0LrmXdHgWyHBRPFqslbTCqltGeGpzDIK7iB38tteM3ayqaHC8dLUqB R2LsQUeSNFgfpE8Krgtp3kas4cmJk+5Sy4lvV688yshwbsQmy8MsM28YImKYmRWXJVkpcD H1HK+B0rXVJEs/0dsX6dq0I7bZ4b8hqbtEpJxrNCHdKx5zhaNX98wlAW391JxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689341103; 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=yKDTxtEhVKqR9cY4eVEPm+kF2YmssKc05D1f5Tk1Pa8=; b=gPw1gK27nItwj02D7dS5ImUryVtUaL1CTphqqyrvpvrZ/CaTaR+Nr63YDEZsb0397sLnb4 bOjv3koS2PZbd5edM8tu5E1Pjqnzimojlz4YP2JqL96jn2td+Te/PKLpvoTzsja6QWARS8 oW56aEL1L7nONqU3zIBqhii1+tamh1tlKgq0eSfG4QaQ6XQmlIrw+Y77RcvBADCt75SmZp F/lXP9VpmasVHWTqsnqzZmYzKrCzIDIeCcfxqRGsE4YOpIU3W4bi21sZe7ufKeEIs+prIa kDwfl22xqXwXoLmJMDoOHndr12/EwzKe7I6E3skc5wNFQX285TOSD9M5AzoLpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689341103; a=rsa-sha256; cv=none; b=CU6LB/s2QKrybXi8qnLpV3j+MHQ9GujZyXoQOiE8nEwRO8tBBDOz3jky1YrFIq+XVFvamz uDMf9pK0ED0jgndgc+C/aBq0RShgjEKXgUrjrRjeHJIi7XFRRvyvMNrotdEDS5639YJmng pqJz5xRIfYmRK5OXL+XN0oJwtswGJA/zCaqHjMwVRd4zrlXCa2s1wQ8A3NIf86tJLPeaOD okUYBmoBnxr2s0IqTEFidY2zRleFQk9CBooKRmGiyQfrrEVS+Te/45RUQRlvAYy4tJjkVK PFN6eL8j7bn+Hs+DN5nzcxhHYZ7qwbCHOX0wHgITucju0JpRM8jHyJ3OcMQb0A== 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 4R2XJt6rG6zKN0; Fri, 14 Jul 2023 13:25:02 +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 36EDP2Ln094938; Fri, 14 Jul 2023 13:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EDP2B0094937; Fri, 14 Jul 2023 13:25:02 GMT (envelope-from git) Date: Fri, 14 Jul 2023 13:25:02 GMT Message-Id: <202307141325.36EDP2B0094937@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 08f0eef4e4ad - main - graphics/kphotoalbum: update to 5.11.0, latest upstream List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08f0eef4e4adfffac891a4f71c12450f4679895c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=08f0eef4e4adfffac891a4f71c12450f4679895c commit 08f0eef4e4adfffac891a4f71c12450f4679895c Author: Adriaan de Groot AuthorDate: 2023-07-14 13:23:18 +0000 Commit: Adriaan de Groot CommitDate: 2023-07-14 13:24:59 +0000 graphics/kphotoalbum: update to 5.11.0, latest upstream The most notable change for this release is build-compatibility with exiv2 0.28 -- thanks though to mandree@ for pre-emptively fixing that in the previous kphotoalbum ports version. --- graphics/kphotoalbum/Makefile | 3 +-- graphics/kphotoalbum/distinfo | 6 +++--- graphics/kphotoalbum/files/patch-DB_FileInfo.cpp | 11 ----------- .../kphotoalbum/files/patch-lib_kpaexif_Database.cpp | 20 -------------------- .../files/patch-lib_kpaexif_DatabaseElement.cpp | 11 ----------- .../kphotoalbum/files/patch-lib_kpaexif_Info.cpp | 20 -------------------- 6 files changed, 4 insertions(+), 67 deletions(-) diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 4202db82595b..afa8a36b913c 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -1,6 +1,5 @@ PORTNAME= kphotoalbum -DISTVERSION= 5.10.0 -PORTREVISION= 2 +DISTVERSION= 5.11.0 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE diff --git a/graphics/kphotoalbum/distinfo b/graphics/kphotoalbum/distinfo index c6fb2b2131c4..d974e4375b64 100644 --- a/graphics/kphotoalbum/distinfo +++ b/graphics/kphotoalbum/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680380654 -SHA256 (KDE/kphotoalbum-5.10.0.tar.xz) = add117820e61c2ee765c98add3b01bad2c3b90b0cd2be2296c8c0a095fcb869f -SIZE (KDE/kphotoalbum-5.10.0.tar.xz) = 12002788 +TIMESTAMP = 1689340586 +SHA256 (KDE/kphotoalbum-5.11.0.tar.xz) = 356b4e207257b5cf0f965b586dba766300dfff7408dcc7473435fb59540c8a0e +SIZE (KDE/kphotoalbum-5.11.0.tar.xz) = 12005836 diff --git a/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp b/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp deleted file mode 100644 index c4854157f698..000000000000 --- a/graphics/kphotoalbum/files/patch-DB_FileInfo.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- DB/FileInfo.cpp.orig 2023-03-25 09:46:12 UTC -+++ DB/FileInfo.cpp -@@ -80,7 +80,7 @@ void DB::FileInfo::parseEXIV2(const DB::FileName &file - - int orientation = 0; - if (datum.count() > 0) -- orientation = datum.toLong(); -+ orientation = datum.toInt64(); - m_angle = orientationToAngle(orientation); - } - diff --git a/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp b/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp deleted file mode 100644 index 579ee1be525a..000000000000 --- a/graphics/kphotoalbum/files/patch-lib_kpaexif_Database.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/kpaexif/Database.cpp.orig 2023-03-25 09:46:12 UTC -+++ lib/kpaexif/Database.cpp -@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName &fileName) - return false; - - try { -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()); -+ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) }; - Q_ASSERT(image.get() != nullptr); - image->readMetadata(); - Exiv2::ExifData &exifData = image->exifData(); -@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList &list) - - for (const DB::FileName &fileName : list) { - try { -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()); -+ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data()) }; - Q_ASSERT(image.get() != nullptr); - image->readMetadata(); - map << DBExifInfo(fileName, image->exifData()); diff --git a/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp b/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp deleted file mode 100644 index f85163774238..000000000000 --- a/graphics/kphotoalbum/files/patch-lib_kpaexif_DatabaseElement.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/kpaexif/DatabaseElement.cpp.orig 2023-03-25 09:46:12 UTC -+++ lib/kpaexif/DatabaseElement.cpp -@@ -77,7 +77,7 @@ QString Exif::IntExifElement::queryString() const - QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData &data) const - { - if (data[m_tag].count() > 0) -- return QVariant { (int)data[m_tag].toLong() }; -+ return QVariant { (int)data[m_tag].toInt64() }; - else - return QVariant { (int)0 }; - } diff --git a/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp b/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp deleted file mode 100644 index 2675b0c306d2..000000000000 --- a/graphics/kphotoalbum/files/patch-lib_kpaexif_Info.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/kpaexif/Info.cpp.orig 2023-07-02 23:13:17 UTC -+++ lib/kpaexif/Info.cpp -@@ -166,7 +166,7 @@ Info::Info() - void Exif::writeExifInfoToFile(const DB::FileName &srcName, const QString &destName, const QString &imageDescription) - { - // Load Exif from source image -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data()); -+ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data()) }; - image->readMetadata(); - Exiv2::ExifData data = image->exifData(); - -@@ -201,7 +201,7 @@ Exif::Metadata Exif::Info::metadata(const DB::FileName - { - try { - Exif::Metadata result; -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data()); -+ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data()) }; - Q_ASSERT(image.get() != nullptr); - image->readMetadata(); - result.exif = image->exifData();