1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

graphics/kcolorpicker: Update to 0.3.0

graphics/kimageannotator: Update to 0.7.0

Flavorize both ports for qt5 and qt6 variants and update consumers.

While here, drop several unused deps for graphics/gwenview.
This commit is contained in:
Jason E. Hale 2024-01-26 03:03:51 -05:00
parent a11ad3eb5a
commit ca1c0acc93
13 changed files with 194 additions and 83 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= gwenview
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -14,20 +14,20 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
liblcms2.so:graphics/lcms2 \
libpng.so:graphics/png \
libtiff.so:graphics/tiff \
libkImageAnnotator.so:graphics/kimageannotator
RUN_DEPENDS= kipi-plugins>=0:graphics/kipi-plugins
libwayland-client.so:graphics/wayland \
libkImageAnnotator-Qt5.so:graphics/kimageannotator@qt5
USES= compiler:c++11-lang cmake desktop-file-utils gettext jpeg pkgconfig \
kde:5 qt:5 tar:xz xorg
USES= compiler:c++11-lang cmake desktop-file-utils gettext-tools \
jpeg pkgconfig kde:5 qt:5 tar:xz xorg
USE_KDE= activities auth baloo bookmarks codecs completion config \
configwidgets coreaddons emoticons filemetadata guiaddons i18n \
configwidgets coreaddons filemetadata guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kimageformats kio libkdcraw libkipi \
notifications parts phonon service solid sonnet textwidgets \
widgetsaddons windowsystem xmlgui \
kimageformats kio libkdcraw notifications parts phonon \
purpose service solid sonnet textwidgets widgetsaddons \
windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus gui network opengl printsupport \
svg widgets x11extras xml \
USE_QT= concurrent core dbus gui network printsupport \
svg wayland widgets x11extras xml \
buildtools:build qmake:build
USE_XORG= x11

View File

@ -0,0 +1,25 @@
--- CMakeLists.txt.orig 2023-11-30 17:00:43 UTC
+++ CMakeLists.txt
@@ -166,12 +166,17 @@ if (QT_MAJOR_VERSION STREQUAL "5")
endif()
if (QT_MAJOR_VERSION STREQUAL "5")
- find_package(kImageAnnotator)
- set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
- if(kImageAnnotator_FOUND)
+ find_package(kImageAnnotator QUIET)
+ set(KIMAGEANNOTATOR_SUFFIX "")
+ if(NOT kImageAnnotator_FOUND)
+ set(KIMAGEANNOTATOR_SUFFIX "-Qt${QT_MAJOR_VERSION}")
+ find_package(kImageAnnotator${KIMAGEANNOTATOR_SUFFIX})
+ endif()
+ set_package_properties(kImageAnnotator${KIMAGEANNOTATOR_SUFFIX} PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
+ if(kImageAnnotator${KIMAGEANNOTATOR_SUFFIX}_FOUND)
set(KIMAGEANNOTATOR_FOUND 1)
- find_package(kColorPicker REQUIRED)
- if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0)
+ find_package(kColorPicker${KIMAGEANNOTATOR_SUFFIX} REQUIRED)
+ if(NOT kImageAnnotator${KIMAGEANNOTATOR_SUFFIX}_VERSION VERSION_LESS 0.5.0)
set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
endif()
endif()

View File

@ -0,0 +1,10 @@
--- app/CMakeLists.txt.orig 2023-11-30 17:00:43 UTC
+++ app/CMakeLists.txt
@@ -157,6 +157,6 @@ target_link_libraries(slideshowfileitemaction
KF${QT_MAJOR_VERSION}::KIOWidgets
KF${QT_MAJOR_VERSION}::Notifications)
-if(kImageAnnotator_FOUND)
+if(kImageAnnotator${KIMAGEANNOTATOR_SUFFIX}_FOUND)
target_link_libraries(gwenview kImageAnnotator::kImageAnnotator)
endif()

View File

@ -0,0 +1,20 @@
--- lib/CMakeLists.txt.orig 2023-11-30 17:00:43 UTC
+++ lib/CMakeLists.txt
@@ -157,7 +157,7 @@ set(gwenviewlib_SRCS
touch/touch_helper.cpp
${GV_JPEG_DIR}/transupp.c
)
-if (kImageAnnotator_FOUND)
+if (kImageAnnotator${KIMAGEANNOTATOR_SUFFIX}_FOUND)
set(gwenviewlib_SRCS ${gwenviewlib_SRCS}
annotate/annotatedialog.cpp
annotate/annotateoperation.cpp
@@ -338,7 +338,7 @@ endif()
)
endif()
-if(kImageAnnotator_FOUND)
+if(kImageAnnotator${KIMAGEANNOTATOR_SUFFIX}_FOUND)
target_link_libraries(gwenviewlib kImageAnnotator::kImageAnnotator)
endif()

