Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gnome-music for openSUSE:Factory 
checked in at 2022-02-06 23:53:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-music (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-music.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-music"

Sun Feb  6 23:53:47 2022 rev:65 rq:951419 version:41.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-music/gnome-music.changes  2021-11-24 
23:54:25.396488938 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-music.new.1898/gnome-music.changes        
2022-02-06 23:54:48.838606578 +0100
@@ -1,0 +2,6 @@
+Tue Feb  1 20:08:08 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add d9f35b542adbf6b0e1114c7c077df04212a98fc7.patch: Fix build
+  with meson 0.61.0 and newer.
+
+-------------------------------------------------------------------

New:
----
  d9f35b542adbf6b0e1114c7c077df04212a98fc7.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-music.spec ++++++
--- /var/tmp/diff_new_pack.TYDL63/_old  2022-02-06 23:54:49.338603196 +0100
+++ /var/tmp/diff_new_pack.TYDL63/_new  2022-02-06 23:54:49.346603142 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-music
 #
-# 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
@@ -30,6 +30,8 @@
 Patch0:         0001-gnome-music-use-python36.patch
 #PATCH-FIX-SLE  0002-gnome-music-revert-from-future-import-annotations.patch 
yfji...@suse.com -- disable python 3.7 specific feature to allow gnome-music 
build and run on python 3.6 for SLE/Leap 15.4.
 Patch1:         0002-gnome-music-revert-from-future-import-annotations.patch
+# PATCH-FIX-UPSTREAM d9f35b542adbf6b0e1114c7c077df04212a98fc7.patch -- Fix 
build with meson 0.61.0 and newer
+Patch2:         
https://gitlab.gnome.org/GNOME/gnome-music/-/commit/d9f35b542adbf6b0e1114c7c077df04212a98fc7.patch
 
 BuildRequires:  fdupes
 BuildRequires:  itstool
@@ -85,6 +87,7 @@
 %patch0 -p1
 %patch1 -p1
 %endif
+%patch2 -p1
 # Fix shebangs:
 sed -i -e 's|#!%{_bindir}/env python3|#!%{_bindir}/python3|' gnome-music.in
 

++++++ d9f35b542adbf6b0e1114c7c077df04212a98fc7.patch ++++++
>From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001
From: Jean Felder <jfel...@src.gnome.org>
Date: Thu, 18 Nov 2021 12:09:26 +0100
Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument

The positional argument was being silently ignored until meson 0.60.0
where it returns a deprecation message:
"DEPRECATION: i18n.merge_file does not take any positional
arguments. This will become a hard error in the next Meson release."

See: https://github.com/mesonbuild/meson/issues/9441
---
 data/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/meson.build b/data/meson.build
index 25ff1e102..145ee5221 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
 appdata_conf.set('package_url', PACKAGE_URL)
 appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
 i18n.merge_file(
-  'appdata',
   input: configure_file(
     output: PROJECT_RDNN_NAME + '.appdata.xml.in',
     input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
-- 
GitLab

Reply via email to