diff -Nru gnome-font-viewer-41.0/debian/changelog gnome-font-viewer-41.0/debian/changelog --- gnome-font-viewer-41.0/debian/changelog 2021-09-21 23:17:15.000000000 +0000 +++ gnome-font-viewer-41.0/debian/changelog 2022-02-14 17:08:35.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-font-viewer (41.0-2) unstable; urgency=medium + + * Cherry-pick patch to fix build with latest meson (Closes: #1005586) + * Add patch to support GNOME 42's new dark theme preference + * debian/control.in: Bump minimum libhandy to 1.5.0 for that change + + -- Jeremy Bicha Mon, 14 Feb 2022 12:08:35 -0500 + gnome-font-viewer (41.0-1) unstable; urgency=medium * New upstream release diff -Nru gnome-font-viewer-41.0/debian/control gnome-font-viewer-41.0/debian/control --- gnome-font-viewer-41.0/debian/control 2021-09-21 23:17:15.000000000 +0000 +++ gnome-font-viewer-41.0/debian/control 2022-02-14 17:08:35.000000000 +0000 @@ -16,7 +16,7 @@ libharfbuzz-dev (>= 0.9.9), libfontconfig1-dev, libfreetype6-dev, - libhandy-1-dev (>= 1.0), + libhandy-1-dev (>= 1.5.0), libxml2-utils, meson (>= 0.50), Standards-Version: 4.6.0 diff -Nru gnome-font-viewer-41.0/debian/control.in gnome-font-viewer-41.0/debian/control.in --- gnome-font-viewer-41.0/debian/control.in 2021-09-21 23:17:15.000000000 +0000 +++ gnome-font-viewer-41.0/debian/control.in 2022-02-14 17:08:35.000000000 +0000 @@ -12,7 +12,7 @@ libharfbuzz-dev (>= 0.9.9), libfontconfig1-dev, libfreetype6-dev, - libhandy-1-dev (>= 1.0), + libhandy-1-dev (>= 1.5.0), libxml2-utils, meson (>= 0.50), Standards-Version: 4.6.0 diff -Nru gnome-font-viewer-41.0/debian/patches/Fix-meson-build-with-meson-0.60.0.patch gnome-font-viewer-41.0/debian/patches/Fix-meson-build-with-meson-0.60.0.patch --- gnome-font-viewer-41.0/debian/patches/Fix-meson-build-with-meson-0.60.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-font-viewer-41.0/debian/patches/Fix-meson-build-with-meson-0.60.0.patch 2022-02-14 17:08:35.000000000 +0000 @@ -0,0 +1,38 @@ +From: r-value +Date: Thu, 30 Dec 2021 17:14:47 +0800 +Subject: 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 + +(cherry picked from commit 218166246e29a39e2eac8d3f06976038571b0603) +--- + 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 -Nru gnome-font-viewer-41.0/debian/patches/series gnome-font-viewer-41.0/debian/patches/series --- gnome-font-viewer-41.0/debian/patches/series 2021-09-21 23:17:15.000000000 +0000 +++ gnome-font-viewer-41.0/debian/patches/series 2022-02-14 17:08:35.000000000 +0000 @@ -0,0 +1,2 @@ +Fix-meson-build-with-meson-0.60.0.patch +Support-GNOME-42-dark-theme-preference.patch diff -Nru gnome-font-viewer-41.0/debian/patches/Support-GNOME-42-dark-theme-preference.patch gnome-font-viewer-41.0/debian/patches/Support-GNOME-42-dark-theme-preference.patch --- gnome-font-viewer-41.0/debian/patches/Support-GNOME-42-dark-theme-preference.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-font-viewer-41.0/debian/patches/Support-GNOME-42-dark-theme-preference.patch 2022-02-14 17:08:35.000000000 +0000 @@ -0,0 +1,36 @@ +From: Jeremy Bicha +Date: Mon, 14 Feb 2022 12:02:53 -0500 +Subject: Support GNOME 42 dark theme preference + +--- + meson.build | 2 +- + src/font-view.c | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e201641..fccaa9a 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,7 +24,7 @@ thumbnailerdir = join_paths(datadir, 'thumbnailers') + + glib_req_version = '>= 2.56.0' + gtk_req_version = '>= 3.24.1' +-libhandy_req_version = '>= 1.0.0' ++libhandy_req_version = '>= 1.5.0' + harfbuzz_req_version = '>= 0.9.9' + + glib_dep = dependency('glib-2.0', version: glib_req_version) +diff --git a/src/font-view.c b/src/font-view.c +index 9980e28..c7a43b3 100644 +--- a/src/font-view.c ++++ b/src/font-view.c +@@ -1510,6 +1510,9 @@ font_view_application_startup (GApplication *application) + + hdy_init (); + ++ hdy_style_manager_set_color_scheme (hdy_style_manager_get_default (), ++ HDY_COLOR_SCHEME_PREFER_LIGHT); ++ + if (!FcInit ()) + g_critical ("Can't initialize fontconfig library"); +