From nobody Sun Nov 07 20:34:38 2021 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 D5BE7184F7CC; Sun, 7 Nov 2021 20:34:38 +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 4HnQvy4wyLz4qqp; Sun, 7 Nov 2021 20:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6EB5424BEA; Sun, 7 Nov 2021 20:34:38 +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 1A7KYc8K059734; Sun, 7 Nov 2021 20:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A7KYcwv059733; Sun, 7 Nov 2021 20:34:38 GMT (envelope-from git) Date: Sun, 7 Nov 2021 20:34:38 GMT Message-Id: <202111072034.1A7KYcwv059733@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: 4bdff1539b59 - main - x11/xfce4-appmenu-plugin: drop duplicate localization 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: 4bdff1539b59ebfd7e4781d462e187e907f3a4bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4bdff1539b59ebfd7e4781d462e187e907f3a4bc commit 4bdff1539b59ebfd7e4781d462e187e907f3a4bc Author: Jan Beich AuthorDate: 2021-11-07 20:30:22 +0000 Commit: Jan Beich CommitDate: 2021-11-07 20:34:10 +0000 x11/xfce4-appmenu-plugin: drop duplicate localization po/meson.build:1:5: ERROR: Tried to create target "vala-panel-appmenu-nb.mo", but a target of that name already exists. https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/commit/442bcebcc00e PR: 259080 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/487d45c1e5bf --- x11/xfce4-appmenu-plugin/Makefile | 3 +++ x11/xfce4-appmenu-plugin/distinfo | 2 ++ 2 files changed, 5 insertions(+) diff --git a/x11/xfce4-appmenu-plugin/Makefile b/x11/xfce4-appmenu-plugin/Makefile index 531ae3c6ac72..909e0abb4a1e 100644 --- a/x11/xfce4-appmenu-plugin/Makefile +++ b/x11/xfce4-appmenu-plugin/Makefile @@ -2,6 +2,9 @@ PORTNAME= xfce4-appmenu-plugin DISTVERSION= 0.7.6 CATEGORIES= x11 +PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ +PATCHFILES+= 442bcebcc00e.patch:-p1 # meson >= 0.60 + MAINTAINER= ericbsd@FreeBSD.org COMMENT= Application Menu plugin for XFCE panel diff --git a/x11/xfce4-appmenu-plugin/distinfo b/x11/xfce4-appmenu-plugin/distinfo index 063974a98247..9e34903253b6 100644 --- a/x11/xfce4-appmenu-plugin/distinfo +++ b/x11/xfce4-appmenu-plugin/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1617892721 SHA256 (vala-panel-project-vala-panel-appmenu-4e362c22ab3a23c98f13fb379c782786ee057cf6_GL0.tar.gz) = 374ee0bd840ae1e78891ca1dd97ea25ebabec929e5eaec8dc16ae8f8e7680b67 SIZE (vala-panel-project-vala-panel-appmenu-4e362c22ab3a23c98f13fb379c782786ee057cf6_GL0.tar.gz) = 149765 +SHA256 (442bcebcc00e.patch) = c9ffd68b96b6b9790cf37ecf64cb4984848f4d19f9859d881cea18fa3d3c89a2 +SIZE (442bcebcc00e.patch) = 1613