From nobody Wed Mar 29 16:49:49 2023 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 4PmswZ0087z42nLl; Wed, 29 Mar 2023 16:49:50 +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 4PmswY6dHpz4bq6; Wed, 29 Mar 2023 16:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108589; 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=qhMF4kUTxMbegFiGJ8wIZoiv9de9W318bzWjg3jaoVo=; b=oHmmEVMV5Q9TTkd+ZtpVX8ViL92XVzl+Z+Zw5lMIHl8Ppjm5Zc3esU79GwXftvsCG6t2lH 4jJeNMLyt9aIUF6lNrVVtqYKGJ8q4+Zjk/wXJAPNT8cuBjLB9V47BbejX9HbTxU5U1gRor mD1ydehR3W+GojPTvAtIaKd4JLaleWX8HO7fGCsVQGiuDd1Q3Pc4lc6H40VXNRPCWavZOw cnk5UJgjY6vXD4MeBZ5IO+Eak3gtCvrWC8lCg7eH3q0X+k+Oh7CeENxNl55DBkUVtZOVeo z4BK/fc0ehosjWYRW7v/Bksy2GbeoAnT0WOeIWUBDF93eTqPq11PLbVHKa96aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108589; 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=qhMF4kUTxMbegFiGJ8wIZoiv9de9W318bzWjg3jaoVo=; b=F8HkjvHsRqBNtnhfoRbjQAhMzPcc6Ny2wCTRSTF/ZvxZc0CTKiThZ7HAxZNNtnzkAW9+0Z fswJtRaL2oLmzS/n7xKIPqgPkrJRzDF6adn2czSsAfeMwxrvoic3f0K080kUiVa9W2K9h7 91qQ/zBaqqeJfalZLjzSuEzQ8OqXIMhyut5IO8o/xuoY7MXrG3w1WSGCWCesJeAvQ0A1oC T2E5ZR1UF/K9lRJAI3C5B4jiFX4QZhKjD6mrxu+t6sqsA2vQc/HomHINoCdoZsXqvNkGpQ hXUg7GtWTieSJbyvCbNMnNVcvLJhRF1fTBFcuX+8vRG5zn653TvmjR1pHUnfmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108589; a=rsa-sha256; cv=none; b=FGFxnmn0xHbTniUQWA12UEaSM7+NKtZa2ilzNjmnkJEINitBaDc3Eu5+A11CVhmGxe+zIE U6rXTBJGHp+V+/ChilGoVKUK6lDTIsr6G2ywlMWiXGQiW37diFF2KBcBLlqYvb9CP+n8TX 3zQ0VXMRqb4u7R5NUOjsLKPqXV3wmbQ7o9FSv8mWmA/7sHnLXlqzX90QHFFZZPLBUg0v12 hXq6BJpPFmd8ceutLKLNcvL4KQTvhPfXXZEpZsYqrHU6JtTrUCEolr0OLgaubMQYTo4JES XW0FQ+2Nwkk8Z8pgVGQOzg2o8ocbW7PK/0oeqqLDPq8Rc/C6iewAH8ApQWCSEw== 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 4PmswY5hBvzcr6; Wed, 29 Mar 2023 16:49:49 +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 32TGnnZq024070; Wed, 29 Mar 2023 16:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGnnOQ024069; Wed, 29 Mar 2023 16:49:49 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:49:49 GMT Message-Id: <202303291649.32TGnnOQ024069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: fdf37ec6360d - main - x11/wdisplays: unbreak build with textproc/py-scour 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: fdf37ec6360d430f2a71f85f85cc2e70ae7fc60f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdf37ec6360d430f2a71f85f85cc2e70ae7fc60f commit fdf37ec6360d430f2a71f85f85cc2e70ae7fc60f Author: Jan Beich AuthorDate: 2023-03-29 16:39:22 +0000 Commit: Jan Beich CommitDate: 2023-03-29 16:49:08 +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 --- x11/wdisplays/Makefile | 4 ++-- x11/wdisplays/files/patch-resources_meson.build | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/x11/wdisplays/Makefile b/x11/wdisplays/Makefile index 595f5f2b3b7f..27b0ebe12e84 100644 --- a/x11/wdisplays/Makefile +++ b/x11/wdisplays/Makefile @@ -1,6 +1,6 @@ PORTNAME= wdisplays DISTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -24,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(