From nobody Sun Dec 03 15:46:53 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 4Sjrl22kS1z532Hl; Sun, 3 Dec 2023 15:46:54 +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 4Sjrl21nv8z4dm7; Sun, 3 Dec 2023 15:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701618414; 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=BrbTzsNjTV0ZOE0R4CUxDCcc5f71UQBkD7jryaXm8fI=; b=IqVZiwzcIj4rV6i8a644IUZXE4dCTv379ZlJfSDmRoJPVNKavduNhzJdDX4J5yJhE1ln3+ No0z0xn+LmWvv3nOvWil9+5rDkufHrVvYTkVmIaY5u1FXl+hXU1j1z10O0oNnLZXmenSHG z/K8cOQPRT6uYZIvuw2AIf5xK8zqyzQu+JvQHkdLtZZEx+HRQNjQBY/C/0NPpWvccwegaA sLAlh4TZi92ybCY/FClY4d+A8SLk8s/1rB0aRXCV5pykZ17GqvTKW0RdK3YSX87dZd/hsK hXOyJ+4gYN/vj4+ra+AjEcEubQORJ6GTnN0bG7dgaQ91jMTpfCEt+NW+vvuA5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701618414; 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=BrbTzsNjTV0ZOE0R4CUxDCcc5f71UQBkD7jryaXm8fI=; b=f4EEhCljq916z0DXq2Dh1kplyjTauwqoyyJCC9ZldbojWJ2v4MVm3zuH/9+VU2B696jE2G 0U43dTgIKsSLKDeoBx+nwx+sT4LAOlvdq9fYuqajauRZoEXyWWXGVN0Ef3O+vBdpaz0BXj 9pnSQ7YlivJRnpF+IOU1TWaWJrLpmAFC5YHXH3xEmoE9qwW17PbnTzYgJWzWBGgSOI7DCt YmAifmS0WRWEi8PF8qDoOpRPsLoB+p4sVVIotLcJBHqNhe6R3az0rlwX+4fpb9At6dMOGR rN0AXNXsfYW8A0AutzsZSpwTL96VsitXvKuv3OyiB8KPrsxcH+CiQxS0WUP/Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701618414; a=rsa-sha256; cv=none; b=JJ8vTtilppmdEEM5fvKjYz65AKKueBkiofsai6v8OXIGhJ3lpU3IlVVMsCdbogAkQVAviR plEZLgA2p7+RZmQ9clpC1r8epfpTLmBXYfpvsp7S1EwXnRUcVN7gy8IACnDrHoGNyCDo28 /SshFMpWIKwkBFbgvbK4FCFmQvwXJeylzM1YOwNojPv69HtttCsvNfWAdgg45eDeR388ZC qIb7TcJ8dYdMcRdnHQv/ZJGbUs4GXMFm1AiwVvrBKarwgboAnm+KkcA3xF8Q0nRJdcoGO3 o1aO7CzYOBEb3/De1k2pdU8ywMJ9JRmAON8DAjKFAmMKo2fRoCryQzJNRWQKUg== 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 4Sjrl20Qshz14Tk; Sun, 3 Dec 2023 15:46: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 3B3FkrIp022094; Sun, 3 Dec 2023 15:46:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3FkrLU022091; Sun, 3 Dec 2023 15:46:53 GMT (envelope-from git) Date: Sun, 3 Dec 2023 15:46:53 GMT Message-Id: <202312031546.3B3FkrLU022091@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: f38d2979c2af - main - graphics/digikam: update to 8.2.0 release (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f38d2979c2af1943f5412feec5a6bcd760406e8d Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f38d2979c2af1943f5412feec5a6bcd760406e8d commit f38d2979c2af1943f5412feec5a6bcd760406e8d Author: Dima Panov AuthorDate: 2023-12-03 15:45:37 +0000 Commit: Dima Panov CommitDate: 2023-12-03 15:45:37 +0000 graphics/digikam: update to 8.2.0 release (+) Release Notes: https://www.digikam.org/news/2023-12-03-8.2.0_release_announcement/ Sponsored by: Serenity Cybersecurity, LLC --- graphics/digikam/Makefile | 3 +- graphics/digikam/distinfo | 34 +++++++++++----------- graphics/digikam/files/patch-core_CMakeLists.txt | 34 +++++++--------------- .../files/patch-core_app_DigikamCoreTarget.cmake | 25 ++++++++++++++++ .../patch-core_cmake_rules_RulesKDEFramework.cmake | 14 +++++++++ ...atch-core_utilities_extrasupport_CMakeLists.txt | 11 +++++++ ...ilities_extrasupport_addressbook_CMakeLists.txt | 22 ++++++++++++++ graphics/digikam/pkg-plist | 1 - 8 files changed, 100 insertions(+), 44 deletions(-) diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 7186fc43b2d6..33e85db96c89 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,6 +1,5 @@ PORTNAME= digikam -DISTVERSION= 8.1.0 -PORTREVISION= 3 +DISTVERSION= 8.2.0 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} \ https://files.kde.org/digikam/%SUBDIR%/:aesthetic,face,shape \ diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index 248ea48691c7..b8476a8f747e 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -1,17 +1,17 @@ -TIMESTAMP = 1689392235 -SHA256 (KDE/digikam/8.1.0/digiKam-8.1.0.tar.xz) = 0503c034e445ff424f18a6715c0a7a79be4a5e0c82b3ebc461a21cec3745a5b3 -SIZE (KDE/digikam/8.1.0/digiKam-8.1.0.tar.xz) = 35712348 -SHA256 (KDE/digikam/8.1.0/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538 -SIZE (KDE/digikam/8.1.0/weights_inceptionv3_299.pb) = 88007527 -SHA256 (KDE/digikam/8.1.0/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795 -SIZE (KDE/digikam/8.1.0/deploy.prototxt) = 28092 -SHA256 (KDE/digikam/8.1.0/openface_nn4.small2.v1.t7) = 9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08 -SIZE (KDE/digikam/8.1.0/openface_nn4.small2.v1.t7) = 31510785 -SHA256 (KDE/digikam/8.1.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76 -SIZE (KDE/digikam/8.1.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 5351047 -SHA256 (KDE/digikam/8.1.0/yolov3-face.cfg) = f6563bd6923fd6500d2c2d6025f32ebdba916a85e5c9798351d916909f62aaf5 -SIZE (KDE/digikam/8.1.0/yolov3-face.cfg) = 8334 -SHA256 (KDE/digikam/8.1.0/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef6202cb9afc3db88e7944f9ffbcc369e7df -SIZE (KDE/digikam/8.1.0/yolov3-wider_16000.weights) = 246305388 -SHA256 (KDE/digikam/8.1.0/shapepredictor.dat) = 6f3d2a59dc30c7c9166983224dcf5732b25de734fff1e36ff1f3047ef90ed82b -SIZE (KDE/digikam/8.1.0/shapepredictor.dat) = 67740572 +TIMESTAMP = 1701611793 +SHA256 (KDE/digikam/8.2.0/digiKam-8.2.0.tar.xz) = 2f7fcb559b123ed9ecae5a5aef6f4560eee5f49206d9d1746dec9ab6c8fb38bf +SIZE (KDE/digikam/8.2.0/digiKam-8.2.0.tar.xz) = 48172600 +SHA256 (KDE/digikam/8.2.0/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538 +SIZE (KDE/digikam/8.2.0/weights_inceptionv3_299.pb) = 88007527 +SHA256 (KDE/digikam/8.2.0/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795 +SIZE (KDE/digikam/8.2.0/deploy.prototxt) = 28092 +SHA256 (KDE/digikam/8.2.0/openface_nn4.small2.v1.t7) = 9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08 +SIZE (KDE/digikam/8.2.0/openface_nn4.small2.v1.t7) = 31510785 +SHA256 (KDE/digikam/8.2.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76 +SIZE (KDE/digikam/8.2.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 5351047 +SHA256 (KDE/digikam/8.2.0/yolov3-face.cfg) = f6563bd6923fd6500d2c2d6025f32ebdba916a85e5c9798351d916909f62aaf5 +SIZE (KDE/digikam/8.2.0/yolov3-face.cfg) = 8334 +SHA256 (KDE/digikam/8.2.0/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef6202cb9afc3db88e7944f9ffbcc369e7df +SIZE (KDE/digikam/8.2.0/yolov3-wider_16000.weights) = 246305388 +SHA256 (KDE/digikam/8.2.0/shapepredictor.dat) = 6f3d2a59dc30c7c9166983224dcf5732b25de734fff1e36ff1f3047ef90ed82b +SIZE (KDE/digikam/8.2.0/shapepredictor.dat) = 67740572 diff --git a/graphics/digikam/files/patch-core_CMakeLists.txt b/graphics/digikam/files/patch-core_CMakeLists.txt index bb5c7fe82555..dfde33d77e4c 100644 --- a/graphics/digikam/files/patch-core_CMakeLists.txt +++ b/graphics/digikam/files/patch-core_CMakeLists.txt @@ -1,25 +1,11 @@ -core/cmake/modules/FindLQR-1.cmake fails to find LQR in the linking test -because the path to the library is not passed to the linker. This could -be addressed by running what pkg_check_modules() finds through find_library() -first or rewriting the module to avoid using pkgconf all together. - -The local workaround is to set USES+=localbase:ldflags to avoid extra patches. - ---- core/CMakeLists.txt.orig 2023-07-14 21:16:22 UTC +--- core/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC +++ core/CMakeLists.txt -@@ -142,13 +142,13 @@ find_package(Doxygen) - - find_package(Doxygen) - --if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) -+#if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) - - # Lqr-1 packaging and detection under FreeBSD is problematic since a very long time and break the Gitlab CI - - find_package(LQR-1) - --endif() -+#endif() - - if(BUILD_WITH_CCACHE) - +@@ -270,7 +270,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("flex" "htt + PRINT_OPTIONAL_LIBRARY_STATUS("doxygen" "https://github.com/doxygen/doxygen" "(version >= 1.8.0)" "digiKam will be compiled without API documentation building support." Doxygen_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("ccache" "https://ccache.dev" "(version >= 3.0.0)" "digiKam will be compiled without CCACHE build support." HAVE_CCACHE) + PRINT_OPTIONAL_LIBRARY_STATUS("flex" "https://github.com/westes/flex" "(version >= 2.5.0)" "digiKam will be compiled without Panorama support." FLEX_FOUND) +-PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) ++PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libimagemagick" "https://github.com/ImageMagick/ImageMagick.git" "(version >= 6.7.0)" "digiKam will be compiled without ImageMagick codecs." HAVE_IMAGE_MAGICK) + PRINT_OPTIONAL_LIBRARY_STATUS("libeigen3" "https://github.com/eigenteam/eigen-git-mirror" "(version >= 3.0.0)" "digiKam will be compiled without Refocus tool support." Eigen3_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libgphoto2" "https://github.com/gphoto/libgphoto2" "(version >= 2.4.0)" "digiKam will be compiled without GPhoto2 camera drivers support." Gphoto2_FOUND) diff --git a/graphics/digikam/files/patch-core_app_DigikamCoreTarget.cmake b/graphics/digikam/files/patch-core_app_DigikamCoreTarget.cmake new file mode 100644 index 000000000000..999d5ef739b5 --- /dev/null +++ b/graphics/digikam/files/patch-core_app_DigikamCoreTarget.cmake @@ -0,0 +1,25 @@ +--- core/app/DigikamCoreTarget.cmake.orig 2023-11-29 09:52:21 UTC ++++ core/app/DigikamCoreTarget.cmake +@@ -81,7 +81,7 @@ endif() + + endif() + +-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) ++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) + + set(DIGIKAMCORE_OBJECTS + ${DIGIKAMCORE_OBJECTS} +@@ -395,11 +395,11 @@ endif() + + endif() + +-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) ++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) + + target_link_libraries(digikamcore + PRIVATE +- KF${QT_VERSION_MAJOR}::AkonadiContact ++ KPim${QT_VERSION_MAJOR}::AkonadiContact + ) + + endif() diff --git a/graphics/digikam/files/patch-core_cmake_rules_RulesKDEFramework.cmake b/graphics/digikam/files/patch-core_cmake_rules_RulesKDEFramework.cmake new file mode 100644 index 000000000000..d5e97aea888b --- /dev/null +++ b/graphics/digikam/files/patch-core_cmake_rules_RulesKDEFramework.cmake @@ -0,0 +1,14 @@ +--- core/cmake/rules/RulesKDEFramework.cmake.orig 2023-11-29 09:52:21 UTC ++++ core/cmake/rules/RulesKDEFramework.cmake +@@ -40,9 +40,9 @@ if(ENABLE_AKONADICONTACTSUPPORT) + find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET + OPTIONAL_COMPONENTS + Akonadi +- AkonadiContact # For KDE Mail Contacts support. +- Contacts # API for contacts/address book data. + ) ++ find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET) ++ find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET) + + endif() + diff --git a/graphics/digikam/files/patch-core_utilities_extrasupport_CMakeLists.txt b/graphics/digikam/files/patch-core_utilities_extrasupport_CMakeLists.txt new file mode 100644 index 000000000000..a341301aad83 --- /dev/null +++ b/graphics/digikam/files/patch-core_utilities_extrasupport_CMakeLists.txt @@ -0,0 +1,11 @@ +--- core/utilities/extrasupport/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC ++++ core/utilities/extrasupport/CMakeLists.txt +@@ -4,7 +4,7 @@ + # SPDX-License-Identifier: BSD-3-Clause + # + +-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) ++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) + add_subdirectory(addressbook) + endif() + diff --git a/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_CMakeLists.txt b/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_CMakeLists.txt new file mode 100644 index 000000000000..b63cac11c675 --- /dev/null +++ b/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_CMakeLists.txt @@ -0,0 +1,22 @@ +--- core/utilities/extrasupport/addressbook/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC ++++ core/utilities/extrasupport/addressbook/CMakeLists.txt +@@ -14,7 +14,7 @@ include_directories($ + ) + +-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) ++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) + include_directories( + $ + $ +@@ -35,7 +35,7 @@ target_link_libraries(akonadiiface PRIVATE Qt${QT_VERS + + target_link_libraries(akonadiiface PRIVATE Qt${QT_VERSION_MAJOR}::Core KF${QT_VERSION_MAJOR}::I18n) + +-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) +- target_include_directories(core_akonadiiface_obj PRIVATE $) +- target_link_libraries(akonadiiface PRIVATE KF${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts) ++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) ++ target_include_directories(core_akonadiiface_obj PRIVATE $) ++ target_link_libraries(akonadiiface PRIVATE KPim${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts) + endif() diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist index 42d6c1a03a25..bfccbbc12d3a 100644 --- a/graphics/digikam/pkg-plist +++ b/graphics/digikam/pkg-plist @@ -327,7 +327,6 @@ share/applications/org.kde.showfoto.desktop %%DATADIR%%/data/logo-beta.png %%DATADIR%%/data/logo-cimg.png %%DATADIR%%/data/logo-digikam.png -%%DATADIR%%/data/logo-exiv2.png %%DATADIR%%/data/logo-gphoto.png %%DATADIR%%/data/logo-lcms.png %%DATADIR%%/data/logo-piwigo.png