From 948b07310fee096f8b7771b18a222bd7b1bbf3c397240a0ba03f28b9716d8e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 3 Feb 2022 21:53:24 +0000 Subject: [PATCH] Accepting request 950878 from GNOME:Next Mesonfix OBS-URL: https://build.opensuse.org/request/show/950878 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=195 --- ...d758f866d3a3f7ca482942beee749f13a91e.patch | 25 +++++++++++++++++++ gnome-bluetooth.changes | 6 +++++ gnome-bluetooth.spec | 4 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 755fd758f866d3a3f7ca482942beee749f13a91e.patch diff --git a/755fd758f866d3a3f7ca482942beee749f13a91e.patch b/755fd758f866d3a3f7ca482942beee749f13a91e.patch new file mode 100644 index 0000000..6e86fd5 --- /dev/null +++ b/755fd758f866d3a3f7ca482942beee749f13a91e.patch @@ -0,0 +1,25 @@ +From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 7 Jan 2022 12:51:22 +0100 +Subject: [PATCH] build: Fix build for newer versions of meson + +sendto/meson.build:24:5: ERROR: Function does not take positional arguments. +--- + sendto/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sendto/meson.build b/sendto/meson.build +index 24a4e394..3e233a03 100644 +--- a/sendto/meson.build ++++ b/sendto/meson.build +@@ -22,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 1ebb20e..690ffdf 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 3 06:00:59 UTC 2022 - Bjørn Lie + +- Add 755fd758f866d3a3f7ca482942beee749f13a91e.patch Fix build with + meson 0.61 and newer. + ------------------------------------------------------------------- Sat Nov 6 11:15:24 UTC 2021 - Bjørn Lie diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 45335d2..f34404e 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-bluetooth # -# 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 @@ -25,6 +25,8 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Projects/GnomeBluetooth Source0: https://download.gnome.org/sources/gnome-bluetooth/3.34/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 755fd758f866d3a3f7ca482942beee749f13a91e.patch -- Fix build with meson 0.61 and newer +Patch0: https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel