Backported patch can go
GNOME Font Viewer - 42.0
-------------------------------------------------------------------------------
Translation updates
GNOME Font Viewer - 42.rc
-------------------------------------------------------------------------------
Translation updates
GNOME Font Viewer - 42.beta
-------------------------------------------------------------------------------
Fonts 42.beta comes with a port to GTK4 by Evan Welsh,
and translation updates
GNOME Font Viewer - 42.alpha
-------------------------------------------------------------------------------
Translation updates
Signed-off-by: Andreas Müller <schnitzelt...@gmail.com>
---
...01-Fix-meson-build-with-meson-0.60.0.patch | 40 -------------------
...ewer_41.0.bb => gnome-font-viewer_42.0.bb} | 7 ++--
2 files changed, 3 insertions(+), 44 deletions(-)
delete mode 100644
meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch
rename meta-gnome/recipes-gnome/gnome-font-viewer/{gnome-font-viewer_41.0.bb
=> gnome-font-viewer_42.0.bb} (69%)
diff --git
a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch
b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch
deleted file mode 100644
index f32e120c1..000000000
---
a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9c5ce6836498fdb057a7f865f516ce28609f542a 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
-
-Upstrean-Status: Backport
-Signed-off-by: Alexander Kanavin <a...@linutronix.de>
----
- 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),
diff --git
a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb
b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb
similarity index 69%
rename from meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb
rename to meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb
index 2e2927f1c..c14e57c7c 100644
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SECTION = "x11/gnome"
DEPENDS = " \
- gtk+3 \
+ gtk4 \
gnome-desktop \
- libhandy \
+ libadwaita \
"
GNOMEBASEBUILDCLASS = "meson"
@@ -16,8 +16,7 @@ inherit gnomebase gtk-icon-cache gettext features_check
mime-xdg
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI += " file://0001-Fix-meson-build-with-meson-0.60.0.patch"
-SRC_URI[archive.sha256sum] =
"5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876"
+SRC_URI[archive.sha256sum] =
"cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc"
FILES:${PN} += " \
${datadir}/dbus-1 \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96365):
https://lists.openembedded.org/g/openembedded-devel/message/96365
Mute This Topic: https://lists.openembedded.org/mt/90224170/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
