Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tilix for openSUSE:Factory checked in at 2022-02-21 17:46:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tilix (Old) and /work/SRC/openSUSE:Factory/.tilix.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tilix" Mon Feb 21 17:46:54 2022 rev:24 rq:956490 version:1.9.4 Changes: -------- --- /work/SRC/openSUSE:Factory/tilix/tilix.changes 2021-03-07 15:19:54.732568881 +0100 +++ /work/SRC/openSUSE:Factory/.tilix.new.1958/tilix.changes 2022-02-21 17:49:08.435639398 +0100 @@ -1,0 +2,5 @@ +Mon Feb 21 12:35:35 UTC 2022 - Dominique Leuenberger <dims...@opensuse.org> + +- Add 2081.patch: Fix build using Meson 0.61+. + +------------------------------------------------------------------- New: ---- 2081.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tilix.spec ++++++ --- /var/tmp/diff_new_pack.gVFdF7/_old 2022-02-21 17:49:08.987639562 +0100 +++ /var/tmp/diff_new_pack.gVFdF7/_new 2022-02-21 17:49:08.991639563 +0100 @@ -1,7 +1,7 @@ # # spec file for package tilix # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Version: 1.9.4 Release: 0 Summary: A tiling terminal emulator based on GTK+ 3 -License: MPL-2.0 AND LGPL-3.0-only +License: LGPL-3.0-only AND MPL-2.0 URL: https://github.com/gnunn1/tilix Source0: https://github.com/gnunn1/tilix/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz %if 0%{?suse_version} < 1550 @@ -36,6 +36,8 @@ # PATCH-FIX-OPENSUSE 0001-Don-t-generate-appstream-meta-data-on-older-versions.patch -- Provide appdata.xml instead of generating one since we have to old version of appstream in Leap releases Patch2: 0001-Don-t-generate-appstream-meta-data-on-older-versions.patch %endif +# PATCH-FIX-UPSTREAM 2081.patch -- Fix build with Meson 0.61+ +Patch3: https://patch-diff.githubusercontent.com/raw/gnunn1/tilix/pull/2081.patch BuildRequires: AppStream BuildRequires: appstream-glib BuildRequires: desktop-file-utils ++++++ 2081.patch ++++++ >From 1cde3d50f2830bc17abab72a2df982de56571b8b Mon Sep 17 00:00:00 2001 From: Jan Beich <jbe...@freebsd.org> Date: Sun, 23 Jan 2022 09:05:30 +0000 Subject: [PATCH] meson: drop unused argument for i18n.merge_file() Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. data/meson.build:13:0: ERROR: Function does not take positional arguments. data/meson.build:46:0: ERROR: Function does not take positional arguments. --- data/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index 81e9b410..c8b23e1b 100644 --- a/data/meson.build +++ b/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', @@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge', # 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',
