From nobody Sun Aug 17 13:30:20 2025 X-Original-To: dev-commits-ports-main@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 4c4cCw74Vxz64m3m; Sun, 17 Aug 2025 13:30:20 +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 4c4cCw6HWTz3cNy; Sun, 17 Aug 2025 13:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755437420; 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=LLq1RPQZPEmB+iiGsgxgG4NtA9ccwpRbHIAz6Bp7KH4=; b=Rsn/7IfnRgRQolfCiAMpVk7SHtZlZ/bJMiSJNqiW67xrpciRYZ/7D7/UgZtSWLQN6Kz8eE IOOREpfwidCeHPJUkAdKSYQAdexDXfo96Y42yrwePHaLTqTmUQ2NY++8qzM8J0nccZ7gn+ U/L6OS6YeAO13vDnHI0QYsb3yPJCHAsIOyE0rX6mDBGwcM1Zm79PxYqjEjOxb/QBQU3IYh eSxIzsvzddHBbF9CfSXu7qM5Tre+qj8jJ+sqIR+1WoUgM0cefCdoaNeNoNnBwf4zr8L5Eu NAArHHvJULdgIND7rpERlvclSI3+h7Z7RIUtx44KLus3CRrCkesSw4ZT1vIJ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755437420; 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=LLq1RPQZPEmB+iiGsgxgG4NtA9ccwpRbHIAz6Bp7KH4=; b=DONWh1e6GvgLuMQk4iO9PnMzQWG7QkElHcEfwiGDQU2fHpe760n8WI1xVwvgRxG/vBZ9/w brVsLItnBRhpMxLo9vc7B0NBVNs5hgCLBK6s/HVRD6Z73GSrA3xJz79vy676ycbA9BeVN1 5BW+Z408UGzF8b5d083qZP2AQEnsdC2XVttPz8hWaN/+ElqTBNrBB3KdbAp5byb23bKMrC nQTiJBG10hvIpwV1IlhyzhhebOY07ME9M6Y51HaSyDkTykPQMbciFV0sdEYgm8RBl/v2El zMhTqpl1mJom10bAYMJks7kTjZLPkpcybPzNQaA3+4K5q+bQNszfGgdCmMAEsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755437420; a=rsa-sha256; cv=none; b=qfFdKFiB07NB+ziGAqDXq749DAv89qbodyIip6u3HHblega0JLVuD7uxETRD8gIYjgMEdx +x5PifWC9v8LemhWUdsUq7v3tv5d+ox/ZENuActMzu4hqeNg+TbMNou5uhOaAthcXkAnQv Gp8Ra6bOZ7K3XpkdB7fcWDLfJJlGT9cGwud8P+0DM4tcG+edjX2iUfUsIIXXcWJIk1Ewi4 Z4AvatSCt1/RLrysZ+cW0vpHe3aOgVLGVgOoBdGpcs1iLRPi52teWcVsn1dKbVXqx+j51l nYB3kedWKvk1EExj9RyrEtXsCRAtDpvYIGTg0yoYGzubaLvj3iJslFDVGV+I+A== 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 4c4cCw5LsRz1BRm; Sun, 17 Aug 2025 13:30:20 +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 57HDUK7m027618; Sun, 17 Aug 2025 13:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57HDUKjC027615; Sun, 17 Aug 2025 13:30:20 GMT (envelope-from git) Date: Sun, 17 Aug 2025 13:30:20 GMT Message-Id: <202508171330.57HDUKjC027615@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: b82c5afad0fe - main - graphics/kolourpaint: Move palattes to app-specific dir List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b82c5afad0fe585308d8b35bef32b0dea9832aab Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=b82c5afad0fe585308d8b35bef32b0dea9832aab commit b82c5afad0fe585308d8b35bef32b0dea9832aab Author: Jason E. Hale AuthorDate: 2025-08-17 11:53:29 +0000 Commit: Jason E. Hale CommitDate: 2025-08-17 13:29:22 +0000 graphics/kolourpaint: Move palattes to app-specific dir In kolourpaint 25.8.0, the color palatte files originally shipped with devel/kf5-kdelibs4support were added to the source to fix [1], but were erroneously installed into a global location [2]. While [1] has been crudely resoloved, [2] has not yet been addressed. The kde@ team has determined [2] to be the most sensible way to move forward to mitigate conflicts between graphics/kolorpaint and devel/kf5-kdelibs4support. While here: Pet portclippy(1) Remove unneeded deps [1] https://bugs.kde.org/show_bug.cgi?id=501341 [2] https://bugs.kde.org/show_bug.cgi?id=507007 --- graphics/kolourpaint/Makefile | 16 +++++++-------- graphics/kolourpaint/files/patch-CMakeLists.txt | 24 ++++++++++++++++++++++ .../files/patch-lgpl_generic_kpColorCollection.cpp | 24 ++++++++++++++++++++++ graphics/kolourpaint/pkg-plist | 10 ++++----- 4 files changed, 61 insertions(+), 13 deletions(-) diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile index 30f06b00a03e..5650ceaffbc8 100644 --- a/graphics/kolourpaint/Makefile +++ b/graphics/kolourpaint/Makefile @@ -1,22 +1,22 @@ PORTNAME= kolourpaint DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE paint program WWW= http://www.kolourpaint.org -USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:6 \ - qt:6 tar:xz xorg -USE_KDE= auth bookmarks codecs completion config configwidgets \ - coreaddons crash guiaddons i18n iconthemes itemmodels \ - itemviews jobwidgets kio libkexiv2 libksane notifications \ - parts service solid sonnet textwidgets unitconversion \ - widgetsaddons windowsystem xmlgui \ +USES= cmake compiler:c++17-lang desktop-file-utils gettext-tools gl \ + kde:6 qt:6 tar:xz xorg +USE_GL= opengl +USE_KDE= bookmarks colorscheme completion config configwidgets \ + coreaddons crash guiaddons i18n itemviews jobwidgets kio \ + libksane service solid widgetsaddons xmlgui \ ecm:build +USE_LDCONFIG= yes USE_QT= base USE_XORG= x11 -USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS diff --git a/graphics/kolourpaint/files/patch-CMakeLists.txt b/graphics/kolourpaint/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2e6df0d40d0d --- /dev/null +++ b/graphics/kolourpaint/files/patch-CMakeLists.txt @@ -0,0 +1,24 @@ +Remove unused TextWidgets. +Don't globally install color palettes only used by this application. + +Ref: https://invent.kde.org/graphics/kolourpaint/-/merge_requests/79 + +--- CMakeLists.txt.orig 2025-08-07 03:21:56 UTC ++++ CMakeLists.txt +@@ -39,7 +39,6 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS + WidgetsAddons + KIO + XmlGui +- TextWidgets + JobWidgets + Crash + ) +@@ -368,7 +367,7 @@ install(FILES org.kde.kolourpaint.appdata.xml DESTINAT + + install(PROGRAMS org.kde.kolourpaint.desktop DESTINATION ${KDE_INSTALL_APPDIR}) + install(FILES org.kde.kolourpaint.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) +-install(DIRECTORY colors DESTINATION ${KDE_INSTALL_CONFDIR}) ++install(DIRECTORY colors DESTINATION ${KDE_INSTALL_DATADIR}/kolourpaint) + + if(BUILD_DOC) + add_subdirectory(doc) diff --git a/graphics/kolourpaint/files/patch-lgpl_generic_kpColorCollection.cpp b/graphics/kolourpaint/files/patch-lgpl_generic_kpColorCollection.cpp new file mode 100644 index 000000000000..8c471bb27858 --- /dev/null +++ b/graphics/kolourpaint/files/patch-lgpl_generic_kpColorCollection.cpp @@ -0,0 +1,24 @@ +Don't globally install color palettes only used by this application. + +Ref: https://invent.kde.org/graphics/kolourpaint/-/merge_requests/79 + +--- lgpl/generic/kpColorCollection.cpp.orig 2025-08-07 03:21:56 UTC ++++ lgpl/generic/kpColorCollection.cpp +@@ -80,7 +80,7 @@ QStringList kpColorCollection::installedCollections() + { + QStringList paletteList; + +- QStringList paths = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("colors"), QStandardPaths::LocateDirectory); ++ QStringList paths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("colors"), QStandardPaths::LocateDirectory); + for (const auto &path : paths) { + paletteList.append(QDir(path).entryList(QStringList(), QDir::Files)); + } +@@ -206,7 +206,7 @@ bool kpColorCollection::openKDE(const QString &name, Q + return false; + } + +- QString filename = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("colors/") + name); ++ QString filename = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("colors/") + name); + if (filename.isEmpty()) { + #if DEBUG_KP_COLOR_COLLECTION + qCDebug(kpLogColorCollection) << "could not find file"; diff --git a/graphics/kolourpaint/pkg-plist b/graphics/kolourpaint/pkg-plist index 8279feb849b1..c0aab3952d85 100644 --- a/graphics/kolourpaint/pkg-plist +++ b/graphics/kolourpaint/pkg-plist @@ -1,9 +1,4 @@ bin/kolourpaint -etc/xdg/colors/40.colors -etc/xdg/colors/Oxygen.colors -etc/xdg/colors/Rainbow.colors -etc/xdg/colors/Royal.colors -etc/xdg/colors/Web.colors lib/libkolourpaint_lgpl.so lib/libkolourpaint_lgpl.so.5 share/applications/org.kde.kolourpaint.desktop @@ -13,6 +8,11 @@ share/icons/hicolor/22x22/apps/kolourpaint.png share/icons/hicolor/32x32/apps/kolourpaint.png share/icons/hicolor/48x48/apps/kolourpaint.png share/icons/hicolor/scalable/apps/kolourpaint.svgz +%%DATADIR%%/colors/40.colors +%%DATADIR%%/colors/Oxygen.colors +%%DATADIR%%/colors/Rainbow.colors +%%DATADIR%%/colors/Royal.colors +%%DATADIR%%/colors/Web.colors %%DATADIR%%/icons/hicolor/16x16/actions/tool_brush.png %%DATADIR%%/icons/hicolor/16x16/actions/tool_color_eraser.png %%DATADIR%%/icons/hicolor/16x16/actions/tool_color_picker.png