From nobody Wed Feb 05 10:41:29 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 4YnxcB43YTz5mYZ5; Wed, 05 Feb 2025 10:41:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnxcB19zwz3lY6; Wed, 05 Feb 2025 10:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738752090; 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=HSHImeCkun50tUpAgjP+IgfDmQcApVNn2kiudEbIs24=; b=Riuz1pv9eViV+7HcAf2py2HMWmjyahw6rcVAhOXXqfVLnewyJ93mCiW/J/CSXIGEdtMt3t IGtan0CoS0R6oGA3SWB7ixZi2i3OGLFeULHkDPBtMMag0yxM6T7bwKtQ1Jm0rSRq8MTtfe 3aLxq0lxJ4553uzFvF8bFIWYGrGG8P+BqC94AJvSZgFioPVNjXrEylh+on5ojRjGzsC37x QwsMwUG8DSIpT58zJtpEvhiMcFxfi0UC6G2VUZ+CF0Ief9kTsie+6IRNN8UpTc1RWUCCQk bJlF+5yNdxVQH+kJ56xLYrfNRRPtkln4TIXNm8w+8oNuVB1V5cihq247O+6eig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738752090; 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=HSHImeCkun50tUpAgjP+IgfDmQcApVNn2kiudEbIs24=; b=ZHQykCaUg3SZK8hFw1kHNns0P1yHZ2aswlpej7pW+LPE36X57t2Oft3WWPs4fMGCy8qKLH AuMYih8lZEOtvagNn56q4G1h5bNMtVWiRE4d1lnvDxb7EU1F/VBinaxi2Z12e4bmxrMe2L WANOpCqIxLtDgHmosSFKpZNk/zhSfknMxwkgq0ELmSIamnf7gPAzfYRPem+8ewYvNlJY5T DBiveaONW4gn5/LHoQ9MN4NiUaNUJPy4JgeUx0bXvMscgZObj8jrzHOF4cgyOnhoPYFVne bee+S024M6AOQxhuhQHw9dgb0sOsBnvzo0iC1yLqs0YwJq4hnQsLCXH5BpnHGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738752090; a=rsa-sha256; cv=none; b=UymCsICEJ9aJ9oR4m+J273vrsPY8PvTuIBW4oewjz6IPlGv7hzbFp2GhL2QaJznswNP10f rDQstOiRgNueGulsPExIWEb2lK9t5pym1JGcDWv5qTQl764nrBrPaDEvp+Ng1z54k70bl+ bsDXGzZiQQaIRgqy4GzgHIAyi0ZQlYDvAfXQ7yoO4P4No+UXhcYBCfCBrUOsfvYDQZDMOH er8V95CKW7CYYLqhgYOcdun6qIF22oLkKhYi8Ana87bIhKicyI9XBv02Q+yhT1MIG3+ZMe VpT74VqAckOoBatsgnM0lf04tjx2r+CtkOzQ4FBm7innt4kIQFlkIQV153K6Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnxcB0PbxzpXH; Wed, 05 Feb 2025 10:41:30 +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 515AfTGB049911; Wed, 5 Feb 2025 10:41:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515AfTOU049908; Wed, 5 Feb 2025 10:41:29 GMT (envelope-from git) Date: Wed, 5 Feb 2025 10:41:29 GMT Message-Id: <202502051041.515AfTOU049908@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 09a72b602bd7 - main - graphics/kgraphviewer: update to 2.5.0 and switch to KF6/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: 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/main X-Git-Reftype: branch X-Git-Commit: 09a72b602bd7fcf6d96846181bb57f100781ea00 Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=09a72b602bd7fcf6d96846181bb57f100781ea00 commit 09a72b602bd7fcf6d96846181bb57f100781ea00 Author: Max Brazhnikov AuthorDate: 2025-02-05 10:40:58 +0000 Commit: Max Brazhnikov CommitDate: 2025-02-05 10:40:58 +0000 graphics/kgraphviewer: update to 2.5.0 and switch to KF6/Qt6 - Update WWW - Remove stale patches --- graphics/kgraphviewer/Makefile | 19 ++++--- graphics/kgraphviewer/distinfo | 6 +-- .../files/patch-cmake_FindGraphviz.cmake | 58 --------------------- .../files/patch-src_part_CMakeLists.txt | 12 ----- graphics/kgraphviewer/pkg-plist | 59 +++++++++------------- 5 files changed, 35 insertions(+), 119 deletions(-) diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile index d7f8e6683293..b67c115fb036 100644 --- a/graphics/kgraphviewer/Makefile +++ b/graphics/kgraphviewer/Makefile @@ -1,13 +1,12 @@ PORTNAME= kgraphviewer -DISTVERSION= 2.4.3 -PORTREVISION= 8 +DISTVERSION= 2.5.0 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Graphs-viewer for GraphViz files -WWW= https://extragear.kde.org/apps/kgraphviewer/ +WWW= https://apps.kde.org/kgraphviewer/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -15,14 +14,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs LIB_DEPENDS= libgvc.so:graphics/graphviz -USES= cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 tar:xz \ - pkgconfig xorg -USE_KDE= auth codecs completion config configwidgets \ - coreaddons i18n iconthemes jobwidgets kio parts service \ - solid sonnet textwidgets widgetsaddons windowsystem xmlgui \ +USES= cmake compiler:c++11-lang desktop-file-utils gettext \ + kde:6 pkgconfig qt:6 tar:xz xorg +USE_KDE= coreaddons i18n parts widgetsaddons \ ecm:build doctools:build -USE_QT= concurrent core dbus gui network printsupport svg widgets xml \ - buildtools:build qmake:build +USE_QT= 5compat base svg \ + tools:build USE_XORG= x11 +PLIST_SUB= SHLIB_VER=${PORTVERSION} + .include diff --git a/graphics/kgraphviewer/distinfo b/graphics/kgraphviewer/distinfo index d4c8dbfb911c..cff49de1280e 100644 --- a/graphics/kgraphviewer/distinfo +++ b/graphics/kgraphviewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537292561 -SHA256 (KDE/kgraphviewer/kgraphviewer-2.4.3.tar.xz) = 54e0c218453912ea82ad9a96edfb2d4dfd8cb15f6a567ef843b4ef97d07bd7c0 -SIZE (KDE/kgraphviewer/kgraphviewer-2.4.3.tar.xz) = 1491328 +TIMESTAMP = 1738703572 +SHA256 (KDE/kgraphviewer/kgraphviewer-2.5.0.tar.xz) = 872bee63fb4df6f7fb2b4eaf02ff825cba3ca953ac02509a287fe5cd0f1e2b69 +SIZE (KDE/kgraphviewer/kgraphviewer-2.5.0.tar.xz) = 1571364 diff --git a/graphics/kgraphviewer/files/patch-cmake_FindGraphviz.cmake b/graphics/kgraphviewer/files/patch-cmake_FindGraphviz.cmake deleted file mode 100644 index 054b0112b971..000000000000 --- a/graphics/kgraphviewer/files/patch-cmake_FindGraphviz.cmake +++ /dev/null @@ -1,58 +0,0 @@ -Don't name-collide the variables from pkg-config with the ones this -CMake find-module is supposed to set. Follow the hints that pkg-config -provides to find the actual libraries. ---- cmake/FindGraphviz.cmake.orig 2017-09-27 13:15:56 UTC -+++ cmake/FindGraphviz.cmake -@@ -29,10 +29,8 @@ - if ( NOT WIN32 ) - - find_package(PkgConfig) -- pkg_check_modules( graphviz ${REQUIRED} libgvc libcdt libcgraph libpathplan ) -- if ( graphviz_FOUND ) -- set ( graphviz_INCLUDE_DIRECTORIES ${graphviz_INCLUDE_DIRS} ) -- endif ( graphviz_FOUND ) -+ # Don't name-collide with the find_library() calls below, use pc_ prefix -+ pkg_check_modules( pc_graphviz ${REQUIRED} libgvc libcdt libcgraph libpathplan ) - - endif ( NOT WIN32 ) - -@@ -43,6 +41,7 @@ find_path( graphviz_INCLUDE_DIRECTORIES - /usr/local/include - /usr/include - PATH_SUFFIXES graphviz -+ HINTS ${pc_graphviz_INCLUDE_DIRECTORIES} - ) - - find_library( graphviz_GVC_LIBRARY -@@ -53,6 +52,7 @@ find_library( graphviz_GVC_LIBRARY - /usr/lib64 - /usr/local/lib - /usr/lib -+ HINTS ${pc_graphviz_LIBRARY_DIRS} - ) - - find_library( graphviz_CDT_LIBRARY -@@ -63,6 +63,7 @@ find_library( graphviz_CDT_LIBRARY - /usr/lib64 - /usr/local/lib - /usr/lib -+ HINTS ${pc_graphviz_LIBRARY_DIRS} - ) - - find_library( graphviz_GRAPH_LIBRARY -@@ -73,6 +74,7 @@ find_library( graphviz_GRAPH_LIBRARY - /usr/lib64 - /usr/local/lib - /usr/lib -+ HINTS ${pc_graphviz_LIBRARY_DIRS} - ) - - find_library( graphviz_PATHPLAN_LIBRARY -@@ -83,6 +85,7 @@ find_library( graphviz_PATHPLAN_LIBRARY - /usr/lib64 - /usr/local/lib - /usr/lib -+ HINTS ${pc_graphviz_LIBRARY_DIRS} - ) - - if ( graphviz_INCLUDE_DIRECTORIES AND diff --git a/graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt b/graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt deleted file mode 100644 index f5c0ad517b9b..000000000000 --- a/graphics/kgraphviewer/files/patch-src_part_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -The gvc, cgraph, .. libraries are already linked to kgraphviewerlib. ---- src/part/CMakeLists.txt.orig 2017-09-27 13:15:56 UTC -+++ src/part/CMakeLists.txt -@@ -79,7 +79,7 @@ set( kgraphviewerpart_PART_SRCS kgraphvi - add_library(kgraphviewerpart MODULE ${kgraphviewerpart_PART_SRCS}) - generate_export_header(kgraphviewerpart BASE_NAME kgraphviewer) - --target_link_libraries(kgraphviewerpart Qt5::Core KF5::Parts gvc cgraph pathplan cdt kgraphviewerlib) -+target_link_libraries(kgraphviewerpart Qt5::Core KF5::Parts kgraphviewerlib) - - install( TARGETS kgraphviewerpart DESTINATION ${KDE_INSTALL_PLUGINDIR}) - diff --git a/graphics/kgraphviewer/pkg-plist b/graphics/kgraphviewer/pkg-plist index c78fbe107827..ad592b870fe2 100644 --- a/graphics/kgraphviewer/pkg-plist +++ b/graphics/kgraphviewer/pkg-plist @@ -1,31 +1,29 @@ bin/kgraphviewer -etc/xdg/kgraphviewer.categories include/kgraphviewer/kgraphviewer_interface.h lib/cmake/KGraphViewerPart/KGraphViewerPartConfig.cmake lib/cmake/KGraphViewerPart/KGraphViewerPartConfigVersion.cmake +lib/cmake/KGraphViewerPart/KGraphViewerPartTargets.cmake lib/libkgraphviewer.so -lib/libkgraphviewer.so.2.4.3 -lib/libkgraphviewer.so.3 -%%QT_PLUGINDIR%%/kgraphviewerpart.so +lib/libkgraphviewer.so.0 +lib/libkgraphviewer.so.%%SHLIB_VER%% +%%QT_PLUGINDIR%%/kf6/parts/kgraphviewerpart.so share/applications/org.kde.kgraphviewer.desktop share/config.kcfg/kgraphviewer_partsettings.kcfg share/config.kcfg/kgraphviewersettings.kcfg -share/doc/HTML/de/kgraphviewer/index.cache.bz2 -share/doc/HTML/de/kgraphviewer/index.docbook -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ask2.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ask3.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-config1.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-config2.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-config3.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-init.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-main.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-pagesmarges.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ppview1.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ppview2.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-ppview3.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-psetup1.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-zmax.png -share/doc/HTML/de/kgraphviewer/kgraphviewer-snap-zmin.png +share/doc/HTML/ca/kgraphviewer/index.cache.bz2 +share/doc/HTML/ca/kgraphviewer/index.docbook +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-ask1.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-ask2.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-ask3.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-config-appearance.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-config-parsing.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-config1.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-config2.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-config3.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-init.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-main.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-pagesmarges.png +share/doc/HTML/ca/kgraphviewer/kgraphviewer-snap-psetup1.png share/doc/HTML/en/kgraphviewer/index.cache.bz2 share/doc/HTML/en/kgraphviewer/index.docbook share/doc/HTML/en/kgraphviewer/kgraphviewer-but-layout.png @@ -55,16 +53,10 @@ share/doc/HTML/en/kgraphviewer/kgraphviewer-snap-ppview3.png share/doc/HTML/en/kgraphviewer/kgraphviewer-snap-psetup1.png share/doc/HTML/en/kgraphviewer/kgraphviewer-snap-zmax.png share/doc/HTML/en/kgraphviewer/kgraphviewer-snap-zmin.png -share/doc/HTML/et/kgraphviewer/index.cache.bz2 -share/doc/HTML/et/kgraphviewer/index.docbook share/doc/HTML/it/kgraphviewer/index.cache.bz2 share/doc/HTML/it/kgraphviewer/index.docbook share/doc/HTML/nl/kgraphviewer/index.cache.bz2 share/doc/HTML/nl/kgraphviewer/index.docbook -share/doc/HTML/pt/kgraphviewer/index.cache.bz2 -share/doc/HTML/pt/kgraphviewer/index.docbook -share/doc/HTML/pt_BR/kgraphviewer/index.cache.bz2 -share/doc/HTML/pt_BR/kgraphviewer/index.docbook share/doc/HTML/sv/kgraphviewer/index.cache.bz2 share/doc/HTML/sv/kgraphviewer/index.docbook share/doc/HTML/sv/kgraphviewer/kgraphviewer-snap-ask1.png @@ -86,16 +78,7 @@ share/doc/HTML/uk/kgraphviewer/index.cache.bz2 share/doc/HTML/uk/kgraphviewer/index.docbook share/icons/hicolor/16x16/apps/kgraphviewer.png share/icons/hicolor/32x32/apps/kgraphviewer.png -share/kgraphviewerpart/pics/chain-broken.png -share/kgraphviewerpart/pics/chain.png -share/kgraphviewerpart/pics/kgraphviewer-bev.png -share/kgraphviewerpart/pics/kgraphviewer-newedge.png -share/kgraphviewerpart/pics/kgraphviewer-newnode.png -share/kservices5/kgraphviewer_part.desktop -share/kxmlgui5/kgraphviewer/kgraphviewer_part.rc -share/kxmlgui5/kgraphviewer/kgraphviewerui.rc share/locale/ar/LC_MESSAGES/kgraphviewer.mo -share/locale/ast/LC_MESSAGES/kgraphviewer.mo share/locale/be/LC_MESSAGES/kgraphviewer.mo share/locale/bg/LC_MESSAGES/kgraphviewer.mo share/locale/bs/LC_MESSAGES/kgraphviewer.mo @@ -118,10 +101,13 @@ share/locale/hi/LC_MESSAGES/kgraphviewer.mo share/locale/hne/LC_MESSAGES/kgraphviewer.mo share/locale/hr/LC_MESSAGES/kgraphviewer.mo share/locale/hu/LC_MESSAGES/kgraphviewer.mo +share/locale/ia/LC_MESSAGES/kgraphviewer.mo share/locale/is/LC_MESSAGES/kgraphviewer.mo share/locale/it/LC_MESSAGES/kgraphviewer.mo share/locale/ja/LC_MESSAGES/kgraphviewer.mo +share/locale/ka/LC_MESSAGES/kgraphviewer.mo share/locale/km/LC_MESSAGES/kgraphviewer.mo +share/locale/ko/LC_MESSAGES/kgraphviewer.mo share/locale/ku/LC_MESSAGES/kgraphviewer.mo share/locale/lt/LC_MESSAGES/kgraphviewer.mo share/locale/mai/LC_MESSAGES/kgraphviewer.mo @@ -138,6 +124,7 @@ share/locale/ro/LC_MESSAGES/kgraphviewer.mo share/locale/ru/LC_MESSAGES/kgraphviewer.mo share/locale/se/LC_MESSAGES/kgraphviewer.mo share/locale/sk/LC_MESSAGES/kgraphviewer.mo +share/locale/sl/LC_MESSAGES/kgraphviewer.mo share/locale/sv/LC_MESSAGES/kgraphviewer.mo share/locale/th/LC_MESSAGES/kgraphviewer.mo share/locale/tr/LC_MESSAGES/kgraphviewer.mo @@ -147,4 +134,4 @@ share/locale/vi/LC_MESSAGES/kgraphviewer.mo share/locale/zh_CN/LC_MESSAGES/kgraphviewer.mo share/locale/zh_TW/LC_MESSAGES/kgraphviewer.mo share/metainfo/org.kde.kgraphviewer.appdata.xml -share/metainfo/org.kde.libkgraphviewer.metainfo.xml +share/qlogging-categories6/kgraphviewer.categories