diff options
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch | 40 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb (renamed from meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb) | 7 |
2 files changed, 3 insertions, 44 deletions
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 @@ | |||
1 | From 9c5ce6836498fdb057a7f865f516ce28609f542a Mon Sep 17 00:00:00 2001 | ||
2 | From: r-value <i@rvalue.moe> | ||
3 | Date: Thu, 30 Dec 2021 17:14:47 +0800 | ||
4 | Subject: [PATCH] Fix meson build with meson 0.60.0+ | ||
5 | |||
6 | `i18n.merge_file` has been ignoring positional arguments for a time | ||
7 | and explicitly rejects with error since meson 0.60.0 | ||
8 | |||
9 | Upstrean-Status: Backport | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | data/meson.build | 2 +- | ||
13 | src/meson.build | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/data/meson.build b/data/meson.build | ||
17 | index bfc9caa..8e42134 100644 | ||
18 | --- a/data/meson.build | ||
19 | +++ b/data/meson.build | ||
20 | @@ -1,6 +1,6 @@ | ||
21 | appdatadir = join_paths(datadir, 'metainfo') | ||
22 | appdata_file = 'org.gnome.font-viewer.appdata.xml' | ||
23 | -merged_appdata = i18n.merge_file(appdata_file, | ||
24 | +merged_appdata = i18n.merge_file( | ||
25 | input: appdata_file + '.in', | ||
26 | output: appdata_file, | ||
27 | po_dir: '../po', | ||
28 | diff --git a/src/meson.build b/src/meson.build | ||
29 | index f863d45..826c59b 100644 | ||
30 | --- a/src/meson.build | ||
31 | +++ b/src/meson.build | ||
32 | @@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' | ||
33 | desktop_conf = configuration_data() | ||
34 | desktop_conf.set('VERSION', meson.project_version()) | ||
35 | desktop_conf.set('APPLICATION_ID', application_id) | ||
36 | -i18n.merge_file(desktop_file, | ||
37 | +i18n.merge_file( | ||
38 | input: configure_file(input: desktop_file + '.in.in', | ||
39 | output: desktop_file + '.in', | ||
40 | 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 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" | |||
5 | SECTION = "x11/gnome" | 5 | SECTION = "x11/gnome" |
6 | 6 | ||
7 | DEPENDS = " \ | 7 | DEPENDS = " \ |
8 | gtk+3 \ | 8 | gtk4 \ |
9 | gnome-desktop \ | 9 | gnome-desktop \ |
10 | libhandy \ | 10 | libadwaita \ |
11 | " | 11 | " |
12 | 12 | ||
13 | GNOMEBASEBUILDCLASS = "meson" | 13 | GNOMEBASEBUILDCLASS = "meson" |
@@ -16,8 +16,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg | |||
16 | 16 | ||
17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
18 | 18 | ||
19 | SRC_URI += " file://0001-Fix-meson-build-with-meson-0.60.0.patch" | 19 | SRC_URI[archive.sha256sum] = "cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc" |
20 | SRC_URI[archive.sha256sum] = "5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876" | ||
21 | 20 | ||
22 | FILES:${PN} += " \ | 21 | FILES:${PN} += " \ |
23 | ${datadir}/dbus-1 \ | 22 | ${datadir}/dbus-1 \ |