From 0fb25e09498a5c05e23832fc49fda9f660fcb30f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:04:46 -0700 Subject: [PATCH] gnome-font-viewer: update to 42.0 --- .../patches/meson-0.61.patch | 40 ------------------- srcpkgs/gnome-font-viewer/template | 8 ++-- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch deleted file mode 100644 index 072ce27fd0d..00000000000 --- a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001 -From: r-value -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 - diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index f4d7f69436e..bdc99f9a8d8 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -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 " 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