gnome-font-viewer: update to 42.0
This commit is contained in:
parent
ee13a64df6
commit
0fb25e0949
|
@ -1,40 +0,0 @@
|
|||
From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001
|
||||
From: r-value <i@rvalue.moe>
|
||||
Date: Thu, 30 Dec 2021 17:14:47 +0800
|
||||
Subject: [PATCH] Fix meson build with meson 0.60.0+
|
||||
|
||||
`i18n.merge_file` has been ignoring positional arguments for a time
|
||||
and explicitly rejects with error since meson 0.60.0
|
||||
---
|
||||
data/meson.build | 2 +-
|
||||
src/meson.build | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index bfc9caa..8e42134 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -1,6 +1,6 @@
|
||||
appdatadir = join_paths(datadir, 'metainfo')
|
||||
appdata_file = 'org.gnome.font-viewer.appdata.xml'
|
||||
-merged_appdata = i18n.merge_file(appdata_file,
|
||||
+merged_appdata = i18n.merge_file(
|
||||
input: appdata_file + '.in',
|
||||
output: appdata_file,
|
||||
po_dir: '../po',
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index f863d45..826c59b 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
|
||||
desktop_conf = configuration_data()
|
||||
desktop_conf.set('VERSION', meson.project_version())
|
||||
desktop_conf.set('APPLICATION_ID', application_id)
|
||||
-i18n.merge_file(desktop_file,
|
||||
+i18n.merge_file(
|
||||
input: configure_file(input: desktop_file + '.in.in',
|
||||
output: desktop_file + '.in',
|
||||
configuration: desktop_conf),
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
# Template file for 'gnome-font-viewer'
|
||||
pkgname=gnome-font-viewer
|
||||
version=41.0
|
||||
version=42.0
|
||||
revision=1
|
||||
build_style=meson
|
||||
hostmakedepends="pkg-config glib-devel gettext"
|
||||
makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
|
||||
gnome-desktop-devel harfbuzz-devel libhandy1-devel"
|
||||
makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
|
||||
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
|
||||
depends="desktop-file-utils"
|
||||
short_desc="Font viewer for GNOME"
|
||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
|
||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||
checksum=5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876
|
||||
checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
|
||||
|
|
Loading…
Reference in New Issue