Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package d-feet for openSUSE:Factory checked 
in at 2022-02-02 22:41:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/d-feet (Old)
 and      /work/SRC/openSUSE:Factory/.d-feet.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "d-feet"

Wed Feb  2 22:41:58 2022 rev:43 rq:950785 version:0.3.16

Changes:
--------
--- /work/SRC/openSUSE:Factory/d-feet/d-feet.changes    2021-05-19 
17:49:14.569569182 +0200
+++ /work/SRC/openSUSE:Factory/.d-feet.new.1898/d-feet.changes  2022-02-02 
22:42:59.994886767 +0100
@@ -1,0 +2,5 @@
+Tue Feb  1 16:05:13 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Add 32.patch: Fix build with meson 0.60.0 and newer.
+
+-------------------------------------------------------------------

New:
----
  32.patch

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

Other differences:
------------------
++++++ d-feet.spec ++++++
--- /var/tmp/diff_new_pack.Bp5aaR/_old  2022-02-02 22:43:00.562882917 +0100
+++ /var/tmp/diff_new_pack.Bp5aaR/_new  2022-02-02 22:43:00.570882862 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package d-feet
 #
-# 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
@@ -24,6 +24,8 @@
 Group:          Development/Tools/Debuggers
 URL:            http://live.gnome.org/DFeet/
 Source0:        
https://download.gnome.org/sources/d-feet/0.3/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 32.patch -- Fix build with meson 0.60.0 and newer
+Patch0:         https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32.patch
 
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
@@ -45,7 +47,7 @@
 %lang_package
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 export PYTHON=%{_bindir}/python3

++++++ 32.patch ++++++
>From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
From: Jan Beich <[email protected]>
Date: Mon, 24 Jan 2022 12:11:57 +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:15:0: ERROR: Function does not take positional arguments.
data/meson.build:27: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 026bd80..3b03b94 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,7 +13,6 @@ desktop_in = configure_file(
 )
 
 i18n.merge_file(
-  desktop,
   type: 'desktop',
   input: desktop_in,
   output: '@BASENAME@',
@@ -25,7 +24,6 @@ i18n.merge_file(
 appdata = df_namespace + '.appdata.xml'
 
 i18n.merge_file(
-  appdata,
   input: appdata + '.in',
   output: '@BASENAME@',
   po_dir: po_dir,
-- 
GitLab

Reply via email to