Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gitg for openSUSE:Factory checked in at 2022-02-04 21:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gitg (Old) and /work/SRC/openSUSE:Factory/.gitg.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gitg" Fri Feb 4 21:49:09 2022 rev:58 rq:951426 version:41 Changes: -------- --- /work/SRC/openSUSE:Factory/gitg/gitg.changes 2021-12-29 21:11:31.106313239 +0100 +++ /work/SRC/openSUSE:Factory/.gitg.new.1898/gitg.changes 2022-02-04 21:52:19.635180193 +0100 @@ -1,0 +2,9 @@ +Wed Feb 2 09:53:32 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add 1978973b12848741b08695ec2020bac98584d636.patch: Fix build + with meson 0.61.0 and newer. +- Update our Supplements to current standard. +- Drop update-desktop-files BuildRequires and macro, no longer + needed. + +------------------------------------------------------------------- New: ---- 1978973b12848741b08695ec2020bac98584d636.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gitg.spec ++++++ --- /var/tmp/diff_new_pack.aNHrLz/_old 2022-02-04 21:52:20.231176093 +0100 +++ /var/tmp/diff_new_pack.aNHrLz/_new 2022-02-04 21:52:20.235176066 +0100 @@ -1,7 +1,7 @@ # # spec file for package gitg # -# 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 @@ -27,11 +27,12 @@ # PATCH-FIX-OPENSUSE gitg-typelib-dependencies.patch [email protected] -- Change the way we add library dependencies to .typelibs. openSUSE requires a full library name, incl. version Patch0: gitg-typelib-dependencies.patch +# PATCH-FIX-UPSTREAM 1978973b12848741b08695ec2020bac98584d636.patch -- Fix build with meson 0.61.0 and newer +Patch1: https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636.patch BuildRequires: fdupes BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: vala BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(gladeui-2.0) >= 3.2 @@ -103,7 +104,7 @@ Group: Development/Tools/GUI Builders Requires: glade Requires: libgitg-1_0-0 = %{version} -Supplements: packageand(glade:%{name}-devel) +Supplements: (glade and %{name}-devel) %description -n glade-catalog-gitg gitg is a GitX clone for GNOME/gtk+. It aims at being a small, fast and @@ -152,7 +153,6 @@ %install %meson_install -%suse_update_desktop_file -G "Git repository viewer" org.gnome.gitg RevisionControl %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} ++++++ 1978973b12848741b08695ec2020bac98584d636.patch ++++++ >From 1978973b12848741b08695ec2020bac98584d636 Mon Sep 17 00:00:00 2001 From: Jan Beich <[email protected]> Date: Mon, 24 Jan 2022 12:17:52 +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:8:0: ERROR: Function does not take positional arguments. data/meson.build:44: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 a8b90fd1..2413531d 100644 --- a/data/meson.build +++ b/data/meson.build @@ -6,7 +6,6 @@ desktop_config = configuration_data() desktop_config.set('icon', application_id) desktop_config.set('binary', gitg_name) i18n.merge_file( - desktop, type: 'desktop', input: configure_file( input: desktop + '.in.in', @@ -42,7 +41,6 @@ appdata_config = configuration_data() appdata_config.set('app-id', application_id) appdata_config.set('gettext', gitg_name) i18n.merge_file( - appdata, type: 'xml', input: configure_file( input: appdata + '.in.in', -- GitLab
