git: e36ed9723c0d - main - x11/tilix: Update to 1.9.4

From: Romain Tartière <romain_at_FreeBSD.org>
Date: Mon, 27 Dec 2021 20:58:47 UTC
The branch main has been updated by romain:

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

commit e36ed9723c0dafd86cb27910a21dcd937c1a6ca1
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2021-12-27 20:57:12 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2021-12-27 20:58:35 +0000

    x11/tilix: Update to 1.9.4
---
 x11/tilix/Makefile                     | 19 ++++++------
 x11/tilix/distinfo                     |  8 ++---
 x11/tilix/files/patch-data_meson.build | 36 ++++++++++++++++++++++
 x11/tilix/pkg-plist                    | 56 +++++++++++++++++++++++++---------
 4 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/x11/tilix/Makefile b/x11/tilix/Makefile
index b174842cf25f..a8679d530d2c 100644
--- a/x11/tilix/Makefile
+++ b/x11/tilix/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	tilix
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.4
 CATEGORIES=	x11
 
-PATCH_DIST_STRIP=-p1
-PATCH_SITES=	https://patch-diff.githubusercontent.com/raw/gnunn1/tilix/pull/
-PATCHFILES=	1733.diff
-
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Tiling terminal emulator using GTK+ 3
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	ldc2:lang/ldc \
+BUILD_DEPENDS=	cmake:devel/cmake \
 		po4a-translate:textproc/po4a \
 		${LOCALBASE}/libdata/pkgconfig/vted-3.pc:x11-toolkits/gtkd
+LIB_DEPENDS=	libdruntime-ldc-shared.so:lang/ldc \
+		libharfbuzz.so:print/harfbuzz \
+		libsecret-1.so:security/libsecret \
+		libunwind.so:devel/libunwind
 
-USES=		autoreconf gettext gmake gnome pkgconfig
+USES=		gettext gnome meson pkgconfig shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnunn1
-GNU_CONFIGURE=	yes
-USE_GNOME=	vte3
+USE_GNOME=	cairo gdkpixbuf2 librsvg2 vte3
+USE_XORG=	x11
 GLIB_SCHEMAS=	com.gexperts.Tilix.gschema.xml
+SHEBANG_FILES=	data/scripts/tilix_int.sh
 
 .include <bsd.port.mk>
