Skip to content

Commit

Permalink
accessibility/at-spi2-core: update to 2.48.4
Browse files Browse the repository at this point in the history
- Adjust LICENSE to "or (at your option) any later version" clause
- Replace systemd hack with a patch that can be upstreamed

PR:		273738
  • Loading branch information
OlivierDuchateau authored and jbeich committed Sep 23, 2023
1 parent d5e22fb commit eefe94d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
9 changes: 4 additions & 5 deletions 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
Expand All @@ -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
Expand All @@ -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>
6 changes: 3 additions & 3 deletions 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
10 changes: 10 additions & 0 deletions 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()
3 changes: 2 additions & 1 deletion accessibility/at-spi2-core/pkg-plist
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit eefe94d

Please sign in to comment.