Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gnome-boxes for openSUSE:Factory 
checked in at 2022-02-11 23:07:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-boxes (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-boxes.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-boxes"

Fri Feb 11 23:07:34 2022 rev:87 rq:953320 version:41.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-boxes/gnome-boxes.changes  2022-01-22 
08:19:09.198511909 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-boxes.new.1956/gnome-boxes.changes        
2022-02-11 23:09:08.614899821 +0100
@@ -1,0 +2,6 @@
+Wed Feb  2 15:12:48 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add fd0acfbe79444687c73dea182c2d1a5fa1c77324.patch: Fix build
+  with meson 0.60 and newer.
+
+-------------------------------------------------------------------

New:
----
  fd0acfbe79444687c73dea182c2d1a5fa1c77324.patch

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

Other differences:
------------------
++++++ gnome-boxes.spec ++++++
--- /var/tmp/diff_new_pack.UmRjzb/_old  2022-02-11 23:09:09.078901164 +0100
+++ /var/tmp/diff_new_pack.UmRjzb/_new  2022-02-11 23:09:09.082901175 +0100
@@ -29,9 +29,11 @@
 Group:          System/GUI/GNOME
 URL:            https://wiki.gnome.org/Design/Apps/Boxes
 Source0:        
https://download.gnome.org/sources/gnome-boxes/41/%{name}-%{version}.tar.xz
-
 # PATCH-FEATURE-UPSTREAM -- Ensure Tumbleweed is listed as recommended 
distribution
 Patch0:         gnome-boxes-opensuse.patch
+# PATCH-FIX-UPSTREAM fd0acfbe79444687c73dea182c2d1a5fa1c77324.patch -- Fix 
build with meson 0.60 and newer
+Patch1:         
https://gitlab.gnome.org/GNOME/gnome-boxes/-/commit/fd0acfbe79444687c73dea182c2d1a5fa1c77324.patch
+
 BuildRequires:  fdupes
 BuildRequires:  meson >= 0.50.0
 BuildRequires:  pkgconfig

++++++ fd0acfbe79444687c73dea182c2d1a5fa1c77324.patch ++++++
>From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <mic...@vasilek.cz>
Date: Sat, 15 Jan 2022 00:07:31 +0100
Subject: [PATCH] build: remove positional i18n.merge_file arguments

otherwise building with meson 0.61+ fails:

    ERROR: Function does not take positional arguments.
---
 data/meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index d32638a8..2dc1798b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
 desktop_conf = configuration_data ()
 desktop_conf.set ('icon', application_id)
 desktop = i18n.merge_file (
-  'desktop',
   input: configure_file (
     input: files ('org.gnome.Boxes.desktop.in'),
     output: 'org.gnome.Boxes.desktop.in',
@@ -65,7 +64,7 @@ configure_file (
 
 appdata_conf = configuration_data()
 appdata_conf.set('appid', application_id)
-appdata_file = i18n.merge_file ('appdata-file',
+appdata_file = i18n.merge_file (
   input: configure_file (
     input: files ('org.gnome.Boxes.appdata.xml.in'),
     output: 'org.gnome.Boxes.appdata.xml.in',
-- 
GitLab

Reply via email to