diff --git a/x11/tilix/distinfo b/x11/tilix/distinfo
index a06a3ad6b794..55feb9ed194b 100644
--- a/x11/tilix/distinfo
+++ b/x11/tilix/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1603820787
-SHA256 (gnunn1-tilix-1.9.3_GH0.tar.gz) = f1b4dbbd60f4b9a91e0ab0954e3e6b8ebe5442d5fbb760a554a733903e44a1de
-SIZE (gnunn1-tilix-1.9.3_GH0.tar.gz) = 837010
-SHA256 (1733.diff) = 58b9a810e10ab7435e30d8e2538dc65ab9c838ba1055af39e11e46d9251a2f62
-SIZE (1733.diff) = 1210
+TIMESTAMP = 1640633390
+SHA256 (gnunn1-tilix-1.9.4_GH0.tar.gz) = 2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
+SIZE (gnunn1-tilix-1.9.4_GH0.tar.gz) = 968142
diff --git a/x11/tilix/files/patch-data_meson.build b/x11/tilix/files/patch-data_meson.build
new file mode 100644
index 000000000000..9cf8458dceaf
--- /dev/null
+++ b/x11/tilix/files/patch-data_meson.build
@@ -0,0 +1,36 @@
+--- data/meson.build.orig	2021-12-27 19:49:46 UTC
++++ data/meson.build
+@@ -35,25 +35,25 @@ endif
+ 
+ # Merge release information into MetaInfo file
+ tilix_metainfo_name = '@0@.appdata.xml'.format(project_id)
+-appstreamcli = find_program('appstreamcli')
+-metainfo_with_releases = custom_target('metainfo-news-merge',
++appstreamcli = find_program('appstreamcli', required: false)
++if appstreamcli.found()
++  metainfo_with_releases = custom_target('metainfo-news-merge',
+     input : ['../NEWS', 'metainfo/@0@.in'.format(tilix_metainfo_name)],
+     output : ['untranslated-@0@.appdata.xml'.format(project_id)],
+     command : [appstreamcli, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@']
+-)
++  )
+ 
+-# Install the MetaInfo file
+-metainfo_file = i18n.merge_file(
++  # Install the MetaInfo file
++  metainfo_file = i18n.merge_file(
+     tilix_metainfo_name,
+     output: tilix_metainfo_name,
+     input: metainfo_with_releases,
+     po_dir: meson.source_root() / 'po',
+     install: true,
+     install_dir: datadir / 'metainfo'
+-)
++  )
+ 
+-# Validate MetaInfo file
+-if appstreamcli.found()
++  # Validate MetaInfo file
+   test (
+     'Validate metainfo file',
+     appstreamcli,
diff --git a/x11/tilix/pkg-plist b/x11/tilix/pkg-plist
index b5a859592d54..676ad4d6609d 100644
--- a/x11/tilix/pkg-plist
+++ b/x11/tilix/pkg-plist
@@ -1,22 +1,48 @@
 bin/tilix
+man/man1/tilix.1.gz
 share/applications/com.gexperts.Tilix.desktop
 share/dbus-1/services/com.gexperts.Tilix.service
-share/icons/hicolor/scalable/apps/com.gexperts.Tilix-symbolic.svg
 share/icons/hicolor/scalable/apps/com.gexperts.Tilix.svg
-share/man/cs/man1/tilix.1.gz
-share/man/de/man1/tilix.1.gz
-share/man/es/man1/tilix.1.gz
-share/man/fr/man1/tilix.1.gz
-share/man/it/man1/tilix.1.gz
-share/man/man1/tilix.1.gz
-share/man/nb_NO/man1/tilix.1.gz
-share/man/nl/man1/tilix.1.gz
-share/man/pt_BR/man1/tilix.1.gz
-share/man/ru/man1/tilix.1.gz
-share/man/sr/man1/tilix.1.gz
-share/man/uk/man1/tilix.1.gz
-share/man/zh_Hant/man1/tilix.1.gz
-share/metainfo/com.gexperts.Tilix.appdata.xml
+share/icons/hicolor/symbolic/apps/com.gexperts.Tilix-symbolic.svg
+share/locale/ak/LC_MESSAGES/tilix.mo
+share/locale/ar/LC_MESSAGES/tilix.mo
+share/locale/ar_MA/LC_MESSAGES/tilix.mo
+share/locale/bg/LC_MESSAGES/tilix.mo
+share/locale/ca/LC_MESSAGES/tilix.mo
+share/locale/cs/LC_MESSAGES/tilix.mo
+share/locale/de/LC_MESSAGES/tilix.mo
+share/locale/el/LC_MESSAGES/tilix.mo
+share/locale/en_GB/LC_MESSAGES/tilix.mo
+share/locale/eo/LC_MESSAGES/tilix.mo
+share/locale/es/LC_MESSAGES/tilix.mo
+share/locale/eu/LC_MESSAGES/tilix.mo
+share/locale/fi/LC_MESSAGES/tilix.mo
+share/locale/fr/LC_MESSAGES/tilix.mo
+share/locale/gl/LC_MESSAGES/tilix.mo
+share/locale/he/LC_MESSAGES/tilix.mo
+share/locale/hr/LC_MESSAGES/tilix.mo
+share/locale/hu/LC_MESSAGES/tilix.mo
+share/locale/id/LC_MESSAGES/tilix.mo
+share/locale/it/LC_MESSAGES/tilix.mo
+share/locale/ja/LC_MESSAGES/tilix.mo
+share/locale/ko/LC_MESSAGES/tilix.mo
+share/locale/lt/LC_MESSAGES/tilix.mo
+share/locale/mr/LC_MESSAGES/tilix.mo
+share/locale/nb_NO/LC_MESSAGES/tilix.mo
+share/locale/nl/LC_MESSAGES/tilix.mo
+share/locale/oc/LC_MESSAGES/tilix.mo
+share/locale/pl/LC_MESSAGES/tilix.mo
+share/locale/pt_BR/LC_MESSAGES/tilix.mo
+share/locale/pt_PT/LC_MESSAGES/tilix.mo
+share/locale/ro/LC_MESSAGES/tilix.mo
+share/locale/ru/LC_MESSAGES/tilix.mo
+share/locale/sr/LC_MESSAGES/tilix.mo
+share/locale/sv/LC_MESSAGES/tilix.mo
+share/locale/tr/LC_MESSAGES/tilix.mo
+share/locale/uk/LC_MESSAGES/tilix.mo
+share/locale/vi/LC_MESSAGES/tilix.mo
+share/locale/zh_CN/LC_MESSAGES/tilix.mo
+share/locale/zh_TW/LC_MESSAGES/tilix.mo
 share/nautilus-python/extensions/open-tilix.py
 %%DATADIR%%/resources/tilix.gresource
 %%DATADIR%%/schemes/base16-twilight-dark.json