From nobody Fri Aug 15 18:52:26 2025 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 4c3WSW20wrz648sX; Fri, 15 Aug 2025 18:52:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c3WSV6V33z3Gg8; Fri, 15 Aug 2025 18:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755283946; 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=IFUovLvEqoxd0f7DnlGQ+JczCo8qiAG1RqPAougNiZE=; b=o0FPQOMfRT/fivAk4/VWmzhz+PzpjB3GYUdOIMeS0XmJAIYxFAjp//ncxwgAvViPx2l4oC PTAGB7vbkbr4jIXobfY3NQc28R12igu2ndMO0OsoqT45MutlQ7gkdbdo96e+6jnTPEF2/h 3I5o6PFdjroLS744y8Bcs8pTQTrkmV4H7TzMmh4XYdAsPua05zRa+2eSK6dncbEOsaRuBE FooXqP2p68/pZrbAQn3CuTnSbYJvx3zlU6nqF+67OOpeg2CzqVUevMMEvH4zUS30sGG9eK Gkp6TMCO3UakEzI8Nbq7+PoezNer0uuJeypywRr3bdpxkRBjLIF2DKJAf8yNlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755283946; 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=IFUovLvEqoxd0f7DnlGQ+JczCo8qiAG1RqPAougNiZE=; b=xkOhSeGq+qXpKhpstnNik1xJ4+tAWkGIZEllXOy1l33i5OqeQOcNt1K2YKs4fytk6Slet+ Kpyx/vXDu4w9BmC4oMu+HaYIqCZRSOx0khpO47rCu8/RWW0BhE7mZW3qMb7ixljQcL0glu juE2hUorZg9AcaQqPt1ZTZhUuUDVJB1trZkXPKE3SUA5g0A8DD30Yw5lLp9KMP9qSquBct FbQ7/pIEw2j5lDkr58pygkOLMtTeXKg6hHyTBamJKwZCC7QBxb/osjB6mRcAHtz9lE1KMd D94ourCP1ZVHBBog5WwtvifdZ+gdZ7ZFuPyxxYl2b2rmWs/kQiMlN+EEH7jDfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755283946; a=rsa-sha256; cv=none; b=kdFvaWJ9SVOoFBahMUi7sIGc3DjbMNSnxbPTcGZMK64Xwyp2djpOdYNRZ1mGjQSubKFkG7 QSep1v9si0riCZV7m9uUEDhfV0dBoR+Or6/yUKOQ2FZCebf6qBobUphtXepa/GyrVggoSO sK/3K+tydW5LsEMwi+PHT5ELDMZXEeMXLc40Y01x2KKPpiN3WLDJ75bKF30fG7iggZM07K DRniuHbQRchnYt2LVr+68bykAY5NWQMa9OzfwMSddlWjRRJVtxXm5mDo5zywZ9JqCQod8a DK3lEC+LAzO4PM4hyYa3ynTqjJ3GTQnvL+F5F2Fhv9INxQXJl5ukgrvBek21cA== 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 4c3WSV5kQhzr84; Fri, 15 Aug 2025 18:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57FIqQJH002811; Fri, 15 Aug 2025 18:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57FIqQxB002808; Fri, 15 Aug 2025 18:52:26 GMT (envelope-from git) Date: Fri, 15 Aug 2025 18:52:26 GMT Message-Id: <202508151852.57FIqQxB002808@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Max Brazhnikov Subject: git: 7993cc541049 - 2025Q3 - graphics/libkexiv2: Remove Qt5 flavor, not used anymore 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q3 X-Git-Reftype: branch X-Git-Commit: 7993cc5410499efd5fc01d01d0289e800f3c85fa Auto-Submitted: auto-generated The branch 2025Q3 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=7993cc5410499efd5fc01d01d0289e800f3c85fa commit 7993cc5410499efd5fc01d01d0289e800f3c85fa Author: Max Brazhnikov AuthorDate: 2025-08-08 14:07:39 +0000 Commit: Max Brazhnikov CommitDate: 2025-08-15 18:19:37 +0000 graphics/libkexiv2: Remove Qt5 flavor, not used anymore (cherry picked from commit 332e37114671cc96f9889d0468caf173df474f1f) --- MOVED | 2 ++ Mk/Uses/kde.mk | 8 +++----- graphics/libkexiv2/Makefile | 18 +++++------------- graphics/libkexiv2/pkg-plist | 36 ++++++++++++++++++------------------ graphics/libkexiv2/pkg-plist.qt5 | 18 ------------------ graphics/libkexiv2/pkg-plist.qt6 | 18 ------------------ 6 files changed, 28 insertions(+), 72 deletions(-) diff --git a/MOVED b/MOVED index eec25c2e3490..0908c3e0a9cf 100644 --- a/MOVED +++ b/MOVED @@ -4647,3 +4647,5 @@ lang/linux-dotnet11-runtime||2025-07-01|Has expired: Ancient version, no practic lang/linux-dotnet-sdk||2025-07-01|Removed: Depends on expired lang/linux-dotnet-runtime, MASTER_SITES gone lang/linux-dotnet-runtime||2025-07-01|Has expired: Ancient version, no practical use lang/linux-dotnet-cli||2025-07-01|Removed, depends on removed lang/linux-dotnet-runtime +graphics/libkexiv2@qt5||2025-08-08|Unflavorize; Qt5 flavor is not needed anymore +graphics/libkexiv2@qt6|graphics/libkexiv2|2025-08-08|Unflavorize; Qt5 flavor is not needed anymore diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 71980d8f867e..0a9a9e70a8b4 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -331,7 +331,7 @@ _USE_PLASMA6_ALL= activities activities-stats activitymanagerd \ _USE_PLASMA_ALL= ${_USE_PLASMA${_KDE_VERSION}_ALL} # List of frequently used components of the KDE Gears distribution. -_USE_GEAR5_ALL= libkdcraw libkexiv2 +_USE_GEAR5_ALL= libkdcraw _USE_GEAR6_ALL= baloo-widgets kate kosm kpublictransport \ libkcddb libkcompactdisc libkdcraw \ libkdegames libkeduvocdocument libkexiv2 \ @@ -982,10 +982,8 @@ kde-libkdegames_LIB= libKDEGames${_KDE_VERSION}.so kde-libkeduvocdocument_PORT= misc/libkeduvocdocument kde-libkeduvocdocument_LIB= libKEduVocDocument.so -kde-libkexiv2_PORT= graphics/libkexiv2@qt${_KDE_VERSION} -kde-libkexiv2_LIB5= libKF${_KDE_VERSION}KExiv2.so -kde-libkexiv2_LIB6= libKExiv2Qt${_KDE_VERSION}.so -kde-libkexiv2_LIB= ${kde-libkexiv2_LIB${_KDE_VERSION}} +kde-libkexiv2_PORT= graphics/libkexiv2 +kde-libkexiv2_LIB= libKExiv2Qt6.so kde-libksane_PORT= graphics/libksane kde-libksane_LIB= libKSaneWidgets${_KDE_VERSION}.so diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index 25aa8d185c2b..79294e16212a 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -1,26 +1,18 @@ PORTNAME= libkexiv2 DISTVERSION= ${KDE_APPLICATIONS_VERSION} CATEGORIES= graphics kde kde-applications -PKGNAMESUFFIX= -${FLAVOR} +PKGNAMESUFFIX= -qt6 MAINTAINER= kde@FreeBSD.org COMMENT= Exiv2 library interface for KDE -WWW= https://www.digikam.org/ - -FLAVORS= qt6 qt5 -FLAVOR?= qt6 +WWW= https://invent.kde.org/graphics/libkexiv2 LIB_DEPENDS= libexiv2.so:graphics/exiv2 -USES= cmake compiler:c++11-lang kde:${FLAVOR:S/qt//} pkgconfig \ - qt:${FLAVOR:S/qt//} tar:xz +USES= cmake compiler:c++11-lang kde:6 pkgconfig \ + qt:6 tar:xz USE_KDE= ecm:build -_USE_QT_qt5= core gui buildtools:build qmake:build -_USE_QT_qt6= base -USE_QT= ${_USE_QT_${FLAVOR}} - +USE_QT= base USE_LDCONFIG= yes -PLIST= pkg-plist.${FLAVOR} - .include diff --git a/graphics/libkexiv2/pkg-plist b/graphics/libkexiv2/pkg-plist index 05ea91de27d0..ce7acb0b7b5d 100644 --- a/graphics/libkexiv2/pkg-plist +++ b/graphics/libkexiv2/pkg-plist @@ -1,18 +1,18 @@ -include/KF5/KExiv2/KExiv2/KExiv2 -include/KF5/KExiv2/KExiv2/KExiv2Data -include/KF5/KExiv2/KExiv2/KExiv2Previews -include/KF5/KExiv2/KExiv2/RotationMatrix -include/KF5/KExiv2/kexiv2/kexiv2.h -include/KF5/KExiv2/kexiv2/kexiv2data.h -include/KF5/KExiv2/kexiv2/kexiv2previews.h -include/KF5/KExiv2/kexiv2/libkexiv2_export.h -include/KF5/KExiv2/kexiv2/rotationmatrix.h -include/KF5/KExiv2/libkexiv2_version.h -lib/cmake/KF5KExiv2/KF5KExiv2Config.cmake -lib/cmake/KF5KExiv2/KF5KExiv2ConfigVersion.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets.cmake -lib/libKF5KExiv2.so -lib/libKF5KExiv2.so.15.0.0 -lib/libKF5KExiv2.so.5.0.0 -share/qlogging-categories5/libkexiv2.categories +include/KExiv2Qt6/KExiv2/KExiv2 +include/KExiv2Qt6/KExiv2/KExiv2Data +include/KExiv2Qt6/KExiv2/KExiv2Previews +include/KExiv2Qt6/KExiv2/RotationMatrix +include/KExiv2Qt6/kexiv2/kexiv2.h +include/KExiv2Qt6/kexiv2/kexiv2data.h +include/KExiv2Qt6/kexiv2/kexiv2previews.h +include/KExiv2Qt6/kexiv2/libkexiv2_export.h +include/KExiv2Qt6/kexiv2/rotationmatrix.h +include/KExiv2Qt6/libkexiv2_version.h +lib/cmake/KExiv2Qt6/KExiv2Qt6Config.cmake +lib/cmake/KExiv2Qt6/KExiv2Qt6ConfigVersion.cmake +lib/cmake/KExiv2Qt6/KExiv2Qt6Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KExiv2Qt6/KExiv2Qt6Targets.cmake +lib/libKExiv2Qt6.so +lib/libKExiv2Qt6.so.0 +lib/libKExiv2Qt6.so.5.1.0 +share/qlogging-categories6/libkexiv2.categories diff --git a/graphics/libkexiv2/pkg-plist.qt5 b/graphics/libkexiv2/pkg-plist.qt5 deleted file mode 100644 index 3d9431d398ef..000000000000 --- a/graphics/libkexiv2/pkg-plist.qt5 +++ /dev/null @@ -1,18 +0,0 @@ -include/KF5/KExiv2/KExiv2/KExiv2 -include/KF5/KExiv2/KExiv2/KExiv2Data -include/KF5/KExiv2/KExiv2/KExiv2Previews -include/KF5/KExiv2/KExiv2/RotationMatrix -include/KF5/KExiv2/kexiv2/kexiv2.h -include/KF5/KExiv2/kexiv2/kexiv2data.h -include/KF5/KExiv2/kexiv2/kexiv2previews.h -include/KF5/KExiv2/kexiv2/libkexiv2_export.h -include/KF5/KExiv2/kexiv2/rotationmatrix.h -include/KF5/KExiv2/libkexiv2_version.h -lib/cmake/KF5KExiv2/KF5KExiv2Config.cmake -lib/cmake/KF5KExiv2/KF5KExiv2ConfigVersion.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets.cmake -lib/libKF5KExiv2.so -lib/libKF5KExiv2.so.15.0.0 -lib/libKF5KExiv2.so.5.1.0 -share/qlogging-categories5/libkexiv2.categories diff --git a/graphics/libkexiv2/pkg-plist.qt6 b/graphics/libkexiv2/pkg-plist.qt6 deleted file mode 100644 index ce7acb0b7b5d..000000000000 --- a/graphics/libkexiv2/pkg-plist.qt6 +++ /dev/null @@ -1,18 +0,0 @@ -include/KExiv2Qt6/KExiv2/KExiv2 -include/KExiv2Qt6/KExiv2/KExiv2Data -include/KExiv2Qt6/KExiv2/KExiv2Previews -include/KExiv2Qt6/KExiv2/RotationMatrix -include/KExiv2Qt6/kexiv2/kexiv2.h -include/KExiv2Qt6/kexiv2/kexiv2data.h -include/KExiv2Qt6/kexiv2/kexiv2previews.h -include/KExiv2Qt6/kexiv2/libkexiv2_export.h -include/KExiv2Qt6/kexiv2/rotationmatrix.h -include/KExiv2Qt6/libkexiv2_version.h -lib/cmake/KExiv2Qt6/KExiv2Qt6Config.cmake -lib/cmake/KExiv2Qt6/KExiv2Qt6ConfigVersion.cmake -lib/cmake/KExiv2Qt6/KExiv2Qt6Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KExiv2Qt6/KExiv2Qt6Targets.cmake -lib/libKExiv2Qt6.so -lib/libKExiv2Qt6.so.0 -lib/libKExiv2Qt6.so.5.1.0 -share/qlogging-categories6/libkexiv2.categories