git: 98064d3fa8fe - main - x11/budgie-desktop: update to 10.8.1

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=98064d3fa8fe581fd84439603de9a748f6b5fa59

commit 98064d3fa8fe581fd84439603de9a748f6b5fa59
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2023-10-02 17:34:32 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-04 19:59:57 +0000

    x11/budgie-desktop: update to 10.8.1
    
    Use of x11/xdg-desktop-portal-gtk is patched out pending an update of
    the port to > 1.17.x.
    
    Changelog: https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.8.1
    
    PR:             274222
    MFH:            2023Q4
---
 x11/budgie-desktop/Makefile                     |  6 +-----
 x11/budgie-desktop/distinfo                     |  8 +++-----
 x11/budgie-desktop/files/patch-data_meson.build | 18 +++++++++++++-----
 x11/budgie-desktop/files/patch-meson.build      | 24 ++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/x11/budgie-desktop/Makefile b/x11/budgie-desktop/Makefile
index 30549ba2c009..5adf2f0be2d7 100644
--- a/x11/budgie-desktop/Makefile
+++ b/x11/budgie-desktop/Makefile
@@ -1,13 +1,9 @@
 PORTNAME=	budgie-desktop
-DISTVERSION=	10.8
+DISTVERSION=	10.8.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	x11 budgie
 MASTER_SITES=	BUDGIE
 
-PATCH_SITES=	https://github.com/BuddiesOfBudgie/budgie-desktop/commit/
-PATCHFILES=	980b72e1651b53fd9f11e2c87dd4ea029896c858.patch:-p1
-
 MAINTAINER=	duchateau.olivier@gmail.com
 COMMENT=	Modern and familiar desktop environment
 WWW=		https://github.com/BuddiesOfBudgie/budgie-desktop
diff --git a/x11/budgie-desktop/distinfo b/x11/budgie-desktop/distinfo
index e160c80592fd..d732966de3cd 100644
--- a/x11/budgie-desktop/distinfo
+++ b/x11/budgie-desktop/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1693665825
-SHA256 (budgie/budgie-desktop-v10.8.tar.xz) = b8406a60a74390421278486b242369017806716e87ea911424091e63febd2619
-SIZE (budgie/budgie-desktop-v10.8.tar.xz) = 3009908
-SHA256 (budgie/980b72e1651b53fd9f11e2c87dd4ea029896c858.patch) = fb197da25d9db6df601e7275e7ba52509d23b39ea7b1d30da82ec1e5bd7142fb
-SIZE (budgie/980b72e1651b53fd9f11e2c87dd4ea029896c858.patch) = 1502
+TIMESTAMP = 1696264666
+SHA256 (budgie/budgie-desktop-v10.8.1.tar.xz) = b12d4b5bc3da3363c766535cf8e8e64003afac46f84d040ad7d7d996090f2ca7
+SIZE (budgie/budgie-desktop-v10.8.1.tar.xz) = 3185112
diff --git a/x11/budgie-desktop/files/patch-data_meson.build b/x11/budgie-desktop/files/patch-data_meson.build
index 49018a110065..126e475b7604 100644
--- a/x11/budgie-desktop/files/patch-data_meson.build
+++ b/x11/budgie-desktop/files/patch-data_meson.build
@@ -1,11 +1,19 @@
---- data/meson.build.orig	2023-02-19 16:48:41 UTC
+--- data/meson.build.orig	2023-09-30 15:44:12 UTC
 +++ data/meson.build
-@@ -15,3 +15,8 @@ install_data(
-     version_file,
+@@ -16,7 +16,13 @@ install_data(
      install_dir: join_paths(datadir, 'budgie')
  )
-+
+ 
+-install_data(
+-    'budgie-portals.conf',
+-    install_dir: join_paths(datadir, 'xdg-desktop-portal')
 +# Our own settings
 +install_data('25_org.buddiesofbudgie-default-settings.gschema.override',
 +    install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
-+)
+ )
++
++# It requires, x11/xdg-desktop-portal-gtk > 1.17.x
++#install_data(
++#    'budgie-portals.conf',
++#    install_dir: join_paths(datadir, 'xdg-desktop-portal')
++#)
diff --git a/x11/budgie-desktop/files/patch-meson.build b/x11/budgie-desktop/files/patch-meson.build
new file mode 100644
index 000000000000..dc7bc1e0d710
--- /dev/null
+++ b/x11/budgie-desktop/files/patch-meson.build
@@ -0,0 +1,24 @@
+--- meson.build.orig	2023-09-30 15:44:12 UTC
++++ meson.build
+@@ -67,12 +67,6 @@ cdata = configuration_data()
+ # Inspired by https://github.com/GNOME/recipes/blob/master/meson.build
+ package_version = meson.project_version()
+ 
+-if fs.exists('.git')
+-    git = find_program('git')
+-    git_version = run_command('git', ['rev-parse', 'HEAD'], check: true)
+-    package_version += ' (git-'+git_version.stdout().strip()+')'
+-endif
+-
+ cdata.set_quoted('PACKAGE_VERSION', package_version)
+ 
+ # Make gettext work
+@@ -154,7 +148,7 @@ if xdg_appdir == ''
+     if with_stateless == true
+         xdg_appdir = join_paths(datadir, 'xdg', 'autostart')
+     else
+-        xdg_appdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
++        xdg_appdir = join_paths(confdir, 'xdg', 'autostart')
+     endif
+ endif
+