rpm/polari
SHA256
1
0
Fork 0
forked from pool/polari
Code Pull Requests Activity

Accepting request 951409 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/951409
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polari?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2022-02-06 22:53:42 +00:00 committed by Git OBS Bridge
commit 2e38ea6a73
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch Normal file
View File

@ -0,0 +1,43 @@
From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 12:32:00 +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/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
data/meson.build:5:0: ERROR: Function does not take positional arguments.
Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
---
data/appdata/meson.build | 2 +-
data/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 88b4a0be..781ba22f 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -1,5 +1,5 @@
appdata_name = app_id + '.appdata.xml'
-appdata = i18n.merge_file(appdata_name,
+appdata = i18n.merge_file(
input: appdata_name + '.in',
output: appdata_name,
po_dir: '../../po',
diff --git a/data/meson.build b/data/meson.build
index cedfd57b..655ae700 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,7 @@ subdir('appdata')
subdir('icons')
desktop_filename = app_id + '.desktop'
-desktop_file = i18n.merge_file(desktop_filename,
+desktop_file = i18n.merge_file(
input: desktop_filename + '.in',
output: desktop_filename,
po_dir: '../po',
--
GitLab

6
polari.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 1 12:31:32 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch: Fix build
with meson 0.61.0 and newer.
-------------------------------------------------------------------
Tue Sep 21 10:54:20 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

4
polari.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package polari
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2013 Dominique Leuenberger, Amsterdam, The Netherlands
#
# All modifications and additions to the file contributed by third parties
@ -28,6 +28,8 @@ Source0: https://download.gnome.org/sources/polari/41/%{name}-%{version}.
Source99: polari-rpmlintrc
# PATCH-FIX-UPSTREAM polari-fix-nb-translation.patch glgo#GNOME/polari!145 -- Fix Norwegian bokmål translation
Patch0: polari-fix-nb-translation.patch
# PATCH-FIX-UPSTREAM 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch -- Fix build with meson 0.61.0 and newer
Patch1: https://gitlab.gnome.org/GNOME/polari/-/commit/0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d.patch
BuildRequires: gjs >= 1.57.3
BuildRequires: meson >= 0.53.0