xapps: Update new version to 2.4.1

[K.I.A.Derouiche <kamelderouiche%yahoo.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	K.I.A.Derouiche <kamelderouiche%yahoo.com@localhost>
Pushed By:	jihbed
Date:		Sat Nov 26 19:50:09 2022 +0000
Changeset:	16aa22cd07351ae73d6b77db8ed4f88f7e29bb0a

Modified Files:
	xapps/Makefile
	xapps/PLIST
	xapps/buildlink3.mk
	xapps/distinfo

Log Message:
xapps: Update new version to 2.4.1

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

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

diffstat:
 xapps/Makefile      | 54 +++++++++++++++++++++++++++++++++++------------------
 xapps/PLIST         |  6 +++++-
 xapps/buildlink3.mk | 16 ++++++++--------
 xapps/distinfo      |  7 +++----
 4 files changed, 52 insertions(+), 31 deletions(-)

diffs:
diff --git a/xapps/Makefile b/xapps/Makefile
index 97a0350132..694c5c868b 100644
--- a/xapps/Makefile
+++ b/xapps/Makefile
@@ -1,41 +1,59 @@
-# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+# $NetBSD$
 
-DISTNAME=	xapp-2.2.6
+VERSION= 2.4.1
+GITHUB_PROJECT=	xapp
+GITHUB_TAG=	refs/tags/master.mint21
+DISTNAME=	master.mint21
+PKGNAME=	${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
-GITHUB_PROJECT=	xapp
-GITHUB_TAG=	${PKGVERSION_NOREV}
+DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	youri%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/linuxmint/xapp
 COMMENT=	Components which are common to multiple desktop environments
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
+WRKSRC=		${WRKDIR}/xapp-master.mint21
 
-USE_TOOLS=		pkg-config intltool
-USE_CMAKE=		yes
-USE_LANGUAGES=		c c++ fortran
-WRKSRC=			${WRKDIR}/xapp-2.2.6
+USE_TOOLS=	bash pkg-config intltool gdbus-codegen
 USE_PKGLOCALEDIR=	yes
 
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
+DEPENDS+=	inxi-[0-9]*:../../wip/inxi
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
-REPLACE_PYTHON+=	libxapp/g-codegen.py libxapp/install_generated_header.py makedoc schemas/meson_install_schemas.py
+# Adjust meson.build
+SUBST_CLASSES+=		meson
+SUBST_STAGE.meson=	pre-configure
+SUBST_MESSAGE.meson=	Fixing meson build
+SUBST_FILES.meson=	pygobject/meson.build
+SUBST_SED.meson=	-e 's,python3,python${PYVERSSUFFIX},g'
 
-.include "../../devel/meson/build.mk"
+# Adjust scripts
+SUBST_CLASSES+=		scripts
+SUBST_STAGE.scripts=	pre-configure
+SUBST_MESSAGE.scripts=	Fixing scripts
+SUBST_FILES.scripts=	scripts/upload-system-info
+SUBST_SED.scripts=	-e 's,/usr/bin/pastebin,${PREFIX}/pastebin,g'
+
+REPLACE_BASH+=	 scripts/xfce4-set-wallpaper  data/80xapp-gtk3-module.sh
+
+REPLACE_PYTHON+= scripts/pastebin scripts/upload-system-info status-applets/mate/mate-xapp-status-applet.py
+
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
 .include "../../devel/py-gobject3-common/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/vala/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/libgnomekbd/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../lang/vala/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xapps/PLIST b/xapps/PLIST
index 7b1fc6b2ec..0382384169 100644
--- a/xapps/PLIST
+++ b/xapps/PLIST
@@ -17,11 +17,12 @@ include/xapp/libxapp/xapp-status-icon.h
 include/xapp/libxapp/xapp-statusicon-interface.h
 include/xapp/libxapp/xapp-style-manager.h
 include/xapp/libxapp/xapp-util.h
+include/xapp/libxapp/xapp-visibility-group.h
 lib/girepository-1.0/XApp-1.0.typelib
 lib/gtk-3.0/modules/libxapp-gtk3-module.so
 lib/libxapp.so
 lib/libxapp.so.1
-lib/libxapp.so.${PKGVERSION}
+lib/libxapp.so.2.4.1
 lib/pkgconfig/xapp.pc
 ${PYSITELIB}/gi/overrides/XApp.py
 libexec/xapps/applet_constants.py
@@ -45,6 +46,7 @@ share/icons/hicolor/scalable/actions/view-top-pane-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-annotations-squiggly-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-annotations-text-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-diaporama-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-edit-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-favorite-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-format-text-highlight-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic-rtl.svg
@@ -58,6 +60,8 @@ share/icons/hicolor/scalable/actions/xapp-text-case-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-unfavorite-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-unpin-symbolic.svg
 share/icons/hicolor/scalable/actions/xapp-use-regex-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-view-fit-height-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-view-fit-width-symbolic.svg
 share/icons/hicolor/scalable/apps/xapp-favorites-app-symbolic.svg
 share/icons/hicolor/scalable/apps/xapp-favorites-app.svg
 share/icons/hicolor/scalable/apps/xapp-mate-status-applet.svg
diff --git a/xapps/buildlink3.mk b/xapps/buildlink3.mk
index 710aff952b..9d21d08d01 100644
--- a/xapps/buildlink3.mk
+++ b/xapps/buildlink3.mk
@@ -5,20 +5,20 @@ BUILDLINK_TREE+=	xapp
 .if !defined(XAPP_BUILDLINK3_MK)
 XAPP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xapp+=	xapp>=2.2.6
-BUILDLINK_PKGSRCDIR.xapp?=	../../wip/xapps
+BUILDLINK_DEPMETHOD.xapp?=	build
+
+BUILDLINK_API_DEPENDS.xapp+=	xapp>=2.4.1
+BUILDLINK_PKGSRCDIR.xapp?=	../../category/xapps
 
-.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
+.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/py-gobject3-common/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../lang/vala/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/libgnomekbd/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
 .endif	# XAPP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xapp
diff --git a/xapps/distinfo b/xapps/distinfo
index a8998461d8..e0a561f328 100644
--- a/xapps/distinfo
+++ b/xapps/distinfo
@@ -1,6 +1,5 @@
 $NetBSD$
 
-SHA1 (xapp-2.2.6.tar.gz) = d448c136ea55f898a8305eb05a9341e986fb15c1
-RMD160 (xapp-2.2.6.tar.gz) = 8102908fcb5d329d6ba6f2cb857b032fbc7ab401
-SHA512 (xapp-2.2.6.tar.gz) = e54790176d25ecae09ebd9a394ac72eaa2d21c392a33de145fd89cdbf0e7853573753fa2ecb8dcf36210dcbd543d1dc5401449d09f18e49b4a92932f7c188c79
-Size (xapp-2.2.6.tar.gz) = 243642 bytes
+BLAKE2s (xapp/master.mint21.tar.gz) = 4a0ec225f804333bf83ef53c5ac0956760b69c5b6f2cd5bcf10df17aad4abd70
+SHA512 (xapp/master.mint21.tar.gz) = 15ad0074d11216f9def8afc77d7baee1a67febc56ed7fc638cc8883a1abe5884c1a7def978e1c09fdd4d93a8e41ede454f09d1cc05fe37ed4164d3e967d3d53b
+Size (xapp/master.mint21.tar.gz) = 251877 bytes