View File

@ -1,22 +1,34 @@
PORTNAME= kColorPicker
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.0
PORTREVISION= 1
DISTVERSION= 0.3.0
CATEGORIES= graphics kde
PKGNAMESUFFIX= -${FLAVOR}
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt based Color Picker library with popup menu
COMMENT= Qt-based color picker library with popup menu
WWW= https://github.com/ksnip/kColorPicker
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cmake compiler:c++11-lang qt:5
FLAVORS= qt5 qt6
FLAVOR?= ${FLAVORS:[1]}
USES= cmake compiler:c++17-lang gl qt:${FLAVOR:S/qt//}
USE_GITHUB= yes
GH_ACCOUNT= ksnip
USE_QT= core gui widgets \
_USE_GL_qt5= # empty
_USE_GL_qt6= opengl
USE_GL= ${_USE_GL_${FLAVOR}}
_USE_QT_qt5= core gui widgets \
buildtools:build qmake:build testlib:build
_USE_QT_qt6= base
USE_QT= ${_USE_QT_${FLAVOR}}
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_ON= BUILD_SHARED_LIBS BUILD_WITH_QT${FLAVOR:S/qt//}
PLIST_SUB= QT_VER=${FLAVOR:S/qt//} \
SHLIB_VER=${DISTVERSION} \
SHLIB_VER_MAJ=${DISTVERSION:R:R}
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1653318634
SHA256 (ksnip-kColorPicker-v0.2.0_GH0.tar.gz) = 20ffc5e935333a18c5cd813c3d306d3482ec9c826fe0d0c3d7b7635419703d55
SIZE (ksnip-kColorPicker-v0.2.0_GH0.tar.gz) = 12735
TIMESTAMP = 1706133480
SHA256 (ksnip-kColorPicker-v0.3.0_GH0.tar.gz) = cab1efae1ca345a831dc6975b81c344da5c9425d934d73584dd7d0d512af3946
SIZE (ksnip-kColorPicker-v0.3.0_GH0.tar.gz) = 12998

View File

@ -1,9 +1,9 @@
include/kColorPicker/KColorPicker.h
include/kColorPicker/KColorPickerExport.h
lib/cmake/kColorPicker/kColorPicker-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/kColorPicker/kColorPicker-targets.cmake
lib/cmake/kColorPicker/kColorPickerConfig-version.cmake
lib/cmake/kColorPicker/kColorPickerConfig.cmake
lib/libkColorPicker.so
lib/libkColorPicker.so.0
lib/libkColorPicker.so.0.2.0
include/kColorPicker-Qt%%QT_VER%%/kColorPicker/KColorPicker.h
include/kColorPicker-Qt%%QT_VER%%/kColorPicker/KColorPickerExport.h
lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%-targets.cmake
lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%Config-version.cmake
lib/cmake/kColorPicker-Qt%%QT_VER%%/kColorPicker-Qt%%QT_VER%%Config.cmake
lib/libkColorPicker-Qt%%QT_VER%%.so
lib/libkColorPicker-Qt%%QT_VER%%.so.%%SHLIB_VER_MAJ%%
lib/libkColorPicker-Qt%%QT_VER%%.so.%%SHLIB_VER%%

View File

@ -1,27 +1,43 @@
PORTNAME= kImageAnnotator
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.1
DISTVERSION= 0.7.0
CATEGORIES= graphics kde
PKGNAMESUFFIX= -${FLAVOR}
MAINTAINER= kde@FreeBSD.org
COMMENT= Library for image-annotation tools
WWW= https://github.com/ksnip/kImageAnnotator
LICENSE= GPLv2
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libkColorPicker.so:graphics/kcolorpicker
FLAVORS= qt5 qt6
FLAVOR?= ${FLAVORS:[1]}
qt5_LIB_DEPENDS= libkColorPicker-Qt5.so:graphics/kcolorpicker@qt5
qt6_LIB_DEPENDS= libkColorPicker-Qt6.so:graphics/kcolorpicker@qt6
USES= cmake localbase compiler:c++11-lang qt:5 xorg
USES= cmake localbase compiler:c++17-lang gl qt:${FLAVOR:S/qt//} xorg
USE_GITHUB= yes
GH_ACCOUNT= ksnip
USE_QT= core gui svg widgets \
_USE_GL_qt5= # empty
_USE_GL_qt6= opengl
USE_GL= ${_USE_GL_${FLAVOR}}
_USE_QT_qt5= core gui svg widgets \
buildtools:build linguisttools:build qmake:build
_USE_QT_qt6= base svg \
tools:build
USE_QT= ${_USE_QT_${FLAVOR}}
USE_XORG= x11
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_ON= BUILD_SHARED_LIBS BUILD_WITH_${FLAVOR:tu}
CMAKE_OFF= BUILD_EXAMPLE
PLIST_SUB= SHLIB_VER=${DISTVERSION}
_QT5_ONLY_qt5= #
_QT5_ONLY_qt6= "@comment "
PLIST_SUB= QT5_ONLY=${_QT5_ONLY_${FLAVOR}} \
QT_VER=${FLAVOR:S/qt//} \
SHLIB_VER=${DISTVERSION} \
SHLIB_VER_MAJ=${DISTVERSION:R:R}
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1678917410
SHA256 (ksnip-kImageAnnotator-v0.6.1_GH0.tar.gz) = 8d32f0722dbb59a387d5d07c83a483e1b32f5014183eb67f2a9c5340da73d369
SIZE (ksnip-kImageAnnotator-v0.6.1_GH0.tar.gz) = 264176
TIMESTAMP = 1706236372
SHA256 (ksnip-kImageAnnotator-v0.7.0_GH0.tar.gz) = 66e6ff5de1f8f808834143130a0a06d203aa01fb8f02e65af73042e61342163a
SIZE (ksnip-kImageAnnotator-v0.7.0_GH0.tar.gz) = 266849

View File

@ -1,40 +1,40 @@
include/kImageAnnotator/KImageAnnotator.h
include/kImageAnnotator/KImageAnnotatorExport.h
lib/cmake/kImageAnnotator/kImageAnnotator-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/kImageAnnotator/kImageAnnotator-targets.cmake
lib/cmake/kImageAnnotator/kImageAnnotatorConfig-version.cmake
lib/cmake/kImageAnnotator/kImageAnnotatorConfig.cmake
lib/libkImageAnnotator.so
lib/libkImageAnnotator.so.0
lib/libkImageAnnotator.so.%%SHLIB_VER%%
%%DATADIR%%/translations/kImageAnnotator_ar.qm
%%DATADIR%%/translations/kImageAnnotator_bg.qm
%%DATADIR%%/translations/kImageAnnotator_ca.qm
%%DATADIR%%/translations/kImageAnnotator_cs.qm
%%DATADIR%%/translations/kImageAnnotator_da.qm
%%DATADIR%%/translations/kImageAnnotator_de.qm
%%DATADIR%%/translations/kImageAnnotator_el.qm
%%DATADIR%%/translations/kImageAnnotator_es.qm
%%DATADIR%%/translations/kImageAnnotator_eu.qm
%%DATADIR%%/translations/kImageAnnotator_fr.qm
%%DATADIR%%/translations/kImageAnnotator_fr_CA.qm
%%DATADIR%%/translations/kImageAnnotator_gl.qm
%%DATADIR%%/translations/kImageAnnotator_hr.qm
%%DATADIR%%/translations/kImageAnnotator_hu.qm
%%DATADIR%%/translations/kImageAnnotator_id.qm
%%DATADIR%%/translations/kImageAnnotator_it.qm
%%DATADIR%%/translations/kImageAnnotator_ja.qm
%%DATADIR%%/translations/kImageAnnotator_ko.qm
%%DATADIR%%/translations/kImageAnnotator_nl.qm
%%DATADIR%%/translations/kImageAnnotator_no.qm
%%DATADIR%%/translations/kImageAnnotator_pl.qm
%%DATADIR%%/translations/kImageAnnotator_pt.qm
%%DATADIR%%/translations/kImageAnnotator_pt_BR.qm
%%DATADIR%%/translations/kImageAnnotator_ro.qm
%%DATADIR%%/translations/kImageAnnotator_ru.qm
%%DATADIR%%/translations/kImageAnnotator_si.qm
%%DATADIR%%/translations/kImageAnnotator_sq.qm
%%DATADIR%%/translations/kImageAnnotator_sv.qm
%%DATADIR%%/translations/kImageAnnotator_tr.qm
%%DATADIR%%/translations/kImageAnnotator_uk.qm
%%DATADIR%%/translations/kImageAnnotator_zh_CN.qm
include/kImageAnnotator-Qt%%QT_VER%%/kImageAnnotator/KImageAnnotator.h
include/kImageAnnotator-Qt%%QT_VER%%/kImageAnnotator/KImageAnnotatorExport.h
lib/cmake/kImageAnnotator-Qt%%QT_VER%%/kImageAnnotator-Qt%%QT_VER%%Config-version.cmake
lib/cmake/kImageAnnotator-Qt%%QT_VER%%/kImageAnnotator-Qt%%QT_VER%%Config.cmake
lib/cmake/kImageAnnotator-Qt%%QT_VER%%/kImageAnnotator-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/kImageAnnotator-Qt%%QT_VER%%/kImageAnnotator-targets.cmake
lib/libkImageAnnotator-Qt%%QT_VER%%.so
lib/libkImageAnnotator-Qt%%QT_VER%%.so.%%SHLIB_VER_MAJ%%
lib/libkImageAnnotator-Qt%%QT_VER%%.so.%%SHLIB_VER%%
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ar.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_bg.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ca.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_cs.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_da.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_de.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_el.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_es.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_eu.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_fr.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_fr_CA.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_gl.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_hr.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_hu.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_id.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_it.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ja.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ko.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_nl.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_no.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_pl.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_pt.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_pt_BR.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ro.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_ru.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_si.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_sq.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_sv.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_tr.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_uk.qm
%%QT5_ONLY%%%%DATADIR%%/translations/kImageAnnotator_zh_CN.qm

View File

@ -1,6 +1,7 @@
PORTNAME= ksnip
DISTVERSIONPREFIX= v
DISTVERSION= 1.10.1
PORTREVISION= 2
CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
@ -10,15 +11,15 @@ WWW= https://github.com/ksnip/ksnip
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libkColorPicker.so:graphics/kcolorpicker \
libkImageAnnotator.so:graphics/kimageannotator
LIB_DEPENDS= libkColorPicker-Qt5.so:graphics/kcolorpicker@qt5 \
libkImageAnnotator-Qt5.so:graphics/kimageannotator@qt5
USES= cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 xorg
USE_GITHUB= yes
USE_KDE= ecm:build
USE_QT= concurrent core dbus gui network printsupport svg testlib \
USE_QT= concurrent core dbus gui network printsupport svg \
widgets x11extras xml \
buildtools:build linguisttools:build qmake:build
buildtools:build linguisttools:build qmake:build testlib:build
USE_XORG= x11 xcb
PORTSCOUT= limit:^[0-9]

View File

@ -0,0 +1,16 @@
--- CMakeLists.txt.orig 2023-03-15 09:08:40 UTC
+++ CMakeLists.txt
@@ -61,10 +61,10 @@ set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED ${QT_COMPONENTS})
set(KIMAGEANNOTATOR_MIN_VERSION 0.6.1)
-find_package(kImageAnnotator ${KIMAGEANNOTATOR_MIN_VERSION} REQUIRED)
+find_package(kImageAnnotator-Qt5 ${KIMAGEANNOTATOR_MIN_VERSION} REQUIRED)
-set(KCOLORPICKER_MIN_VERSION 0.2.0)
-find_package(kColorPicker ${KCOLORPICKER_MIN_VERSION} REQUIRED)
+set(KCOLORPICKER_MIN_VERSION 0.3.0)
+find_package(kColorPicker-Qt5 ${KCOLORPICKER_MIN_VERSION} REQUIRED)
set(BASEPATH "${CMAKE_SOURCE_DIR}")
include_directories("${BASEPATH}")

View File

@ -0,0 +1,11 @@
--- src/CMakeLists.txt.orig 2024-01-26 06:54:23 UTC
+++ src/CMakeLists.txt
@@ -273,7 +273,7 @@ elseif (UNIX)
Qt5::DBus
Qt5::X11Extras
kImageAnnotator::kImageAnnotator
- kColorPicker::kColorPicker
+ kColorPicker::kColorPicker-Qt5
XCB::XFIXES
)