diff --git a/0001-Adapt-to-new-gnome-desktop-API-changes.patch b/0001-Adapt-to-new-gnome-desktop-API-changes.patch new file mode 100644 index 0000000..c155d98 --- /dev/null +++ b/0001-Adapt-to-new-gnome-desktop-API-changes.patch @@ -0,0 +1,39 @@ +From 9dcb5cde73917832fa11cab69e7b51b092f281f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Jard=C3=B3n?= +Date: Wed, 15 Jan 2020 20:25:56 +0900 +Subject: [PATCH] Adapt to new gnome-desktop API changes + +--- + meson.build | 2 +- + panels/background/cc-background-item.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index fcc062bd5..e0c1ff6f0 100644 +--- a/meson.build ++++ b/meson.build +@@ -120,7 +120,7 @@ colord_dep = dependency('colord', version: '>= 0.1.34') + gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0') + gio_dep = dependency('gio-2.0') + glib_dep = dependency('glib-2.0', version: '>= 2.53.0') +-gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') ++gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.35.4') + gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.27.90') + goa_dep = dependency('goa-1.0', version: goa_req_version) + gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') +diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c +index dc8850b66..50851e17d 100644 +--- a/panels/background/cc-background-item.c ++++ b/panels/background/cc-background-item.c +@@ -156,7 +156,7 @@ render_at_size (GnomeBG *bg, + GdkPixbuf *pixbuf; + + pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); +- gnome_bg_draw (bg, pixbuf, gdk_screen_get_default (), FALSE); ++ gnome_bg_draw (bg, pixbuf); + + return pixbuf; + } +-- +2.24.1 + diff --git a/gnome-control-center.spec b/gnome-control-center.spec index e2b936c..e160def 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,6 +1,6 @@ %define gnome_online_accounts_version 3.25.3 %define glib2_version 2.53.0 -%define gnome_desktop_version 3.27.90 +%define gnome_desktop_version 3.35.4 %define gsd_version 3.27.90 %define gsettings_desktop_schemas_version 3.31.0 %define upower_version 0.99.8 @@ -10,7 +10,7 @@ Name: gnome-control-center Version: 3.34.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA @@ -23,6 +23,9 @@ Patch0: distro-logo.patch # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/586 Patch1: 0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch +# https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/686 +Patch2: 0001-Adapt-to-new-gnome-desktop-API-changes.patch + BuildRequires: chrpath BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -190,6 +193,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center %dir %{_datadir}/gnome/wm-properties %changelog +* Thu Jan 16 2020 Kalev Lember - 3.34.2-3 +- Backport a patch to fix the build with latest libgnome-desktop + * Mon Dec 09 2019 Michael Catanzaro - 3.34.2-2 - Drop nm-connection-editor requires, per gnome-control-center#512 - To edit mobile broadband connections, install nm-connection-editor