summaryrefslogtreecommitdiff
path: root/devel/thunar-vcs-plugin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--devel/thunar-vcs-plugin/Makefile34
-rw-r--r--devel/thunar-vcs-plugin/distinfo6
-rw-r--r--devel/thunar-vcs-plugin/files/patch-icons88
-rw-r--r--devel/thunar-vcs-plugin/pkg-plist10
4 files changed, 117 insertions, 21 deletions
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index aeb3b0bc4b7d..04d8541cb91d 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -1,5 +1,6 @@
PORTNAME= thunar-vcs-plugin
-PORTVERSION= 0.3.0
+PORTVERSION= 0.4.0
+PORTREVISION= 2
CATEGORIES= devel xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
@@ -11,32 +12,37 @@ WWW= https://docs.xfce.org/thunar-plugins/thunar-vcs-plugin
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
-
-USES= compiler:c11 gettext-tools gmake gnome libtool localbase \
- pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gdkpixbuf gtk30 glib20
+USES= compiler:c11 gettext-tools gnome localbase:ldflags meson \
+ pkgconfig tar:xz xfce
+USE_GNOME= glib20 gtk30
USE_XFCE= libexo thunar
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
-
OPTIONS_DEFINE= GIT NLS SUBVERSION
OPTIONS_DEFAULT= GIT
OPTIONS_SUB= yes
GIT_RUN_DEPENDS= git:devel/git
-GIT_CONFIGURE_ENABLE= git
+GIT_MESON_ENABLED= git
NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
.if ${WITH_SUBVERSION_VER:U} == LTS
-SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion-lts
+SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion-lts
.else
-SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion
+SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion
.endif
SUBVERSION_LIB_DEPENDS+= libapr-1.so:devel/apr1
-SUBVERSION_CONFIGURE_ENABLE= subversion
+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
.include <bsd.port.mk>
diff --git a/devel/thunar-vcs-plugin/distinfo b/devel/thunar-vcs-plugin/distinfo
index 25ce866fdb85..796d5bfc8a29 100644
--- a/devel/thunar-vcs-plugin/distinfo
+++ b/devel/thunar-vcs-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735597416
-SHA256 (xfce4/thunar-vcs-plugin-0.3.0.tar.bz2) = 4093b2802f08222b6b8edc6aa8127059ef138ff2b382117a25c34441ba6c1fec
-SIZE (xfce4/thunar-vcs-plugin-0.3.0.tar.bz2) = 808074
+TIMESTAMP = 1747847035
+SHA256 (xfce4/thunar-vcs-plugin-0.4.0.tar.xz) = 0e4170e099c9ffedfcbb1290f1fc42c00560cf6108e25fe90685315f18c8d6cc
+SIZE (xfce4/thunar-vcs-plugin-0.4.0.tar.xz) = 231328
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 <groknok@gmail.com>
+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 488be5af04d3..affd82365314 100644
--- a/devel/thunar-vcs-plugin/pkg-plist
+++ b/devel/thunar-vcs-plugin/pkg-plist
@@ -1,10 +1,12 @@
lib/thunarx-3/thunar-vcs-plugin.so
%%GIT%%libexec/tvp-git-helper
%%SUBVERSION%%libexec/tvp-svn-helper
-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 18:19:21 +0000