From nobody Tue Feb 07 17:13:33 2023 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 4PB8q14PY6z3nSqF; Tue, 7 Feb 2023 17:13:33 +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 4PB8q13PpSz49h1; Tue, 7 Feb 2023 17:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675790013; 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=ns7tvP3l6DCgQTjdVYjJsMiibsRWAbHRqwWIPQ5pLj0=; b=Gsu/MAPi7CowInIfcvUGOLkxXJcXxsziIwFSP51HYL3kjTiv2i0T8LKWrq/d/UjCUTIbo+ bF+K1DjJOmXL/Xd028z9VypKljYGyxFfgSm3XtFZdFlfA1xeFJ0kKZ3hL03lEZGtbE4NYf RUrre96ai/zJMg3fu+mdSeq1J4OQ/GYxEhcXzyhcvFQ4eGifidZsigriOH67zddw2AFUQZ vhZJHqr3tYXugxkxEtX8FCQKPv1N9a9g3/FfnQJY4xrTzzWVibE21ZRFRnAgAhfxqLvmod OtauT4DIhqlDgecGDx8xNHnnc5+sd1kjWBeLPj1QeucNY7OlPVbNSYN+mBEl8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675790013; 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=ns7tvP3l6DCgQTjdVYjJsMiibsRWAbHRqwWIPQ5pLj0=; b=IKD00krXHymffzeFYAjJJkNPcZ1CKaEFI0owtJbrHLZLBBuSm+MWsPkzIrsZPA8HhogQt7 5J1cVi2rjloa0CKtpwt+2yzHnCklI3FGcZ0R08WH93vos7+H97R92LtpUJE/e+1zA9m9h1 DYZ5GfITdmurLm+m9I8e2f7oKfcmckMKzKtwlscQLOcCqxYzgkldx+O2QuupVlG+eQgTHE fo8xM0O5MX7GQyKvUdX1MGTl/LMQmAO1JnBzl0hCDkut5MSHT02ynweYazExykgrxqvYn6 3EFKwGhfBL1LpaGmuC4h6aVnvCgGGHKOTFWA0/Dt+nzV/LPI3zB9GmM7mw3l5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675790013; a=rsa-sha256; cv=none; b=RHsJ/HoYacstZhBih2IUlXwb8WuAXd4hW6fW5Mv3Z6YPzsL97n+qmVyBEIJQFVQQfWYOhY 9BQFYjwA9jbR7gSXJmIrYwzEvggxsbF9swL/3ZK/9h+pIlG27e/TB2ls63bceA0YjfcTPr kp/jBDYY0JwxGa/va9Ae7U47QD+6JwUdVKgfhkJaNxN8fnk7Sb8eeiY5NL0O2nAuqt9GTr 9d+v5Z15CVZVQ9TjbRpDrBQnqx7TsFGPxI4w1KSmaJBtnCJyNUf5FqNIW0Wdb1aWbxmjO5 2Dq/JpuP/c7GgyQcG4tN0yBI9zWGPVLFJpfkqzNItNXQZNozsppP7PJ0gKYL5A== 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 4PB8q12VVGzPnk; Tue, 7 Feb 2023 17:13:33 +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 317HDXcw075911; Tue, 7 Feb 2023 17:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 317HDX5v075910; Tue, 7 Feb 2023 17:13:33 GMT (envelope-from git) Date: Tue, 7 Feb 2023 17:13:33 GMT Message-Id: <202302071713.317HDX5v075910@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: d51577ef3293 - main - devel/kf5-kdbusaddons: Remove patch preventing Plasma from starting. 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d51577ef32939d546ce293f0014124eb03f9d9eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d51577ef32939d546ce293f0014124eb03f9d9eb commit d51577ef32939d546ce293f0014124eb03f9d9eb Author: Gleb Popov AuthorDate: 2023-02-07 15:22:46 +0000 Commit: Gleb Popov CommitDate: 2023-02-07 17:11:24 +0000 devel/kf5-kdbusaddons: Remove patch preventing Plasma from starting. Sponsored by: Serenity Cybersecurity, LLC --- devel/kf5-kdbusaddons/Makefile | 1 + .../files/patch-src_kdbusservice.cpp | 23 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/devel/kf5-kdbusaddons/Makefile b/devel/kf5-kdbusaddons/Makefile index 438885958288..98734a4f1cb2 100644 --- a/devel/kf5-kdbusaddons/Makefile +++ b/devel/kf5-kdbusaddons/Makefile @@ -1,5 +1,6 @@ PORTNAME= kdbusaddons DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-kdbusaddons/files/patch-src_kdbusservice.cpp b/devel/kf5-kdbusaddons/files/patch-src_kdbusservice.cpp deleted file mode 100644 index 4e3cadceeb7d..000000000000 --- a/devel/kf5-kdbusaddons/files/patch-src_kdbusservice.cpp +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/kdbusservice.cpp b/src/kdbusservice.cpp ---- src/kdbusservice.cpp -+++ src/kdbusservice.cpp -@@ -129,6 +130,18 @@ - } else { - d->serviceName += QLatin1Char('-') + QString::number(QCoreApplication::applicationPid()); - } -+ } else if (options & KDBusService::Unique) { -+ auto reply = bus->registeredServiceNames(); -+ if (!reply.isValid()) { -+ return; -+ } -+ -+ for (const auto& serviceName : reply.value()) { -+ if (serviceName.startsWith(d->serviceName)) { -+ d->serviceName = serviceName; -+ return; -+ } -+ } - } - } - -