From nobody Thu Jul 31 13:21:06 2025 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 4bt8q65bTjz63rqG; Thu, 31 Jul 2025 13:21:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bt8q6453tz4Ll6; Thu, 31 Jul 2025 13:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753968066; 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=HNoVQLQID81wI7SdAS+6K1RZf8ObDzhryFhUUCh/6Ss=; b=vjYtVo91YKxF6vrJx4VJL6Q7pLpEMdoUcQIfbUC0d2yv1mLXU5GimIXXd2UHXOKgpjuwrF oR9rGTmtnkpA8wTD9e32ESpPFb25qc0jM3OlKQek4GkwfTgqD7qHQNCcbinT5mdRRFuwPM ksM/pMaan96loxixbzvTwvR0cuh8BhlGloCIyA1Gg+LAdKVocPYpja5i5M5447hngkbroY OT00++j+RCY8/F4e9WcMdvAcI7+xkymyrpyS3pDeOiQTn95v65hgfScB9qYU+quRGt6s2o CWQi8UMZXddjuseOjRZoI9L+sUeg1ggvSdlBk71jCZLKGc4pnFD8XXcKv3FZ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753968066; 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=HNoVQLQID81wI7SdAS+6K1RZf8ObDzhryFhUUCh/6Ss=; b=jR0UEIC+L42Bhalm2HXWBRdCjbCNECV8IkzUokoAYnxgMOnrIFvIuhkb64fbc8h1SgKFzw 8HH9VFmQYwZ2zbAF2XtZd511jut3vhzS6ArXfRCpxMVeesfn2wkkGD8HRJvxZ78BZdZW02 zPT4IWky4UiXmdVq3352GGkqbbXkXR/pDomaMScR3jJ/2GsP6xG/qZeKPnBv9HYkHNLhr+ qh59Rgka1khpOKT9x1w9SiSa7wxZkwA2hppQYLjte9hqqf1R57Wh2R1AxlCxex+R9Gdf1c xr/OwZXHVKXbGSEJBhC/jBubQSqAwgPQS00RdZUSsoUSAN6EPo4n0Dp8CZm6gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753968066; a=rsa-sha256; cv=none; b=nVhKWo5GBIi2N98PyVEDKmI1Qd/UPJJIdkYqEaAcOx9IN01ocxxIkRMTR1W6lSQgwcLPji ptUi5YZCmjumCCRkXPOvu3wObTpbjWzTtdnWhCudCqk9gDaFc4l/NVsJS1Qfn3XwgSQ5c6 d/Ol1kXZRcf7aEARxMvw4l3zg3l9kyyMPfd3AtdlzyJNOLZ6xz+sSAWojSipecDachntOq nm5Vb5vB6gPQ6l8W74BYamo8WTLjJoErXtbkmbUYMjZHNWJ8nuebQgKc5Bv7iGX8rLWkMT OozfJI1EquOeday5f86M8J69clSO40zUUXlnxsVJgnVroUXKc4444Td7a6CMlQ== 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 4bt8q63X0Lz13ZQ; Thu, 31 Jul 2025 13:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56VDL6X2039173; Thu, 31 Jul 2025 13:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56VDL6Bj039170; Thu, 31 Jul 2025 13:21:06 GMT (envelope-from git) Date: Thu, 31 Jul 2025 13:21:06 GMT Message-Id: <202507311321.56VDL6Bj039170@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 2f26455fa384 - main - devel/thunar-vcs-plugin: Import upstream change fixing icon naming issue 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f26455fa3842689aedfa77dba58102627c944eb Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f26455fa3842689aedfa77dba58102627c944eb commit 2f26455fa3842689aedfa77dba58102627c944eb Author: Guido Falsi AuthorDate: 2025-07-31 13:17:50 +0000 Commit: Guido Falsi CommitDate: 2025-07-31 13:17:50 +0000 devel/thunar-vcs-plugin: Import upstream change fixing icon naming issue Import an upstream change that adds a domain to icon names to avoid conflicts with other software packages. PR: 287804 Approved by: Sergey V. Dyatko (maintainer) Obtained from: https://gitlab.xfce.org/thunar-plugins/thunar-vcs-plugin/-/merge_requests/22 --- devel/thunar-vcs-plugin/Makefile | 10 +++- devel/thunar-vcs-plugin/files/patch-icons | 88 +++++++++++++++++++++++++++++++ devel/thunar-vcs-plugin/pkg-plist | 12 ++--- 3 files changed, 103 insertions(+), 7 deletions(-) diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile index 7256ff0858ec..04d8541cb91d 100644 --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= thunar-vcs-plugin PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel xfce MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 @@ -34,6 +34,14 @@ SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion SUBVERSION_LIB_DEPENDS+= libapr-1.so:devel/apr1 SUBVERSION_MESON_ENABLED= svn +post-patch: +.for SIZE in 16x16 24x24 48x48 + @${MV} ${WRKSRC}/icons/${SIZE}/git.png \ + ${WRKSRC}/icons/${SIZE}/org.xfce.thunar-vcs-plugin.git.png + @${MV} ${WRKSRC}/icons/${SIZE}/subversion.png \ + ${WRKSRC}/icons/${SIZE}/org.xfce.thunar-vcs-plugin.subversion.png +.endfor + post-patch-NLS-off: @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build diff --git a/devel/thunar-vcs-plugin/files/patch-icons b/devel/thunar-vcs-plugin/files/patch-icons new file mode 100644 index 000000000000..62bfbcb412a8 --- /dev/null +++ b/devel/thunar-vcs-plugin/files/patch-icons @@ -0,0 +1,88 @@ +From 0cb65c8ae7bfce23db655ac45939e8e41842d57c Mon Sep 17 00:00:00 2001 +From: Piscium +Date: Mon, 28 Jul 2025 21:26:11 +0000 +Subject: [PATCH] Rename icons to avoid conflicts with other apps (#15) + +Fixes #15 +--- + .../{git.png => org.xfce.thunar-vcs-plugin.git.png} | Bin + ...ng => org.xfce.thunar-vcs-plugin.subversion.png} | Bin + .../{git.png => org.xfce.thunar-vcs-plugin.git.png} | Bin + ...ng => org.xfce.thunar-vcs-plugin.subversion.png} | Bin + .../{git.png => org.xfce.thunar-vcs-plugin.git.png} | Bin + ...ng => org.xfce.thunar-vcs-plugin.subversion.png} | Bin + icons/meson.build | 2 +- + thunar-vcs-plugin/tvp-git-action.c | 2 +- + thunar-vcs-plugin/tvp-svn-action.c | 2 +- + 9 files changed, 3 insertions(+), 3 deletions(-) + rename icons/16x16/{git.png => org.xfce.thunar-vcs-plugin.git.png} (100%) + rename icons/16x16/{subversion.png => org.xfce.thunar-vcs-plugin.subversion.png} (100%) + rename icons/24x24/{git.png => org.xfce.thunar-vcs-plugin.git.png} (100%) + rename icons/24x24/{subversion.png => org.xfce.thunar-vcs-plugin.subversion.png} (100%) + rename icons/48x48/{git.png => org.xfce.thunar-vcs-plugin.git.png} (100%) + rename icons/48x48/{subversion.png => org.xfce.thunar-vcs-plugin.subversion.png} (100%) + +diff --git a/icons/16x16/git.png b/icons/16x16/org.xfce.thunar-vcs-plugin.git.png +similarity index 100% +rename from icons/16x16/git.png +rename to icons/16x16/org.xfce.thunar-vcs-plugin.git.png +diff --git a/icons/16x16/subversion.png b/icons/16x16/org.xfce.thunar-vcs-plugin.subversion.png +similarity index 100% +rename from icons/16x16/subversion.png +rename to icons/16x16/org.xfce.thunar-vcs-plugin.subversion.png +diff --git a/icons/24x24/git.png b/icons/24x24/org.xfce.thunar-vcs-plugin.git.png +similarity index 100% +rename from icons/24x24/git.png +rename to icons/24x24/org.xfce.thunar-vcs-plugin.git.png +diff --git a/icons/24x24/subversion.png b/icons/24x24/org.xfce.thunar-vcs-plugin.subversion.png +similarity index 100% +rename from icons/24x24/subversion.png +rename to icons/24x24/org.xfce.thunar-vcs-plugin.subversion.png +diff --git a/icons/48x48/git.png b/icons/48x48/org.xfce.thunar-vcs-plugin.git.png +similarity index 100% +rename from icons/48x48/git.png +rename to icons/48x48/org.xfce.thunar-vcs-plugin.git.png +diff --git a/icons/48x48/subversion.png b/icons/48x48/org.xfce.thunar-vcs-plugin.subversion.png +similarity index 100% +rename from icons/48x48/subversion.png +rename to icons/48x48/org.xfce.thunar-vcs-plugin.subversion.png +diff --git a/icons/meson.build b/icons/meson.build +index 5da1b8e..82a38e0 100644 +--- icons/meson.build ++++ icons/meson.build +@@ -1,5 +1,5 @@ + sizes = [16, 24, 48] +-icons = ['git', 'subversion'] ++icons = ['org.xfce.thunar-vcs-plugin.git', 'org.xfce.thunar-vcs-plugin.subversion'] + + foreach size : sizes + foreach icon : icons +diff --git a/thunar-vcs-plugin/tvp-git-action.c b/thunar-vcs-plugin/tvp-git-action.c +index 80bb621..7f966a2 100644 +--- thunar-vcs-plugin/tvp-git-action.c ++++ thunar-vcs-plugin/tvp-git-action.c +@@ -150,7 +150,7 @@ tvp_git_action_new (const gchar *name, + "is-parent", is_parent, + "is-directory", is_direcotry, + "is-file", is_file, +- "icon", "git", ++ "icon", "org.xfce.thunar-vcs-plugin.git", + NULL); + TVP_GIT_ACTION (item)->files = thunarx_file_info_list_copy (files); + TVP_GIT_ACTION (item)->window = window; +diff --git a/thunar-vcs-plugin/tvp-svn-action.c b/thunar-vcs-plugin/tvp-svn-action.c +index d839932..b367824 100644 +--- thunar-vcs-plugin/tvp-svn-action.c ++++ thunar-vcs-plugin/tvp-svn-action.c +@@ -173,7 +173,7 @@ tvp_svn_action_new (const gchar *name, + "directory-no-version-control", directory_no_version_control, + "file-version-control", file_version_control, + "file-no-version-control", file_no_version_control, +- "icon", "subversion", ++ "icon", "org.xfce.thunar-vcs-plugin.subversion", + NULL); + TVP_SVN_ACTION (item)->files = thunarx_file_info_list_copy (files); + TVP_SVN_ACTION (item)->window = window; +-- +GitLab + diff --git a/devel/thunar-vcs-plugin/pkg-plist b/devel/thunar-vcs-plugin/pkg-plist index bb64b204af7f..affd82365314 100644 --- a/devel/thunar-vcs-plugin/pkg-plist +++ b/devel/thunar-vcs-plugin/pkg-plist @@ -1,12 +1,12 @@ lib/thunarx-3/thunar-vcs-plugin.so %%GIT%%libexec/tvp-git-helper %%SUBVERSION%%libexec/tvp-svn-helper -share/icons/hicolor/16x16/apps/git.png -share/icons/hicolor/16x16/apps/subversion.png -share/icons/hicolor/24x24/apps/git.png -share/icons/hicolor/24x24/apps/subversion.png -share/icons/hicolor/48x48/apps/git.png -share/icons/hicolor/48x48/apps/subversion.png +share/icons/hicolor/16x16/apps/org.xfce.thunar-vcs-plugin.git.png +share/icons/hicolor/16x16/apps/org.xfce.thunar-vcs-plugin.subversion.png +share/icons/hicolor/24x24/apps/org.xfce.thunar-vcs-plugin.git.png +share/icons/hicolor/24x24/apps/org.xfce.thunar-vcs-plugin.subversion.png +share/icons/hicolor/48x48/apps/org.xfce.thunar-vcs-plugin.git.png +share/icons/hicolor/48x48/apps/org.xfce.thunar-vcs-plugin.subversion.png %%NLS%%share/locale/ar/LC_MESSAGES/thunar-vcs-plugin.mo %%NLS%%share/locale/be/LC_MESSAGES/thunar-vcs-plugin.mo %%NLS%%share/locale/bg/LC_MESSAGES/thunar-vcs-plugin.mo