git: 44b93a8635ff - main - x11/gxkb: the port had been updated and improved (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Tue, 13 May 2025 16:04:28 UTC
The branch main has been updated by danfe:

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

commit 44b93a8635fff6efeb61e1fbd6455264795da454
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2025-05-13 16:02:40 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2025-05-13 16:02:40 +0000

    x11/gxkb: the port had been updated and improved (+)
    
    - Update to the latest version 0.9.6
    - Do not install crippled, incomplete flag icons from
      upstream and use the `misc/flag-icons' port instead
    
    Reported by:    portscout
    Fixes:          947f7b90ddbc
---
 x11/gxkb/Makefile  | 32 ++++++++++++------
 x11/gxkb/distinfo  |  8 ++---
 x11/gxkb/pkg-plist | 98 ------------------------------------------------------
 3 files changed, 24 insertions(+), 114 deletions(-)

diff --git a/x11/gxkb/Makefile b/x11/gxkb/Makefile
index 8deae4f2ce9b..db52fc292420 100644
--- a/x11/gxkb/Makefile
+++ b/x11/gxkb/Makefile
@@ -1,9 +1,7 @@
 PORTNAME=	gxkb
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}
-# RU and BY flags were removed as of version 0.9.4 so we need two distfiles
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-0.9.3${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	X11 keyboard layout indicator and switcher
@@ -12,15 +10,23 @@ WWW=		https://zen-tools.github.io/gxkb/
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libxklavier.so:x11/libxklavier
+RUN_DEPENDS=	${_FLAGS_DIR}/epo.png:misc/flag-icons@${_FLAGS_FLAVOR}
 
 USES=		gnome pkgconfig
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_GNOME=	gdkpixbuf glib20
 
 PORTDOCS=	AUTHORS NEWS
 
 OPTIONS_DEFINE=	DOCS GTK2
+OPTIONS_DEFAULT=	ROUNDED
+OPTIONS_SINGLE=	FLAGS
+OPTIONS_SINGLE_FLAGS=	BORDERED PLAIN ROUNDED
+
+FLAGS_DESC=	Preferred flag decorations
+BORDERED_DESC=	Thin black border
+PLAIN_DESC=	Plain (undecorated)
+ROUNDED_DESC=	Rounded corners
 GTK2_DESC=	Build against GTK version 2, not 3
 
 GTK2_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gtk2
@@ -30,17 +36,21 @@ GTK2_USES=		autoreconf
 GTK2_USE=		GNOME=gtk20
 GTK2_USE_OFF=		GNOME=gtk30
 
+_FLAGS_DIR=	${LOCALBASE}/share/icons/flag-icons/${_FLAGS_FLAVOR}/21x16
+_FLAGS_FLAVOR=	${PORT_OPTIONS:${OPTIONS_DEFINE:S,^,N,:ts:}:tl}
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS = flags/d' \
+		${WRKSRC}/data/Makefile.[ai][mn]
+	@${REINPLACE_CMD} -e 's,$$(datadir)/gxkb/flags,${_FLAGS_DIR},' \
+		${WRKSRC}/src/Makefile.[ai][mn]
+
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/^doc_DATA/s, C[^ ]*,,g' \
 		${WRKSRC}/doc/Makefile.[ai][mn]
 
 post-patch-DOCS-off:
-	@${REINPLACE_CMD} -e '/^SUBDIRS/s, doc,,' ${WRKSRC}/Makefile.in
-
-post-install:
-.for c in by ru
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-0.9.3/data/flags/${c}.png \
-		${STAGEDIR}${DATADIR}/flags
-.endfor
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s, doc,,' \
+		${WRKSRC}/Makefile.[ai][mn]
 
 .include <bsd.port.mk>
diff --git a/x11/gxkb/distinfo b/x11/gxkb/distinfo
index ecda7d3238be..2ca8e6c58f06 100644
--- a/x11/gxkb/distinfo
+++ b/x11/gxkb/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1707253056
-SHA256 (gxkb-0.9.5.tar.gz) = 255af5516a5b39acb0cd2a821404833decce00c2bfee42e2d68dfb461d18c82f
-SIZE (gxkb-0.9.5.tar.gz) = 236124
-SHA256 (gxkb-0.9.3.tar.gz) = ef0bbea5f40051e57ca35f304a91ff296044029913cd4d07470fd26b5204d831
-SIZE (gxkb-0.9.3.tar.gz) = 174152
+TIMESTAMP = 1722449975
+SHA256 (gxkb-0.9.6.tar.gz) = 43c68ff62d62fd6e2e9ca42b3f209c68cc37924c44302e28c1b04ef9f541ebdb
+SIZE (gxkb-0.9.6.tar.gz) = 236500
diff --git a/x11/gxkb/pkg-plist b/x11/gxkb/pkg-plist
index 16c10cd6e8e2..7d5ce6c1680f 100644
--- a/x11/gxkb/pkg-plist
+++ b/x11/gxkb/pkg-plist
@@ -1,103 +1,5 @@
 bin/gxkb
 share/applications/gxkb.desktop
-%%DATADIR%%/flags/af.png
-%%DATADIR%%/flags/al.png
-%%DATADIR%%/flags/am.png
-%%DATADIR%%/flags/at.png
-%%DATADIR%%/flags/au.png
-%%DATADIR%%/flags/az.png
-%%DATADIR%%/flags/ba.png
-%%DATADIR%%/flags/bd.png
-%%DATADIR%%/flags/be.png
-%%DATADIR%%/flags/bg.png
-%%DATADIR%%/flags/br.png
-%%DATADIR%%/flags/bt.png
-%%DATADIR%%/flags/bw.png
-%%DATADIR%%/flags/by.png
-%%DATADIR%%/flags/ca.png
-%%DATADIR%%/flags/cd.png
-%%DATADIR%%/flags/ch.png
-%%DATADIR%%/flags/cm.png
-%%DATADIR%%/flags/cn.png
-%%DATADIR%%/flags/cz.png
-%%DATADIR%%/flags/cz_qwerty.png
-%%DATADIR%%/flags/de.png
-%%DATADIR%%/flags/dk.png
-%%DATADIR%%/flags/dz.png
-%%DATADIR%%/flags/ee.png
-%%DATADIR%%/flags/eg.png
-%%DATADIR%%/flags/epo.png
-%%DATADIR%%/flags/es.png
-%%DATADIR%%/flags/et.png
-%%DATADIR%%/flags/eu.png
-%%DATADIR%%/flags/fi.png
-%%DATADIR%%/flags/fo.png
-%%DATADIR%%/flags/fr.png
-%%DATADIR%%/flags/gb.png
-%%DATADIR%%/flags/ge.png
-%%DATADIR%%/flags/gh.png
-%%DATADIR%%/flags/gn.png
-%%DATADIR%%/flags/gr.png
-%%DATADIR%%/flags/hr.png
-%%DATADIR%%/flags/hu.png
-%%DATADIR%%/flags/id.png
-%%DATADIR%%/flags/ie.png
-%%DATADIR%%/flags/il.png
-%%DATADIR%%/flags/in.png
-%%DATADIR%%/flags/iq.png
-%%DATADIR%%/flags/ir.png
-%%DATADIR%%/flags/is.png
-%%DATADIR%%/flags/it.png
-%%DATADIR%%/flags/jp.png
-%%DATADIR%%/flags/ke.png
-%%DATADIR%%/flags/kg.png
-%%DATADIR%%/flags/kh.png
-%%DATADIR%%/flags/kr.png
-%%DATADIR%%/flags/kz.png
-%%DATADIR%%/flags/la.png
-%%DATADIR%%/flags/lk.png
-%%DATADIR%%/flags/lt.png
-%%DATADIR%%/flags/lv.png
-%%DATADIR%%/flags/ma.png
-%%DATADIR%%/flags/md.png
-%%DATADIR%%/flags/me.png
-%%DATADIR%%/flags/mk.png
-%%DATADIR%%/flags/ml.png
-%%DATADIR%%/flags/mm.png
-%%DATADIR%%/flags/mn.png
-%%DATADIR%%/flags/mt.png
-%%DATADIR%%/flags/mv.png
-%%DATADIR%%/flags/my.png
-%%DATADIR%%/flags/ng.png
-%%DATADIR%%/flags/nl.png
-%%DATADIR%%/flags/no.png
-%%DATADIR%%/flags/np.png
-%%DATADIR%%/flags/nz.png
-%%DATADIR%%/flags/ph.png
-%%DATADIR%%/flags/pk.png
-%%DATADIR%%/flags/pl.png
-%%DATADIR%%/flags/pt.png
-%%DATADIR%%/flags/ro.png
-%%DATADIR%%/flags/rs.png
-%%DATADIR%%/flags/ru.png
-%%DATADIR%%/flags/se.png
-%%DATADIR%%/flags/si.png
-%%DATADIR%%/flags/sk.png
-%%DATADIR%%/flags/sn.png
-%%DATADIR%%/flags/sy.png
-%%DATADIR%%/flags/tg.png
-%%DATADIR%%/flags/th.png
-%%DATADIR%%/flags/tj.png
-%%DATADIR%%/flags/tm.png
-%%DATADIR%%/flags/tr.png
-%%DATADIR%%/flags/tw.png
-%%DATADIR%%/flags/tz.png
-%%DATADIR%%/flags/ua.png
-%%DATADIR%%/flags/us.png
-%%DATADIR%%/flags/uz.png
-%%DATADIR%%/flags/vn.png
-%%DATADIR%%/flags/za.png
-%%DATADIR%%/flags/zz.png
 %%DATADIR%%/logo.png
 share/man/man1/gxkb.1.gz
 share/pixmaps/gxkb.xpm