From nobody Sat Apr 22 09:38:44 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3RD52ZGhz46Txw; Sat, 22 Apr 2023 09:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q3RD506rSz4PxN; Sat, 22 Apr 2023 09:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682156325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ll+OkVFn4pDsIC9QdyKEV1ylDDKoLwvYfU8IdrdFq6g=; b=p097TkeIwEO8C0qfY15nr3ErgPfqA7eSQYUAa+EeZ+jI/7gxDKTZLF/ejIeXakATzcMrAo w4va1seuQzLcHpXMESfoD6VSAwkTMbvtgldNTdiJR5wAPgN8kedxmBuDnKQyKfovZpMSUe zOVGrTBTh/DoyB0s931u3bo9kKdrwM8w5ewSVbimuIZdUjhMTpLzMypoJ+ELIm04Y8YFT9 cAfRmtbCs7UiO9D3oxmgXQLZn76yRyZr0H9EggCktYWMuZ7NznMkiYNYrEGAwi2idJY6zH hWZqe2bgG5wOdkMKJWHxsBxLYBkLz+H/+9a8wnrS2WDTnkewD2xdJJAUoQEnBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682156325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ll+OkVFn4pDsIC9QdyKEV1ylDDKoLwvYfU8IdrdFq6g=; b=Mlb0N/ffRixbR2HPqXpzOoyFrzEhrTdi2kgEjqqBVj3ABux7xAdeDBvmQm/z0SACY6gba3 ti2sydeq8asqyU1YiO+R1rFgYaqzbU9Y2HEEAQpmfJkEoNFxn10UaHI9A3+ng9si20ex44 CjPiNbh+4KP6nqL8NgvSJ/mcpER2sQKKTNYBI5qdFFnzEjvw8bRXcswx8uQ8JV2ngNzgim /ZiSUHYwVy9qKYKp+jgxEdctkCL2pLASGU13qRZBzF35p3s+tAGvyOFZ7jcks/50X4GgO0 r7IBbhePEEn5AUzs7FBQ68EUQBUM2g6tLLaBtaD3aGtQ3b+VsX4Rgz/7Gv0u8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682156325; a=rsa-sha256; cv=none; b=WplNyQNBhbDHxWZhreMf8NEoc+ZRpa7v21tYA55XI6nQBRK+fQOY/xWa+nrASXfX4omuNt Sr4mXXXq7U8Wy3dNIhilvM40IdNTXfZi61d76f8o9YHU2qo78fo0QTZ5/vsetD5S2J5QW8 PyWXRWDSbCkQ2Bvlrn85hLDGjpXAhzJfO8fiDgSkh6f0Z+ADX9vEWYBPutljuGhMk9QFjV pl6kzHY/SKQDqN49n0qE213+1L/XZQA6ASbDG0fMfKDOUrP/zNOq/tuBuE2EPqob4XSG5f 0n8W4ar2FzNX0CCEcfNpLkVMzmpjMIEu4HTOREZ7jvezH+4veZPPp6iH8g3xJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3RD44sJMzx8v; Sat, 22 Apr 2023 09:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33M9ciK9029936; Sat, 22 Apr 2023 09:38:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33M9ci3H029935; Sat, 22 Apr 2023 09:38:44 GMT (envelope-from git) Date: Sat, 22 Apr 2023 09:38:44 GMT Message-Id: <202304220938.33M9ci3H029935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: 0cfd877749dd - main - x11/tilix: Update to 1.9.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cfd877749dd91f983301016775bc26e999ade1f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cfd877749dd91f983301016775bc26e999ade1f commit 0cfd877749dd91f983301016775bc26e999ade1f Author: Romain Tartière AuthorDate: 2023-04-22 09:05:02 +0000 Commit: Romain Tartière CommitDate: 2023-04-22 09:38:01 +0000 x11/tilix: Update to 1.9.5 --- x11/tilix/Makefile | 6 ++-- x11/tilix/distinfo | 8 +++-- x11/tilix/files/patch-data_meson.build | 36 ++++------------------ x11/tilix/files/patch-meson.build | 30 ++++++++++++++++++ .../patch-source_gx_tilix_prefeditor_prefdialog.d | 11 +++++++ x11/tilix/pkg-plist | 21 +++++++++++++ 6 files changed, 76 insertions(+), 36 deletions(-) diff --git a/x11/tilix/Makefile b/x11/tilix/Makefile index 54ccacf160f0..892264d254b9 100644 --- a/x11/tilix/Makefile +++ b/x11/tilix/Makefile @@ -1,6 +1,5 @@ PORTNAME= tilix -PORTVERSION= 1.9.4 -PORTREVISION= 2 +PORTVERSION= 1.9.5 CATEGORIES= x11 MAINTAINER= romain@FreeBSD.org @@ -12,13 +11,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ po4a-translate:textproc/po4a \ + ${LOCALBASE}/libdata/pkgconfig/undead.pc:devel/undead \ ${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= gettext gnome meson pkgconfig shebangfix +USES= desktop-file-utils gettext gnome meson pkgconfig shebangfix USE_GITHUB= yes GH_ACCOUNT= gnunn1 USE_GNOME= cairo gdkpixbuf2 librsvg2 vte3 diff --git a/x11/tilix/distinfo b/x11/tilix/distinfo index 55feb9ed194b..66fc2d98adbb 100644 --- a/x11/tilix/distinfo +++ b/x11/tilix/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1640633390 -SHA256 (gnunn1-tilix-1.9.4_GH0.tar.gz) = 2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b -SIZE (gnunn1-tilix-1.9.4_GH0.tar.gz) = 968142 +TIMESTAMP = 1682131118 +SHA256 (gnunn1-tilix-1.9.5_GH0.tar.gz) = e25335a3f7ab06779b957d08ffaf7698c966c3b5179d002f82ce41c692fc0b89 +SIZE (gnunn1-tilix-1.9.5_GH0.tar.gz) = 1005604 +SHA256 (2101.diff) = a9fdc841f9f98a75b6e09ec007556c7e3c074eb24c2cb397a234dd69666bc488 +SIZE (2101.diff) = 2169 diff --git a/x11/tilix/files/patch-data_meson.build b/x11/tilix/files/patch-data_meson.build index 9ee96ba411a5..8d0e2056d170 100644 --- a/x11/tilix/files/patch-data_meson.build +++ b/x11/tilix/files/patch-data_meson.build @@ -1,47 +1,23 @@ https://github.com/gnunn1/tilix/pull/2074 https://github.com/gnunn1/tilix/pull/2081 ---- data/meson.build.orig 2021-12-27 19:49:46 UTC +--- data/meson.build.orig 2023-04-22 01:48:27 UTC +++ data/meson.build -@@ -11,7 +11,6 @@ install_data( - - # Install the desktop file - desktop_file = i18n.merge_file( -- '@0@.desktop'.format(project_id), - output: '@BASENAME@', - input: 'pkg/desktop/@0@.desktop.in'.format(project_id), - po_dir: meson.source_root() / 'po', -@@ -35,25 +34,24 @@ endif +@@ -32,7 +32,8 @@ 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', + 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( -- tilix_metainfo_name, -+ # Install the MetaInfo file -+ metainfo_file = i18n.merge_file( - output: tilix_metainfo_name, - input: metainfo_with_releases, - po_dir: meson.source_root() / 'po', - install: true, - install_dir: datadir / 'metainfo' --) -+ ) +@@ -49,7 +50,6 @@ metainfo_file = i18n.merge_file( + ) --# Validate MetaInfo file + # Validate MetaInfo file -if appstreamcli.found() -+ # Validate MetaInfo file test ( 'Validate metainfo file', appstreamcli, diff --git a/x11/tilix/files/patch-meson.build b/x11/tilix/files/patch-meson.build new file mode 100644 index 000000000000..d3a5179abef4 --- /dev/null +++ b/x11/tilix/files/patch-meson.build @@ -0,0 +1,30 @@ +--- meson.build.orig 2022-02-22 16:31:19 UTC ++++ meson.build +@@ -101,6 +101,7 @@ vted_dep = dependency('vted-3', version: '>=3.8.5') + xlib_dep = dependency('x11') + libunwind_dep = dependency('libunwind') + libsecret_dep = dependency('libsecret-1', required: false) ++undead_dep = dependency('undead', version: '>=1.0.9') + + subdir('po') + subdir('data') +@@ -113,7 +114,8 @@ executable('tilix', + vted_dep, + xlib_dep, + libunwind_dep, +- libsecret_dep], ++ libsecret_dep, ++ undead_dep], + d_args: d_extra_args, + d_module_versions: ['StdLoggerDisableTrace'], + link_args: d_link_args, +@@ -125,7 +127,8 @@ tilix_test_exe = executable('tilix_test', + include_directories : [sources_dir], + dependencies : [gtkd_dep, + vted_dep, +- xlib_dep], ++ xlib_dep, ++ undead_dep], + d_args: d_extra_args, + link_args: d_link_args, + d_unittest: true diff --git a/x11/tilix/files/patch-source_gx_tilix_prefeditor_prefdialog.d b/x11/tilix/files/patch-source_gx_tilix_prefeditor_prefdialog.d new file mode 100644 index 000000000000..0b080a45e80c --- /dev/null +++ b/x11/tilix/files/patch-source_gx_tilix_prefeditor_prefdialog.d @@ -0,0 +1,11 @@ +--- source/gx/tilix/prefeditor/prefdialog.d.orig 2023-04-22 04:00:09 UTC ++++ source/gx/tilix/prefeditor/prefdialog.d +@@ -957,7 +957,7 @@ class ShortcutPreferences : Box { (private) + return; + } + +- import std.xml: DocumentParser, ElementParser, Element, XMLException; ++ import undead.xml: DocumentParser, ElementParser, Element, XMLException; + + try { + DocumentParser parser = new DocumentParser(ui); diff --git a/x11/tilix/pkg-plist b/x11/tilix/pkg-plist index 676ad4d6609d..9fb28205f943 100644 --- a/x11/tilix/pkg-plist +++ b/x11/tilix/pkg-plist @@ -1,5 +1,26 @@ bin/tilix man/man1/tilix.1.gz +man/ca/man1/tilix.1.gz +man/cs/man1/tilix.1.gz +man/de/man1/tilix.1.gz +man/en_GB/man1/tilix.1.gz +man/es/man1/tilix.1.gz +man/fr/man1/tilix.1.gz +man/hr/man1/tilix.1.gz +man/it/man1/tilix.1.gz +man/nb_NO/man1/tilix.1.gz +man/nl/man1/tilix.1.gz +man/oc/man1/tilix.1.gz +man/pl/man1/tilix.1.gz +man/pt/man1/tilix.1.gz +man/pt_BR/man1/tilix.1.gz +man/pt_PT/man1/tilix.1.gz +man/ro/man1/tilix.1.gz +man/ru/man1/tilix.1.gz +man/sr/man1/tilix.1.gz +man/tr/man1/tilix.1.gz +man/uk/man1/tilix.1.gz +man/zh_Hant/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.svg