git: a039316cd24e - main - x11/libgnomekbd: update to 3.28.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 11 Jun 2025 16:09:47 UTC
The branch main has been updated by bapt:

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

commit a039316cd24ea89e1da2723998a7a101d312aae8
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2025-06-11 12:01:12 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-06-11 16:08:37 +0000

    x11/libgnomekbd: update to 3.28.1
    
    PR:     286697
---
 x11/libgnomekbd/Makefile  | 33 +++++++++++++++++++++++++--------
 x11/libgnomekbd/distinfo  | 10 +++++++---
 x11/libgnomekbd/pkg-descr |  3 ++-
 x11/libgnomekbd/pkg-plist |  5 +++--
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 66319c7662bc..f03b913d4ea5 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,28 +1,45 @@
 PORTNAME=	libgnomekbd
-PORTVERSION=	3.26.1
-PORTREVISION=	2
+PORTVERSION=	3.28.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
+PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
+PATCHFILES+=	2ed57e84.patch:-p1
+PATCHFILES+=	7887700a.patch:-p1
+
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME keyboard shared library
+COMMENT=	Keyboard management library
+WWW=		https://gitlab.gnome.org/GNOME/libgnomekbd
 
-LICENSE=	GPLv2
+LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
-USES=		gettext gmake gnome libtool localbase pathfix pkgconfig \
+USES=		gettext gnome localbase pkgconfig meson \
 		tar:xz xorg
-USE_GNOME=	cairo gtk30 introspection:build
-GNU_CONFIGURE=	yes
+USE_GNOME=	cairo gdkpixbuf glib20 gtk30 introspection:build
 USE_XORG=	x11
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
+
+MESON_ARGS=	-Dtests=false \
+		-Dvapi=false # vapi files are not generated
 
 GLIB_SCHEMAS=	org.gnome.libgnomekbd.desktop.gschema.xml \
 		org.gnome.libgnomekbd.gschema.xml \
 		org.gnome.libgnomekbd.keyboard.gschema.xml
 
+post-extract:
+	@${MV} ${WRKSRC}/libgnomekbd/gkbd-keyboard-display.desktop.in.in \
+		${WRKSRC}/libgnomekbd/gkbd-keyboard-display.desktop.in
+
+post-patch:
+	${MV} ${WRKSRC}/data/icons/hicolor/scalable/apps/org.notanapp.KeyboardLayout.Devel.svg \
+		${WRKSRC}/data/icons/hicolor/scalable/apps/org.gnome.KeyboardLayout.Devel.svg
+	${MV} ${WRKSRC}/data/icons/hicolor/scalable/apps/org.notanapp.KeyboardLayout.svg \
+		${WRKSRC}/data/icons/hicolor/scalable/apps/org.gnome.KeyboardLayout.svg
+	${MV} ${WRKSRC}/data/icons/hicolor/symbolic/apps/org.notanapp.KeyboardLayout-symbolic.svg \
+		${WRKSRC}/data/icons/hicolor/symbolic/apps/org.gnome.KeyboardLayout-symbolic.svg
+
 .include <bsd.port.mk>
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 760fb78d6233..fb922011669c 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1656740174
-SHA256 (gnome/libgnomekbd-3.26.1.tar.xz) = f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679
-SIZE (gnome/libgnomekbd-3.26.1.tar.xz) = 450636
+TIMESTAMP = 1732382501
+SHA256 (gnome/libgnomekbd-3.28.1.tar.xz) = 22dc59566d73c0065350f5a97340e62ecc7b08c4df19183804bb8be24c8fe870
+SIZE (gnome/libgnomekbd-3.28.1.tar.xz) = 154800
+SHA256 (gnome/2ed57e84.patch) = 98c1dc777abda15d46cad1f3a9ca7496211a0bf2a3db20c2f80110947242d800
+SIZE (gnome/2ed57e84.patch) = 2074
+SHA256 (gnome/7887700a.patch) = 6c7081b45746a27403db63264a2eed64c4ccc2c2d9053924dab294e57910bd90
+SIZE (gnome/7887700a.patch) = 103415
diff --git a/x11/libgnomekbd/pkg-descr b/x11/libgnomekbd/pkg-descr
index a4b625c78120..c33bc95b6356 100644
--- a/x11/libgnomekbd/pkg-descr
+++ b/x11/libgnomekbd/pkg-descr
@@ -1 +1,2 @@
-GNOME keyboard shared library
+Keyboard management library. It inspects keyboard layout, configuration and
+state
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 4b728c094d20..717a6f6b8d82 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -8,11 +8,9 @@ include/libgnomekbd/gkbd-keyboard-drawing.h
 include/libgnomekbd/gkbd-status.h
 include/libgnomekbd/gkbd-util.h
 lib/girepository-1.0/Gkbd-3.0.typelib
-lib/libgnomekbd.a
 lib/libgnomekbd.so
 lib/libgnomekbd.so.8
 lib/libgnomekbd.so.8.0.0
-lib/libgnomekbdui.a
 lib/libgnomekbdui.so
 lib/libgnomekbdui.so.8
 lib/libgnomekbdui.so.8.0.0
@@ -21,6 +19,8 @@ libdata/pkgconfig/libgnomekbdui.pc
 share/GConf/gsettings/libgnomekbd.convert
 share/applications/gkbd-keyboard-display.desktop
 share/gir-1.0/Gkbd-3.0.gir
+share/icons/hicolor/scalable/apps/org.gnome.KeyboardLayout.svg
+share/icons/hicolor/symbolic/apps/org.gnome.KeyboardLayout-symbolic.svg
 %%DATADIR%%/icons/kbdled-caps-lock.svg
 %%DATADIR%%/icons/kbdled-num-lock.svg
 %%DATADIR%%/icons/kbdled-scroll-lock.svg
@@ -56,6 +56,7 @@ share/locale/gl/LC_MESSAGES/libgnomekbd.mo
 share/locale/gu/LC_MESSAGES/libgnomekbd.mo
 share/locale/he/LC_MESSAGES/libgnomekbd.mo
 share/locale/hi/LC_MESSAGES/libgnomekbd.mo
+share/locale/hr/LC_MESSAGES/libgnomekbd.mo
 share/locale/hu/LC_MESSAGES/libgnomekbd.mo
 share/locale/id/LC_MESSAGES/libgnomekbd.mo
 share/locale/it/LC_MESSAGES/libgnomekbd.mo