tint2: fix pathes

[kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Wed Feb 5 11:50:18 2025 +0100
Changeset:	58abf05a773429dcd0aa8477edb7f01d4c5bc7b8

Modified Files:
	tint2/Makefile
	tint2/distinfo
Added Files:
	tint2/COMMIT_MSG
	tint2/patches/patch-src_launcher_apps-common.c
	tint2/patches/patch-src_launcher_icon-theme-common.c

Log Message:
tint2: fix pathes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=58abf05a773429dcd0aa8477edb7f01d4c5bc7b8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tint2/COMMIT_MSG                                   |  3 +++
 tint2/Makefile                                     | 12 +++++++---
 tint2/distinfo                                     |  2 ++
 tint2/patches/patch-src_launcher_apps-common.c     | 14 ++++++++++++
 .../patches/patch-src_launcher_icon-theme-common.c | 26 ++++++++++++++++++++++
 5 files changed, 54 insertions(+), 3 deletions(-)

diffs:
diff --git a/tint2/COMMIT_MSG b/tint2/COMMIT_MSG
new file mode 100644
index 0000000000..346bb5ea86
--- /dev/null
+++ b/tint2/COMMIT_MSG
@@ -0,0 +1,3 @@
+x11/tint2: fix to find pathes of icons and aplications
+
+Use devel/cmake/build.mk instead of USE_CMAKE
diff --git a/tint2/Makefile b/tint2/Makefile
index 7ad72ec9b2..66bb77578b 100644
--- a/tint2/Makefile
+++ b/tint2/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=		tint2-v17.0.2
 PKGNAME=		${DISTNAME:S/-v/-/}
-PKGREVISION=		19
+PKGREVISION=		20
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GITLAB:=o9000/}
 GITLAB_PROJECT=		tint2
@@ -16,7 +16,6 @@ LICENSE=		gnu-gpl-v2
 
 # XXX CMake. pkg does not really need c++
 USE_LANGUAGES=		c c++
-USE_CMAKE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		msgfmt msgmerge pkg-config
 
@@ -37,11 +36,18 @@ CFLAGS.SunOS+=		-Du_int8_t=uint8_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t
 # For sqrt(3). Needed on at least Linux and should be harmless elsewhere.
 LDFLAGS+=		-lm
 
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_MESSAGE.path=	Fixing pathes
+SUBST_FILES.path+=	src/launcher/apps-common.c
+SUBST_FILES.path+=	src/launcher/icon-theme-common.c
+SUBST_VARS.path+=	PREFIX
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/themes/tint2rc \
 		${DESTDIR}${PREFIX}/share/examples/tint2
 
-.include "../../devel/cmake/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
diff --git a/tint2/distinfo b/tint2/distinfo
index 15984f47f3..c8a26c2cb3 100644
--- a/tint2/distinfo
+++ b/tint2/distinfo
@@ -4,6 +4,8 @@ BLAKE2s (tint2-v17.0.2.tar.bz2) = dac47c5d25014eec0854b22a28ce3417c0dbf15f031c26
 SHA512 (tint2-v17.0.2.tar.bz2) = 2b309fd1ab01e5176cc95e0651f28224b158c2bafd58cfff19840b0f8e880e9f4dcefeff32bc66d5fac11d932d4ee668ea7ddd7bab860f9edcfcdb7074e0e0ed
 Size (tint2-v17.0.2.tar.bz2) = 405654 bytes
 SHA1 (patch-aa) = fdf0fe697ceb576068b0873532ac406b59752370
+SHA1 (patch-src_launcher_apps-common.c) = 4d67e44112f704a3e50c8b0b88f18313df0caa73
+SHA1 (patch-src_launcher_icon-theme-common.c) = 4584ab6e12f69d55fbb708c127e8ce125e752034
 SHA1 (patch-src_util_area.c) = 93a56ee62af285d7ececc44b69bde623626b6b85
 SHA1 (patch-src_util_bt.c) = 7b4007a67f20a5fa42b7667ace28f1bf0dc241be
 SHA1 (patch-src_util_common.c) = 66808606e9ab5f138107ac41cfd4f8bd6340baa4
diff --git a/tint2/patches/patch-src_launcher_apps-common.c b/tint2/patches/patch-src_launcher_apps-common.c
new file mode 100644
index 0000000000..83b78a1ab4
--- /dev/null
+++ b/tint2/patches/patch-src_launcher_apps-common.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+* Add applications path of pkgsrc
+
+--- src/launcher/apps-common.c.orig	2025-02-05 09:47:18.883124706 +0000
++++ src/launcher/apps-common.c
+@@ -317,6 +317,7 @@ const GSList *get_apps_locations()
+     apps_locations = load_locations_from_env(apps_locations, "XDG_DATA_DIRS", "applications", NULL);
+ 
+     apps_locations = g_slist_append(apps_locations, g_strdup("/usr/local/share/applications"));
++    apps_locations = g_slist_append(apps_locations, g_strdup("@PREFIX@/share/applications"));
+     apps_locations = g_slist_append(apps_locations, g_strdup("/usr/share/applications"));
+     apps_locations = g_slist_append(apps_locations, g_strdup("/opt/share/applications"));
+ 
diff --git a/tint2/patches/patch-src_launcher_icon-theme-common.c b/tint2/patches/patch-src_launcher_icon-theme-common.c
new file mode 100644
index 0000000000..4c5a961d16
--- /dev/null
+++ b/tint2/patches/patch-src_launcher_icon-theme-common.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Add icons path of pkgsrc, fix env based pathes
+
+--- src/launcher/icon-theme-common.c.orig	2025-02-05 09:47:41.534572814 +0000
++++ src/launcher/icon-theme-common.c
+@@ -55,15 +55,17 @@ const GSList *get_icon_locations()
+     if (icon_locations)
+         return icon_locations;
+ 
+-    icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_HOME", ".icons", NULL);
++    icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_HOME", "icons", NULL);
+ 
+     icon_locations = g_slist_append(icon_locations, g_build_filename(g_get_home_dir(), ".icons", NULL));
+     icon_locations = g_slist_append(icon_locations, g_build_filename(g_get_home_dir(), ".local/share/icons", NULL));
+ 
+-    icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_DIRS", ".icons", ".pixmaps", NULL);
++    icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_DIRS", "icons", "pixmaps", NULL);
+ 
+     icon_locations = g_slist_append(icon_locations, g_strdup("/usr/local/share/icons"));
+     icon_locations = g_slist_append(icon_locations, g_strdup("/usr/local/share/pixmaps"));
++    icon_locations = g_slist_append(icon_locations, g_strdup("@PREFIX@/share/icons"));
++    icon_locations = g_slist_append(icon_locations, g_strdup("@PREFIX@/share/pixmaps"));
+     icon_locations = g_slist_append(icon_locations, g_strdup("/usr/share/icons"));
+     icon_locations = g_slist_append(icon_locations, g_strdup("/usr/share/pixmaps"));
+     icon_locations = g_slist_append(icon_locations, g_strdup("/opt/share/icons"));