Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2022-02-04 21:49:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Fri Feb 4 21:49:02 2022 rev:76 rq:951407 version:3.21.1 Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2022-01-08 23:24:08.278257050 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new.1898/meld.changes 2022-02-04 21:52:09.651248941 +0100 @@ -1,0 +2,15 @@ +Wed Feb 2 18:52:53 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add cc7746c141d976a4779cf868774fae1fe7627a6d.patch: Fix build + with meson 0.61 and newer. +- Add appstream-glib and desktop-file-utils BuildRequires and add a + check section, manually verifiy metainfo and desktop file during + build, upstream does not yet provide a automated meson_test for + this. +- Drop update-desktop-files BuildRequires and macro, no longer + needed. +- Drop obsolete conditional shared-mime-info BuildRequires and + glib2_gsettings_schema_requires macro, only needed for long out + of support versions of openSUSE. + +------------------------------------------------------------------- New: ---- cc7746c141d976a4779cf868774fae1fe7627a6d.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.J1GYej/_old 2022-02-04 21:52:10.111245772 +0100 +++ /var/tmp/diff_new_pack.J1GYej/_new 2022-02-04 21:52:10.115245744 +0100 @@ -24,13 +24,16 @@ Group: Development/Tools/Other URL: http://meldmerge.org/ Source0: https://download.gnome.org/sources/meld/3.21/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM cc7746c141d976a4779cf868774fae1fe7627a6d.patch -- Fix build with meson 0.61 and newer +Patch0: https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch +BuildRequires: appstream-glib +BuildRequires: desktop-file-utils BuildRequires: fdupes # Needed for typelib() Requires BuildRequires: gobject-introspection-devel BuildRequires: itstool BuildRequires: meson >= 0.49.0 -BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.0 @@ -57,11 +60,6 @@ Suggests: tla # BuildArch: noarch -%if 0%{?suse_version} < 1330 -# Needed for shared-mime-info macros -BuildRequires: shared-mime-info -%glib2_gsettings_schema_requires -%endif %description Meld is a visual diff and merge tool. Two or three files can be @@ -83,15 +81,17 @@ %install %meson_install %find_lang %{name} %{?no_lang_C} -%suse_update_desktop_file org.gnome.Meld IDE %fdupes %{buildroot}%{_datadir} +%check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Meld.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Meld.desktop + %files %license COPYING %doc NEWS %{_bindir}/%{name} %{_datadir}/%{name}/ -%dir %{_datadir}/metainfo/ %{_datadir}/metainfo/org.gnome.Meld.appdata.xml %{_datadir}/applications/org.gnome.Meld.desktop %{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml ++++++ cc7746c141d976a4779cf868774fae1fe7627a6d.patch ++++++ >From cc7746c141d976a4779cf868774fae1fe7627a6d Mon Sep 17 00:00:00 2001 From: Silvio Fricke <silvio.fri...@gmail.com> Date: Thu, 13 Jan 2022 16:06:58 +0100 Subject: [PATCH] build: fix i18n usage on data/meson.build for meson 0.61.0 With the latest meson the code doesn't compile anymore and reports an error: meld/data/meson.build:34:0: ERROR: Function does not take positional arguments. This patch tries to fix that problem. Close #645 Signed-off-by: Silvio Fricke <silvio.fri...@gmail.com> --- data/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/data/meson.build b/data/meson.build index 01949188..de099d3b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -32,7 +32,6 @@ if desktop_file_validate.found() endif appdata_file = i18n.merge_file( - 'appdata', input: configure_file( input: files('org.gnome.meld.appdata.xml.in.in'), output: 'org.gnome.meld.appdata.xml.in', -- GitLab
