diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile index dddcc89f4e2b..8a6ab473699a 100644 --- a/science/kalzium/Makefile +++ b/science/kalzium/Makefile @@ -1,35 +1,35 @@ PORTNAME= kalzium DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= science education kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Periodic table of elements for KDE WWW= https://www.kde.org/applications/education/kalzium LICENSE= GPLv2 LGPL20 GFDL LICENSE_COMB= multi -LIB_DEPENDS= libopenbabel.so:science/openbabel \ - libAvogadroCore.so:science/avogadrolibs BUILD_DEPENDS= ${LOCALBASE}/lib/ocaml/facile/facile.a:math/facile \ ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data +LIB_DEPENDS= libAvogadroCore.so:science/avogadrolibs \ + libopenbabel.so:science/openbabel RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data -USES= cmake compiler:c++11-lang desktop-file-utils gettext gl kde:6 \ - ocaml:build pkgconfig qt:6 tar:xz xorg -USE_GL= gl glew glu -USE_KDE= archive attica auth bookmarks codecs completion config \ - configwidgets coreaddons crash doctools guiaddons i18n \ - iconthemes itemmodels itemviews jobwidgets kio newstuff \ - notifications parts plotting service solid sonnet textwidgets \ - unitconversion widgetsaddons windowsystem xmlgui \ +USES= cmake compiler:c++17-lang desktop-file-utils gettext-tools gl \ + kde:6 ocaml:build pkgconfig qt:6 tar:xz xorg +USE_GL= opengl +USE_KDE= attica colorscheme completion config configwidgets \ + coreaddons crash doctools guiaddons i18n itemviews \ + jobwidgets kio newstuff plotting service sonnet textwidgets \ + unitconversion widgetsaddons xmlgui \ ecm:build -USE_QT= base scxml -USE_XORG= x11 USE_LDCONFIG= yes +USE_QT= 5compat base declarative scxml svg +USE_XORG= x11 PIE_UNSAFE= yes OPTIONS_DEFINE= DOCS .include diff --git a/science/kalzium/files/patch-CMakeLists.txt b/science/kalzium/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..df35dfe618f3 --- /dev/null +++ b/science/kalzium/files/patch-CMakeLists.txt @@ -0,0 +1,25 @@ +Remove unused KF6 Archive component. + +The Avogadro:Gui target requires the Qt::Concurrent target to be found. + +--- CMakeLists.txt.orig 2026-02-28 11:23:51 UTC ++++ CMakeLists.txt +@@ -89,7 +89,6 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS + ) + + find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS +- Archive + Config + ConfigWidgets + CoreAddons +@@ -122,6 +121,10 @@ ecm_set_disabled_deprecation_versions(QT 5.14.0 + KF 6.13 + ) + ++ ++if (AvogadroLibs_FOUND) ++ find_package(Qt6Concurrent ${QT_MIN_VERSION} REQUIRED) ++endif() + + if (HAVE_OPENBABEL AND AvogadroLibs_FOUND AND Eigen3_FOUND) + find_package(Qt6OpenGL ${QT_MIN_VERSION} REQUIRED) diff --git a/science/kalzium/files/patch-compoundviewer_CMakeLists.txt b/science/kalzium/files/patch-compoundviewer_CMakeLists.txt deleted file mode 100644 index 3d724429669b..000000000000 --- a/science/kalzium/files/patch-compoundviewer_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -- fix linking with avogadrolibs: it fails w/out the lib specification -- cmake's link_directories doesn't work for some reason - ---- compoundviewer/CMakeLists.txt.orig 2023-11-30 16:56:21 UTC -+++ compoundviewer/CMakeLists.txt -@@ -30,6 +30,7 @@ target_link_libraries(compoundviewer - AvogadroQtOpenGL - AvogadroQtPlugins - Eigen3::Eigen -+ -L${CMAKE_INSTALL_PREFIX}/lib - ) - - target_include_directories(compoundviewer PRIVATE