From nobody Sat Jan 6 17:54:28 2024 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 4T6nyY0nKsz56qTl; Sat, 6 Jan 2024 17:54:29 +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 4T6nyX6xHLz4kWM; Sat, 6 Jan 2024 17:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704563669; 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=4kuhNMt8fAspQsibjRp7t5wqrDTYuhPsmt2y0yAox+o=; b=uxd+7+Lss4eAJR0pgSuWxYBlGAwaQNeBCrFeNQvNuCAszCE2ZnVdEEF4+5mO9HOa/sd+kl p8rBAY2b/+GXBw/3qJM6sdPJPH0Dw5cmPzrS8KJMOm0wPRtCG6jXzokJeheHXQGkFychzV oQa7uYRO02ZcqJus5AF3JCocsleTxPZpovH30dlvUKr/VUsKBJPn1ZEvvGJwot/GJuyugc vSFXh0xCpeiKqcQ7QsDrMYvCedHoBFrx5EL8wEQiAd+mfIC0kO80/VyZ7ArsPOJQfNJVF/ YAZEKfHTILvGYdDQXdBw8MNEbBuyYEEIVR6hpNtRV4xgOXn2QU/p2kKKrirobw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704563669; 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=4kuhNMt8fAspQsibjRp7t5wqrDTYuhPsmt2y0yAox+o=; b=SHy6eohY8uSMbTEYAVvacLN7Dll2KPVxVoskcbbgyBIwf4HXVuPns0cjLKEVskt2mUN+2E zS/nzDh3Ctg4vUr765cUSqxmOJTiPyncgQVCEthBRTD4Zx32smSUGa/PZI+rOKdo3ws3JK nI4v+EgXPDbyJGOUctiYTGzThToZSKOC8rpvJMmsCXJptPOoSLaYD3/t5snESJmZWfXpdb NYZEzCKzdF7dUDM8UTQT0hv2dp+hdc6p4DgW8ifSFuMxsBx43QiEnqfnVvE3r9akg2R4fK If7PzA6Vma0n8n1cTvTMHtqelA6Fuv/ZsMmaKkiQeZPUQ0yG2jZDH3Zf03U1dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704563669; a=rsa-sha256; cv=none; b=EseKjGLaFop8jGmnCMKnbNQ2ZzvHUqRklrFJnZi23W1W7hf1uJdD4kVR4hnCkx8xi5uvmk wogW6nm6BSxTRnz7cjbCYkIY0jOXALTggmGxlUrK0mJIUQVhAs7TG3RcZ/odcmM04KWGaV rNK16A7LMCqtvdV9uDPMBXF3QTQMrnLpwrT6gygoE+y/uGml3DMO/Lj/Nq9vScGh5FNgJS R3CuCPfy8MpixJQ3YMPviEyq57Wq35gQOBda84s0K3g+8JM1blkhYmhd/mruSEv3/Y6v74 xqCSJgndB7T+BEW3wrJ1LGm9O0yxWJYeEuHrC3KtGq52zAlEUxke0Sp1/B7qoQ== 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 4T6nyX62c0zrPB; Sat, 6 Jan 2024 17:54:28 +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 406HsSZS012284; Sat, 6 Jan 2024 17:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 406HsS1S012281; Sat, 6 Jan 2024 17:54:28 GMT (envelope-from git) Date: Sat, 6 Jan 2024 17:54:28 GMT Message-Id: <202401061754.406HsS1S012281@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: bf1a1bec3c18 - main - graphics/libkdcraw: flavorize for Qt5 and Qt6 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf1a1bec3c18eaae2c54ec86570b9fe62b7a0aa8 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf1a1bec3c18eaae2c54ec86570b9fe62b7a0aa8 commit bf1a1bec3c18eaae2c54ec86570b9fe62b7a0aa8 Author: Tobias C. Berner AuthorDate: 2024-01-06 16:46:32 +0000 Commit: Tobias C. Berner CommitDate: 2024-01-06 17:53:52 +0000 graphics/libkdcraw: flavorize for Qt5 and Qt6 --- Mk/Uses/kde.mk | 2 +- graphics/gwenview/Makefile | 1 + graphics/kdegraphics-thumbnailers/Makefile | 1 + graphics/kphotoalbum/Makefile | 6 +++--- graphics/krita/Makefile | 2 +- graphics/libkdcraw/Makefile | 24 +++++++++++++++++------- graphics/libkdcraw/{pkg-plist => pkg-plist.qt5} | 0 graphics/libkdcraw/pkg-plist.qt6 | 18 ++++++++++++++++++ graphics/libkipi/Makefile | 1 + 9 files changed, 43 insertions(+), 12 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index a055ee30b3b6..c53095a1f8c0 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -967,7 +967,7 @@ kde-libkcddb5_LIB= libKF${_KDE_VERSION}Cddb.so kde-libkcompactdisc5_PORT= audio/libkcompactdisc kde-libkcompactdisc5_LIB= libKF${_KDE_VERSION}CompactDisc.so -kde-libkdcraw5_PORT= graphics/libkdcraw +kde-libkdcraw5_PORT= graphics/libkdcraw@qt${_KDE_VERSION} kde-libkdcraw5_LIB= libKF${_KDE_VERSION}KDcraw.so kde-libkdegames5_PORT= games/libkdegames diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index ca5ec748dcfd..d01620c6cb85 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -1,5 +1,6 @@ PORTNAME= gwenview DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/kdegraphics-thumbnailers/Makefile b/graphics/kdegraphics-thumbnailers/Makefile index ce5e893e5a8d..a737a3d4abf5 100644 --- a/graphics/kdegraphics-thumbnailers/Makefile +++ b/graphics/kdegraphics-thumbnailers/Makefile @@ -1,5 +1,6 @@ PORTNAME= kdegraphics-thumbnailers DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 1ab2e724574c..06693bbfd644 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -1,5 +1,6 @@ PORTNAME= kphotoalbum DISTVERSION= 5.12.0 +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE @@ -11,13 +12,12 @@ WWW= https://www.kphotoalbum.org/ LICENSE= GPLv2+ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ - libvlc.so:multimedia/vlc \ - libKF5KDcraw.so:graphics/libkdcraw + libvlc.so:multimedia/vlc USES= cmake compiler:c++11-lang desktop-file-utils jpeg kde:5 \ pkgconfig qt:5 shebangfix tar:xz xorg USE_KDE= archive auth codecs completion config configwidgets coreaddons \ - i18n iconthemes jobwidgets kio marble phonon purpose service solid \ + i18n iconthemes jobwidgets kio libkdcraw marble phonon purpose service solid \ sonnet textwidgets widgetsaddons windowsystem xmlgui \ ecm:build USE_QT= concurrent core dbus declarative gui location network \ diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index a16b1880ce2a..4f041ceca289 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -1,6 +1,6 @@ PORTNAME= krita DISTVERSION= 5.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index c123bc9b868b..7084841b22fb 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -1,6 +1,8 @@ PORTNAME= libkdcraw DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications +PKGNAMESUFFIX?= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= LibRaw interface for KDE @@ -10,15 +12,23 @@ LICENSE= GPLv2+ LIB_DEPENDS= libjasper.so:graphics/jasper \ liblcms.so:graphics/lcms \ - libxml2.so:textproc/libxml2 \ - libraw.so:graphics/libraw + libraw.so:graphics/libraw \ + libxml2.so:textproc/libxml2 -USES= cmake compiler:c++11-lang jpeg kde:5 pkgconfig qt:5 tar:xz +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= cmake compiler:c++11-lang jpeg kde:${FLAVOR:S/qt//} pkgconfig \ + qt:${FLAVOR:S/qt//} tar:xz USE_KDE= ecm:build -USE_QT= core gui \ - buildtools:build qmake:build USE_LDCONFIG= yes -CMAKE_ARGS= -DWITH_OpenMP:BOOL=False \ - -DENABLE_RAWSPEED=True +_USE_QT_qt5= core gui buildtools:build qmake:build +_USE_QT_qt6= base +USE_QT= ${_USE_QT_${FLAVOR}} +CMAKE_ARGS= -DENABLE_RAWSPEED=True \ + -DQT_MAJOR_VERSION="${FLAVOR:S/qt//}" \ + -DWITH_OpenMP:BOOL=False + +PLIST= pkg-plist.${FLAVOR} .include diff --git a/graphics/libkdcraw/pkg-plist b/graphics/libkdcraw/pkg-plist.qt5 similarity index 100% rename from graphics/libkdcraw/pkg-plist rename to graphics/libkdcraw/pkg-plist.qt5 diff --git a/graphics/libkdcraw/pkg-plist.qt6 b/graphics/libkdcraw/pkg-plist.qt6 new file mode 100644 index 000000000000..4f29876c4444 --- /dev/null +++ b/graphics/libkdcraw/pkg-plist.qt6 @@ -0,0 +1,18 @@ +include/KF6/KDCRAW/KDCRAW/DcrawInfoContainer +include/KF6/KDCRAW/KDCRAW/KDcraw +include/KF6/KDCRAW/KDCRAW/RawDecodingSettings +include/KF6/KDCRAW/KDCRAW/RawFiles +include/KF6/KDCRAW/kdcraw/dcrawinfocontainer.h +include/KF6/KDCRAW/kdcraw/kdcraw.h +include/KF6/KDCRAW/kdcraw/libkdcraw_export.h +include/KF6/KDCRAW/kdcraw/rawdecodingsettings.h +include/KF6/KDCRAW/kdcraw/rawfiles.h +include/KF6/KDCRAW/libkdcraw_version.h +lib/cmake/KF6KDcraw/KF6KDcrawConfig.cmake +lib/cmake/KF6KDcraw/KF6KDcrawConfigVersion.cmake +lib/cmake/KF6KDcraw/KF6KDcrawTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KF6KDcraw/KF6KDcrawTargets.cmake +lib/libKF6KDcraw.so +lib/libKF6KDcraw.so.5 +lib/libKF6KDcraw.so.5.0.0 +share/qlogging-categories6/libkdcraw.categories diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile index 5d06d5023f1b..779345400b92 100644 --- a/graphics/libkipi/Makefile +++ b/graphics/libkipi/Makefile @@ -1,5 +1,6 @@ PORTNAME= libkipi DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org