From nobody Fri Mar 18 19:03:36 2022 X-Original-To: dev-commits-ports-branches@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 C00BA1A1CB2A; Fri, 18 Mar 2022 19:03:36 +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 4KKthS53XDz3Fxk; Fri, 18 Mar 2022 19:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647630216; 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=zPZhlfxhCwssUjP0/410Et7VINlWR1nKJmiDjh9Mx98=; b=UyzcFKboHJeMQKZxd+KEpGypTJDcY2PItC14ky6cZ+en2ezbMl2Sdq+dOcK8tOEO6lZ9mU SICaRbM9wMTQz7h3DiRbqrJsHR9M+8CJHvF9OoaDUIxONrqV1ASsXtAfZZznX4CxO+RKlA gta9QrooOmUdQ9n+F1B90GQDzBsuldau6dKv9FSCHstlp15dxG7KUSGqvEXCy4HKALktJD sDqdYCHbYVfmmO//mtiZ9Lxdm2sC+5WwSL8pIGB3VZLzIqgyj2eylRJVqQxM3oL3zrlrgI auz1j9LxM7epk5aoZF5su5lxA7jgTpYaQluoMLYjK3XQQBXiMxVxo/G6zbIheg== 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 82B6A2472B; Fri, 18 Mar 2022 19:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22IJ3a0N062507; Fri, 18 Mar 2022 19:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22IJ3a0n062506; Fri, 18 Mar 2022 19:03:36 GMT (envelope-from git) Date: Fri, 18 Mar 2022 19:03:36 GMT Message-Id: <202203181903.22IJ3a0n062506@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Tobias C. Berner" Subject: git: 27f1b6178458 - 2022Q1 - devel/kf5-kcmutils: add upstream bug fix List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 27f1b617845824a7ffe65e2f67a897c7ae66031b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647630216; 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=zPZhlfxhCwssUjP0/410Et7VINlWR1nKJmiDjh9Mx98=; b=GBE5hSGLbPY8JF9aucCjgiTFXY6OXtDMlXr3KxhoNRvHO7rjwvGOk45ub+0CeFePeCdVyp vrfeUt5dAMBdIfgcGj94I7uBXiyaNEw8rCWqX4Q4qJ+mKiRdkYUDlR59mQa5iCbwiNmFAV P/JyvbsT5i4OCA/X/91HGcbdZeDETL9WMYQmbCkJnd8ZIAXCAhGTi9uuDca4o5DMlwTYRJ VYX9+OFcf3v/DLYwfaI+mKNuRnLCRz/RTCh3fH0qaqNbIhQhPQImegKrqFsy9oPcVEBw4C QBFHBt3hQhWXV0ZtmqgCuNSi+2E3vm1FSd5EEF+/QvfaFgOTnif/c7REPgCX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647630216; a=rsa-sha256; cv=none; b=KO+LRHJdjoujxRQ7d3ma816/BQHLlNUS7G6O4A5TbcBBYICvp0vnTbnFosmyrOez04+EgM Wm1+6Cgi48FfLEC6kJsw4sTEfCgRShSOs3zh7eJ5DiDPcSEhpdKZ0KEPz4WP7/knMHvSV9 sHGuh/D8nAQ0HgJz5EfkTOoSZMTjfTWj/+ZnAprqEykl8fyVdedjKrbBd+tXWOxegN0THM ksWFba7yXJ1t2jvngxB1PCOU/i6QfLYcEa7pmhZHMwvKuO0DzXyFw2SkrXrLJPis94abL0 zSoMrvutFe3UI1hwzZMLA1qK19LlKuL9L0prShLRCyvarJtX+VxF3Y4Va3zwRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=27f1b617845824a7ffe65e2f67a897c7ae66031b commit 27f1b617845824a7ffe65e2f67a897c7ae66031b Author: Tobias C. Berner AuthorDate: 2022-03-18 17:22:18 +0000 Commit: Tobias C. Berner CommitDate: 2022-03-18 19:00:30 +0000 devel/kf5-kcmutils: add upstream bug fix From [1] Fix KPluginSelector KCMs missing their metadata on plugin loading For the KWin KCMs we need the full metadata, because we read the plugin keyword. Without the X-KDE-ConfigModule key, plugins used to create a symlink in the kservices5 folder to their metadata, which then goes through the legacy code path we would read all the metadata. This includes the plugin keyword. When consumers would this key, but have an old KWin version which used the KPluginSelector class and a kcmutils version which reads X-KDE-ConfigModule, but does not include this bugfix, the plugin keyword will be empty and thus the config files can not be located. This makes it hard to fix the loading on kcmutils < 5.91, but keeping the code working with KWin < 5.24. Note: ports in main are not affected by this issue, as only plasma 5.23.x in conjunction with KDE Frameworks >= 5.88 is affected. Which is what the quarterly tree is currently shipping. [1] https://invent.kde.org/frameworks/kcmutils/commit/c9c58de65c07c8a940cb4c9b91777450698f635c Upstream PR: https://bugs.kde.org/show_bug.cgi?id=444378 (cherry picked from commit a3d334a7096f43ea8492a952825c6d20fdcf3cae) --- devel/kf5-kcmutils/Makefile | 4 ++++ devel/kf5-kcmutils/distinfo | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/devel/kf5-kcmutils/Makefile b/devel/kf5-kcmutils/Makefile index 083f94959e25..801cf244dadd 100644 --- a/devel/kf5-kcmutils/Makefile +++ b/devel/kf5-kcmutils/Makefile @@ -1,7 +1,11 @@ PORTNAME= kcmutils DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks +PATCH_SITES= https://invent.kde.org/frameworks/kcmutils/-/commit/ +PATCHFILES= c9c58de65c07c8a940cb4c9b91777450698f635c.diff:-p1 + MAINTAINER= kde@FreeBSD.org COMMENT= KF5 utilities for working with KCModules diff --git a/devel/kf5-kcmutils/distinfo b/devel/kf5-kcmutils/distinfo index d7d48d7d0b75..299fcc21f3d0 100644 --- a/devel/kf5-kcmutils/distinfo +++ b/devel/kf5-kcmutils/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1638649303 +TIMESTAMP = 1647630011 SHA256 (KDE/frameworks/5.89.0/kcmutils-5.89.0.tar.xz) = 15fe79b0d38bf5af298ede402f9c928ea7a05a5ddcdcf8c28a9e5b9a36ea497d SIZE (KDE/frameworks/5.89.0/kcmutils-5.89.0.tar.xz) = 171720 +SHA256 (KDE/frameworks/5.89.0/c9c58de65c07c8a940cb4c9b91777450698f635c.diff) = 7c85d0054d14cda0974633069826712b6ae82606c4ab8252116a9742d640f249 +SIZE (KDE/frameworks/5.89.0/c9c58de65c07c8a940cb4c9b91777450698f635c.diff) = 1314