git: eefe94d7f92d - main - accessibility/at-spi2-core: update to 2.48.4

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 23 Sep 2023 09:57:40 UTC
The branch main has been updated by jbeich:

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

commit eefe94d7f92d5372a47bbba500f4246d6235a448
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2023-09-12 09:24:35 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-23 09:57:31 +0000

    accessibility/at-spi2-core: update to 2.48.4
    
    - Adjust LICENSE to "or (at your option) any later version" clause
    - Replace systemd hack with a patch that can be upstreamed
    
    PR:             273738
---
 accessibility/at-spi2-core/Makefile                    |  9 ++++-----
 accessibility/at-spi2-core/distinfo                    |  6 +++---
 accessibility/at-spi2-core/files/patch-bus_meson.build | 10 ++++++++++
 accessibility/at-spi2-core/pkg-plist                   |  3 ++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index 03d068e38493..a795ff14b287 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	at-spi2-core
-PORTVERSION=	2.48.0
+PORTVERSION=	2.48.4
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -8,13 +8,15 @@ MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Assistive Technology Service Provider Interface
 WWW=		https://gitlab.gnome.org/GNOME/at-spi2-core
 
-LICENSE=	LGPL21
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gnome localbase meson pkgconfig tar:xz
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
+MESON_ARGS=	-Duse_systemd=false
 
 OPTIONS_DEFINE=	ATKONLY X11
 OPTIONS_DEFAULT=X11
@@ -28,7 +30,4 @@ X11_USES=		xorg
 X11_USE=		XORG=x11,xi,xtst
 X11_MESON_ENABLED=	x11
 
-post-install:
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
-
 .include <bsd.port.mk>
diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo
index e11424e0db40..2a5788b868a8 100644
--- a/accessibility/at-spi2-core/distinfo
+++ b/accessibility/at-spi2-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679511742
-SHA256 (gnome/at-spi2-core-2.48.0.tar.xz) = 905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30
-SIZE (gnome/at-spi2-core-2.48.0.tar.xz) = 554000
+TIMESTAMP = 1693662051
+SHA256 (gnome/at-spi2-core-2.48.4.tar.xz) = 29ecb12992e8339675f5d755c8735ea3ea298379cfa2c93fde96bee5dc57a515
+SIZE (gnome/at-spi2-core-2.48.4.tar.xz) = 554916
diff --git a/accessibility/at-spi2-core/files/patch-bus_meson.build b/accessibility/at-spi2-core/files/patch-bus_meson.build
new file mode 100644
index 000000000000..7147c38db36d
--- /dev/null
+++ b/accessibility/at-spi2-core/files/patch-bus_meson.build
@@ -0,0 +1,10 @@
+--- bus/meson.build.orig	2023-09-02 13:40:51 UTC
++++ bus/meson.build
+@@ -32,6 +32,7 @@ configure_file(input: 'at-spi-dbus-bus.service.in',
+ configure_file(input: 'at-spi-dbus-bus.service.in',
+                output: 'at-spi-dbus-bus.service',
+                configuration: libexec_conf,
++               install: get_option('use_systemd'),
+                install_dir: systemd_user_dir)
+ 
+ if x11_dep.found()
diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
index e2c9f82c1b55..c811a2d81faa 100644
--- a/accessibility/at-spi2-core/pkg-plist
+++ b/accessibility/at-spi2-core/pkg-plist
@@ -30,6 +30,7 @@
 %%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-text.h
 %%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-types.h
 %%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-value.h
+%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-version.h
 %%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi.h
 %%NO_ATKONLY%%include/at-spi2-atk/2.0/atk-bridge.h
 include/atk-1.0/atk/atk-autocleanups.h
@@ -73,7 +74,7 @@ lib/girepository-1.0/Atk-1.0.typelib
 %%NO_ATKONLY%%lib/gtk-2.0/modules/libatk-bridge.so
 lib/libatk-1.0.so
 lib/libatk-1.0.so.0
-lib/libatk-1.0.so.0.24809.1
+lib/libatk-1.0.so.0.24813.1
 %%NO_ATKONLY%%lib/libatk-bridge-2.0.so
 %%NO_ATKONLY%%lib/libatk-bridge-2.0.so.0
 %%NO_ATKONLY%%lib/libatk-bridge-2.0.so.0.0.0