From nobody Wed Mar 29 16:51:05 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 4Pmsy16w9pz42nWc; Wed, 29 Mar 2023 16:51:05 +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 4Pmsy16TmZz4c4V; Wed, 29 Mar 2023 16:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108665; 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=aVJOdgwSIRsN6He29Y7p9FGRbS4q0gm7DhBa7lRk+84=; b=yKzf4isFDpILLymGrTNjDBgEYiWzqXnJiMMtt+bqVjpFqo+5BHdikT2UQ7TpWM+dbjukkP xjN/NPcekKvf+uzBS1nJXKDBJAX/mXolrIHIgPSg/TfrgycdOyHE52plz4eEAMgJy46VDX O7UbXLe1Bk0XIRXUCjTgAfdYldSZ53B4YKFIVVJNSpi4pDpZn5S4jB7820GrzPzv9tRjAI 35/dYY6Ujm4YaTn6XCcT8XDd9pN59xRbHDrCQLRdfE43qfXSmXm1uaSxROx9YnfDAqAd4V bhkc8IJwJxD5YapALkFLyvGPMMUd8gqLkaFsW9efAL2qd02FMppl8ODe1ZG72g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108665; 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=aVJOdgwSIRsN6He29Y7p9FGRbS4q0gm7DhBa7lRk+84=; b=CmUttx+gfpkQFJLCyK/WOUpIOUJ6JQlJd3fFqcKTd2mDs6NfrWQYF/e4GnnjvL8WpuecBV QuAPpRNxALKU5Bvrz/QTXutsdSrZ3XWoT/84vWzQuWTI5iz9y8desiu+q0YgvIIyYQ+Ng3 hG0KyLKC8pX9zjqAkUz8EgqXS1Rzk70XQQi1OvURW1nXK8c3Iyq6+rFCCHQ00JDcgWWK8/ HMpuWUL7Bhjy781atr1AsLxwh1hdVtKeLizkwylw0T8gMhgNSsqREfGw5rSR3/EL7CvxSM a64Qo4yveoe382VnQoL63sJc68S0HfeSdFKiM2sm0Md4LM9SXztqqtaGjrnYtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108665; a=rsa-sha256; cv=none; b=INxJCUpY8Uxwmo2JiaAh7nrt/SMPkic05sYtAF+W2FtOMSMEnaR8WjIiHDkB367UnZrnhp YGRk84WSbwuTsYGQnWbXyNBbGxtow2mp7xBP0uhaIS++LCkcuOWMWQJKxrrWazDmcQop5e czVG9btw1UPBKMSivPyb/F6AcXXvnbkG8aiO1XIRRG2rqsn6puBe/ZNjwu4MKWrn1E0sjP s3U/6aCiaKQ1VhQBRuaKcj24jn59rrGA9oX5gZFt2w1rmRA7NCfu6+PfhKmP/1YcY0zDuZ qUo4iPVQiTRUO/0IlbLgSyUqigWod+3N5DQ0Ilf9IEOyi+JYpr4QhX/pOd3V2g== 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 4Pmsy15bdvzdbl; Wed, 29 Mar 2023 16:51:05 +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 32TGp50T037415; Wed, 29 Mar 2023 16:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGp5SE037414; Wed, 29 Mar 2023 16:51:05 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:51:05 GMT Message-Id: <202303291651.32TGp5SE037414@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 07ec86e98cf6 - 2023Q1 - x11/wdisplays: unbreak build with textproc/py-scour 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 07ec86e98cf66240590ca94f13243a4738c42c81 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=07ec86e98cf66240590ca94f13243a4738c42c81 commit 07ec86e98cf66240590ca94f13243a4738c42c81 Author: Jan Beich AuthorDate: 2023-03-29 16:39:22 +0000 Commit: Jan Beich CommitDate: 2023-03-29 16:50:33 +0000 x11/wdisplays: unbreak build with textproc/py-scour ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: share/icons/hicolor/scalable/apps/network.cycles.wdisplays.svg ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: share/icons/hicolor/scalable/apps/wdisplays.svg ===> Error: Plist issues found. *** Error code 1 PR: 270525 Reported by: Chad Jacob Milios (cherry picked from commit fdf37ec6360d430f2a71f85f85cc2e70ae7fc60f) --- x11/wdisplays/Makefile | 3 ++- x11/wdisplays/files/patch-resources_meson.build | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/x11/wdisplays/Makefile b/x11/wdisplays/Makefile index 37fb1f449ffe..3a34ec3ebee3 100644 --- a/x11/wdisplays/Makefile +++ b/x11/wdisplays/Makefile @@ -1,5 +1,6 @@ PORTNAME= wdisplays DISTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -23,6 +24,6 @@ USE_GNOME= cairo gtk30 GH_ACCOUNT= artizirk PLIST_FILES= bin/${PORTNAME} \ share/applications/network.cycles.${PORTNAME}.desktop \ - share/icons/hicolor/scalable/apps/${PORTNAME}.svg + share/icons/hicolor/scalable/apps/network.cycles.${PORTNAME}.svg .include diff --git a/x11/wdisplays/files/patch-resources_meson.build b/x11/wdisplays/files/patch-resources_meson.build new file mode 100644 index 000000000000..58810677480e --- /dev/null +++ b/x11/wdisplays/files/patch-resources_meson.build @@ -0,0 +1,13 @@ +https://github.com/artizirk/wdisplays/pull/1 + +--- resources/meson.build.orig 2021-03-29 08:33:43 UTC ++++ resources/meson.build +@@ -37,7 +37,7 @@ if scour.found() + install: true, + install_dir: icondir) + else +-install_data(icon, install_dir: icondir) ++install_data(icon, install_dir: icondir, rename: '@0@.svg'.format(meson.project_name())) + endif + + install_data(