Accepting request 950551 from GNOME:Next

Mesonfix

OBS-URL: https://build.opensuse.org/request/show/950551
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-calendar?expand=0&rev=100
This commit is contained in:
Bjørn Lie 2022-02-03 21:50:21 +00:00 committed by Git OBS Bridge
parent be6e8704ee
commit 032a43a929
3 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Fri, 21 Jan 2022 21:18:39 +0100
Subject: [PATCH] meson.build: fix meson 0.61 builds
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
data/appdata/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index b5ee6540..200c3507 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -1,7 +1,6 @@
appdata_conf = configuration_data()
appdata_conf.set('appid', application_id)
appdata = i18n.merge_file(
- 'appdata',
input: configure_file(
input: files('org.gnome.Calendar.appdata.xml.in.in'),
output: 'org.gnome.Calendar.appdata.xml.in',
--
GitLab

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 1 20:51:58 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch: Fix build
with meson 0.61.0 and newer.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 10 21:29:43 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com> Fri Dec 10 21:29:43 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package gnome-calendar # spec file for package gnome-calendar
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -24,6 +24,8 @@ License: GPL-3.0-or-later
Group: Productivity/Office/Organizers Group: Productivity/Office/Organizers
URL: https://wiki.gnome.org/Design/Apps/Calendar URL: https://wiki.gnome.org/Design/Apps/Calendar
Source0: https://download.gnome.org/sources/gnome-calendar/41/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/gnome-calendar/41/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch -- Fix build with meson 0.61.0 and newer
Patch0: https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: meson BuildRequires: meson